diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
index efe4bd2..172479e 100644
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -1,7 +1,19 @@
 
 
 [/Script/EngineSettings.GameMapsSettings]
-GameDefaultMap=/Engine/Maps/Templates/OpenWorld
+EditorStartupMap=/Game/Maps/TestMap.TestMap
+LocalMapOptions=
+TransitionMap=None
+bUseSplitscreen=True
+TwoPlayerSplitscreenLayout=Horizontal
+ThreePlayerSplitscreenLayout=FavorTop
+FourPlayerSplitscreenLayout=Grid
+bOffsetPlayerGamepadIds=False
+GameInstanceClass=/Game/Core/SkyGameInstance.SkyGameInstance_C
+GameDefaultMap=/Game/Maps/Menu.Menu
+ServerDefaultMap=/Engine/Maps/Entry.Entry
+GlobalDefaultGameMode=/Game/Core/SkyGameMode.SkyGameMode_C
+GlobalDefaultServerGameMode=None
 
 [/Script/WindowsTargetPlatform.WindowsTargetSettings]
 DefaultGraphicsRHI=DefaultGraphicsRHI_Vulkan
@@ -77,6 +89,7 @@ FontDPI=72
 [/Script/Engine.Engine]
 +ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/SkyEngine")
 +ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/SkyEngine")
+GameViewportClientClassName=/Script/CommonUI.CommonGameViewportClient
 
 [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
 bEnablePlugin=True
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
index ace862c..0b2be77 100644
--- a/Config/DefaultGame.ini
+++ b/Config/DefaultGame.ini
@@ -111,3 +111,10 @@ bShouldAcquireMissingChunksOnLoad=False
 bShouldWarnAboutInvalidAssets=True
 MetaDataTagsForAssetRegistry=()
 
+[CommonInputPlatformSettings_Windows CommonInputPlatformSettings]
+DefaultInputType=Gamepad
+
+[/Script/CommonInput.CommonInputSettings]
+bEnableEnhancedInputSupport=True
+bEnableDefaultInputConfig=False
+
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
index e254b7a..30aa673 100644
--- a/Config/DefaultInput.ini
+++ b/Config/DefaultInput.ini
@@ -29,3 +29,7 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul
 [/Script/RawInput.RawInputSettings]
 bRegisterDefaultDevice=False
 
+[/Script/GameInputBase.GameInputDeveloperSettings]
++DeviceConfigurations=(DeviceIdentifier=(VendorId=5168,ProductId=336),Description="Skylander Portal",bOverrideHardwareDeviceIdString=False,OverriddenHardwareDeviceId="",bProcessControllerButtons=True,bProcessControllerSwitchState=True,bProcessControllerAxis=True,ControllerButtonMappingData=(),ControllerAxisMappingData=(),bProcessRawReportData=True,RawReportReadingId=0,RawReportMappingData=())
+bDoNotProcessDuplicateCapabilitiesForSingleUser=True
+
diff --git a/Content/Core/SkyGameInstance.uasset b/Content/Core/SkyGameInstance.uasset
new file mode 100644
index 0000000..0275b06
Binary files /dev/null and b/Content/Core/SkyGameInstance.uasset differ
diff --git a/Content/Core/SkyGameMode.uasset b/Content/Core/SkyGameMode.uasset
new file mode 100644
index 0000000..a911d33
Binary files /dev/null and b/Content/Core/SkyGameMode.uasset differ
diff --git a/Content/Maps/TestMap.umap b/Content/Maps/TestMap.umap
index 8d00b0a..89867f1 100644
Binary files a/Content/Maps/TestMap.umap and b/Content/Maps/TestMap.umap differ
diff --git a/Plugins/SkyPortal b/Plugins/SkyPortal
index 1df4e9b..5496613 160000
--- a/Plugins/SkyPortal
+++ b/Plugins/SkyPortal
@@ -1 +1 @@
-Subproject commit 1df4e9b848b12c2bcf3df5e26da310524ee61641
+Subproject commit 5496613f149a6033444a89047f4ef3b5269e4d4a
diff --git a/SkyEngine.uproject b/SkyEngine.uproject
index 76d93fc..c957bb1 100644
--- a/SkyEngine.uproject
+++ b/SkyEngine.uproject
@@ -513,10 +513,6 @@
 			"Name": "AppleImageUtils",
 			"Enabled": false
 		},
-		{
-			"Name": "EngineAssetDefinitions",
-			"Enabled": false
-		},
 		{
 			"Name": "BlueprintFileUtils",
 			"Enabled": true
@@ -525,20 +521,6 @@
 			"Name": "AdvancedRenamer",
 			"Enabled": true
 		},
-		{
-			"Name": "GameInputWindows",
-			"Enabled": true,
-			"SupportedTargetPlatforms": [
-				"Win64"
-			]
-		},
-		{
-			"Name": "GameInput",
-			"Enabled": true,
-			"SupportedTargetPlatforms": [
-				"Win64"
-			]
-		},
 		{
 			"Name": "RawInput",
 			"Enabled": true
@@ -594,6 +576,14 @@
 		{
 			"Name": "PluginTemplateTool",
 			"Enabled": true
+		},
+		{
+			"Name": "JsonBlueprintUtilities",
+			"Enabled": true
+		},
+		{
+			"Name": "CommonUI",
+			"Enabled": true
 		}
 	],
 	"TargetPlatforms": [
diff --git a/Source/SkyEngine/SkyEngine.Build.cs b/Source/SkyEngine/SkyEngine.Build.cs
index 73b781b..0663e44 100644
--- a/Source/SkyEngine/SkyEngine.Build.cs
+++ b/Source/SkyEngine/SkyEngine.Build.cs
@@ -4,20 +4,20 @@ using UnrealBuildTool;
 
 public class SkyEngine : ModuleRules
 {
-	public SkyEngine(ReadOnlyTargetRules Target) : base(Target)
-	{
-		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
-	
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "EnhancedInput" });
+    public SkyEngine(ReadOnlyTargetRules Target) : base(Target)
+    {
+        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
-		PrivateDependencyModuleNames.AddRange(new string[] {  });
+        PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "EnhancedInput" });
 
-		// Uncomment if you are using Slate UI
-		// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
-		
-		// Uncomment if you are using online features
-		// PrivateDependencyModuleNames.Add("OnlineSubsystem");
+        PrivateDependencyModuleNames.AddRange(new string[] { });
 
-		// To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true
-	}
+        // Uncomment if you are using Slate UI
+        // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
+
+        // Uncomment if you are using online features
+        // PrivateDependencyModuleNames.Add("OnlineSubsystem");
+
+        // To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true
+    }
 }