diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
index d591bab..fd1c507 100644
--- a/Config/DefaultGame.ini
+++ b/Config/DefaultGame.ini
@@ -17,9 +17,9 @@ bIgnoreMissingCookedAssetRegistryData=False
 -PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
 +PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass="/Script/Engine.World",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
 +PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass="/Script/Engine.PrimaryAssetLabel",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="CogAbilityDataAsset",AssetBaseClass="/Script/CogAbility.CogAbilityDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug/")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="CogEngineDataAsset",AssetBaseClass="/Script/CogEngine.CogEngineDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug/")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="CogInputDataAsset",AssetBaseClass="/Script/CogInput.CogInputDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug/")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
++PrimaryAssetTypesToScan=(PrimaryAssetType="CogAbilityDataAsset",AssetBaseClass="/Script/CogAbility.CogAbilityDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
++PrimaryAssetTypesToScan=(PrimaryAssetType="CogEngineDataAsset",AssetBaseClass="/Script/CogEngine.CogEngineDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
++PrimaryAssetTypesToScan=(PrimaryAssetType="CogInputDataAsset",AssetBaseClass="/Script/CogInput.CogInputDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
 bOnlyCookProductionAssets=False
 bShouldManagerDetermineTypeAndName=False
 bShouldGuessTypeAndNameInEditor=True
diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Collisions.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Collisions.h
index 86a8127..544b9f9 100644
--- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Collisions.h
+++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Collisions.h
@@ -60,5 +60,5 @@ private:
     bool ShowQuery = false;
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogEngineDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogEngineDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h
index 8d472ff..7b37960 100644
--- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h
+++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_Spawns.h
@@ -32,5 +32,5 @@ protected:
 private:
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogEngineDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogEngineDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Abilities.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Abilities.h
index da56ced..3ef67ce 100644
--- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Abilities.h
+++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Abilities.h
@@ -66,5 +66,5 @@ private:
     TArray<FGameplayAbilitySpecHandle> OpenedAbilities;
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Attributes.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Attributes.h
index 215d150..6aa84c2 100644
--- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Attributes.h
+++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Attributes.h
@@ -54,5 +54,5 @@ private:
     ImGuiTextFilter Filter;
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Cheats.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Cheats.h
index e0f658c..9827f6b 100644
--- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Cheats.h
+++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Cheats.h
@@ -45,5 +45,5 @@ private:
     TArray<FString> AppliedCheats;
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Effects.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Effects.h
index 3e56198..9a84bdb 100644
--- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Effects.h
+++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Effects.h
@@ -55,5 +55,5 @@ protected:
     ImVec4 GetEffectModifierColor(const FModifierSpec& ModSpec, const FGameplayModifierInfo& ModInfo, float BaseValue) const;
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h
index c2b6467..093ffc6 100644
--- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h
+++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Pools.h
@@ -29,5 +29,5 @@ protected:
     virtual void DrawPool(const UAbilitySystemComponent* AbilitySystemComponent, const FCogAbilityPool& Pool);
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h
index ba6db22..aaa69a3 100644
--- a/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h
+++ b/Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Tweaks.h
@@ -31,5 +31,5 @@ protected:
 private:
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogAbilityDataAsset> Asset = nullptr;
 };
diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h
index d3ae033..743293d 100644
--- a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h
+++ b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h
@@ -39,7 +39,7 @@ private:
     float RepeatTime = 0.0f;
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogInputDataAsset> Asset = nullptr;
+    TObjectPtr<const UCogInputDataAsset> Asset = nullptr;
 
     TArray<FCogInjectActionInfo> Actions;
 };
diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h
index 76c09e1..47f31aa 100644
--- a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h
+++ b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h
@@ -76,7 +76,7 @@ private:
     float RepeatPeriod = 0.5f;
 
     UPROPERTY()
-    TWeakObjectPtr<const UCogInputDataAsset> Asset;
+    TObjectPtr<const UCogInputDataAsset> Asset;
 
     TMap<FKey, FCogInjectActionInfo> Actions;
     
diff --git a/TODO.txt b/TODO.txt
index bb6046b..b9a7a59 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -7,6 +7,7 @@
 - CogEngine: More stats in the stats window
 - CogEngine: Overlay mode of stats.
 - CogEngine: Stat main menu widget could have a tooltip on each stat with a control to change set the emulation (FPS, Ping, Packetloss)
+- CogEngine: Add screen settings (fullscreen, borderless, window and resolution)
 
 - CogInput: Add multiple IMC on the input data asset. Maybe propose a current imc