diff --git a/addons/forge/resources/abilities/ForgeAbilityBehavior.cs b/addons/forge/resources/abilities/ForgeAbilityBehavior.cs
index c2f032cb..a7cfd454 100644
--- a/addons/forge/resources/abilities/ForgeAbilityBehavior.cs
+++ b/addons/forge/resources/abilities/ForgeAbilityBehavior.cs
@@ -10,5 +10,9 @@ namespace Gamesmiths.Forge.Godot.Resources.Abilities;
 [Icon("uid://bcx7anhepqfmd")]
 public abstract partial class ForgeAbilityBehavior : Resource
 {
+	[Export] public string? Name { get; set; }
+	[Export] public string? Description { get; set; }
+	[Export] public Texture2D? Icon { get; set; }
+	
 	public abstract IAbilityBehavior GetBehavior();
 }
diff --git a/managers/InventoryManager.cs b/managers/InventoryManager.cs
index 104bf226..8b920629 100644
--- a/managers/InventoryManager.cs
+++ b/managers/InventoryManager.cs
@@ -1,15 +1,15 @@
-using System;
 using System.Collections.Generic;
+using Gamesmiths.Forge.Godot.Resources.Abilities;
 using Godot;
 using Movementtests.systems;
 
 namespace Movementtests.managers;
 
-public partial class WeaponEventInventoryChangedData(WeaponSystem.WeaponEvent forEvent, string abilityName)
+public partial class WeaponEventAbilityData(WeaponSystem.WeaponEvent forEvent, Resource ability)
     : RefCounted
 {
     public WeaponSystem.WeaponEvent ForEvent { get; private set; } = forEvent;
-    public string Ability { get; private set; } = abilityName;
+    public Resource Ability { get; private set; } = ability;
 }
 
 public partial class InventoryManager : Node
@@ -18,19 +18,41 @@ public partial class InventoryManager : Node
     public delegate void InventoryChangedEventHandler();
 
     [Signal]
-    public delegate void WeaponEventInventoryChangedEventHandler(WeaponEventInventoryChangedData data);
+    public delegate void WeaponEventInventoryChangedEventHandler();
+    [Signal]
+    public delegate void WeaponEventAbilityAddedEventHandler(WeaponEventAbilityData data);
+    [Signal]
+    public delegate void WeaponEventAbilityRemovedEventHandler(WeaponEventAbilityData data);
 
-    public Dictionary<string, Resource> Inventory { get; } = new();
+    public Dictionary<WeaponSystem.WeaponEvent, HashSet<Resource>> WeaponEventsInventory { get; } = [];
 
     public static InventoryManager Instance { get; private set; }
     
     public override void _Ready()
     {
         Instance = this;
+        WeaponEventsInventory[WeaponSystem.WeaponEvent.FlyingTick] = new HashSet<Resource>();
+        WeaponEventsInventory[WeaponSystem.WeaponEvent.StartedFlying] = new HashSet<Resource>();
+        WeaponEventsInventory[WeaponSystem.WeaponEvent.StoppedFlying] = new HashSet<Resource>();
     }
 
-    public void AddAbilityForWeaponEvent(WeaponSystem.WeaponEvent forEvent, string abilityName)
+    public void AddAbilityForWeaponEvent(WeaponSystem.WeaponEvent forEvent, ForgeAbilityBehavior abilityBehavior)
     {
-        EmitSignalWeaponEventInventoryChanged(new WeaponEventInventoryChangedData(forEvent, abilityName));
+        var inventoryForEvent = WeaponEventsInventory[forEvent];
+        var addedAbilityToInventory = inventoryForEvent.Add(abilityBehavior);
+        if (!addedAbilityToInventory) return;
+        
+        EmitSignalWeaponEventInventoryChanged();
+        EmitSignalWeaponEventAbilityAdded(new WeaponEventAbilityData(forEvent, abilityBehavior));
+    }
+
+    public void RemoveAbilityForWeaponEvent(WeaponSystem.WeaponEvent forEvent, ForgeAbilityBehavior abilityBehavior)
+    {
+        var inventoryForEvent = WeaponEventsInventory[forEvent];
+        var removedFromInventory = inventoryForEvent.Remove(abilityBehavior);
+        if (!removedFromInventory) return;
+        
+        EmitSignalWeaponEventInventoryChanged();
+        EmitSignalWeaponEventAbilityRemoved(new WeaponEventAbilityData(forEvent, abilityBehavior));
     }
 }
diff --git a/menus/scenes/components/AbilitySelection.cs b/menus/scenes/components/AbilitySelection.cs
index 5d4445ea..f3863997 100644
--- a/menus/scenes/components/AbilitySelection.cs
+++ b/menus/scenes/components/AbilitySelection.cs
@@ -1,55 +1,83 @@
 using System;
+using System.Collections.Generic;
+using Gamesmiths.Forge.Godot.Resources.Abilities;
 using Godot;
 using Movementtests.systems;
 
 [Tool, GlobalClass]
 public partial class AbilitySelection : Control
 {
-    [Signal] public delegate void AbilityAddedEventHandler(WeaponSystem.WeaponEvent forEvent, string abilityName);
+    [Signal] public delegate void AbilityAddedEventHandler(WeaponSystem.WeaponEvent forEvent, ForgeAbilityBehavior behavior);
+    [Signal] public delegate void AbilityRemovedEventHandler(WeaponSystem.WeaponEvent forEvent, ForgeAbilityBehavior behavior);
     
     [Export] public WeaponSystem.WeaponEvent ForEvent { get; set; } = WeaponSystem.WeaponEvent.StartedFlying;
     
-    private string _title = string.Empty;
-    [Export] public string Title {
-        get => _title;
-        set
-        {
-            _title = value;
-            TitleChanged();
-        }
-    }
+    [Export] public string Title { get; set; } = string.Empty;
     
-    [Export] public PackedScene AbilitySelectionItem { get; set; }
+    [Export] public PackedScene AbilitySelectedItem { get; set; }
+    
+    [Export] public ForgeAbilityBehavior[] AbilityBehaviors { get; set; }
 
-    private VBoxContainer _abilities;
+    private VBoxContainer _selectedAbilities;
     private MenuButton _addAbility;
     private PopupMenu _addAbilityMenu;
     
     public override void _Ready()
     {
-        _abilities = GetNode<VBoxContainer>("%SelectedAbilities");
+        var titleLabel = GetNode<Label>("%TitleLabel");
+        titleLabel.Text = Title;
+        
+        _selectedAbilities = GetNode<VBoxContainer>("%SelectedAbilities");
         _addAbility = GetNode<MenuButton>("%AddAbility");
         _addAbilityMenu = _addAbility.GetPopup();
         
-        _addAbilityMenu.IdPressed += AddAbilityMenuOnIdPressed;
+        if (Engine.IsEditorHint()) return;
+        
+        var i = 0;
+        foreach (var behavior in AbilityBehaviors)
+        {
+            _addAbilityMenu.AddIconItem(behavior.Icon, behavior.Name);
+            _addAbilityMenu.SetItemMetadata(i, behavior);
+            i += 1;
+        }
+        
         _addAbilityMenu.IndexPressed += AddAbilityMenuOnIndexPressed;
     }
 
+    public void Initialize(IEnumerable<Resource> equippedAbilities)
+    {
+        foreach (var equippedAbility in equippedAbilities)
+        {
+            if (equippedAbility is not ForgeAbilityBehavior ability) continue;
+            AddSelectedAbility(ability);
+        }
+    }
+
     private void AddAbilityMenuOnIndexPressed(long index)
     {
         var indexInt = Convert.ToInt32(index);
-        var metadata = _addAbilityMenu.GetItemMetadata(indexInt);
-        var name = _addAbilityMenu.GetItemText(indexInt);
-        EmitSignalAbilityAdded(ForEvent, name);
+        var metadata = (ForgeAbilityBehavior) _addAbilityMenu.GetItemMetadata(indexInt);
+        EmitSignalAbilityAdded(ForEvent, metadata);
     }
 
-    private void AddAbilityMenuOnIdPressed(long id)
+    public void AddSelectedAbility(ForgeAbilityBehavior behavior)
     {
+        var newSelectedAbilityItem = AbilitySelectedItem.Instantiate() as SelectedAbility;
+        if (newSelectedAbilityItem == null) return;
+        
+        newSelectedAbilityItem.SetAbility(behavior);
+        newSelectedAbilityItem.AbilityRemoved += ability => EmitSignalAbilityRemoved(ForEvent, ability);
+        _selectedAbilities.AddChild(newSelectedAbilityItem);
     }
-
-    public void TitleChanged()
+    
+    public void RemoveSelectedAbility(ForgeAbilityBehavior behavior)
     {
-        var titleLabel = GetNode<Label>("%TitleLabel");
-        titleLabel.Text = Title;
+        foreach (var child in _selectedAbilities.GetChildren())
+        {
+            if (child is not SelectedAbility selectedAbility || selectedAbility.Ability != behavior) continue;
+            _selectedAbilities.RemoveChild(selectedAbility);
+            _addAbility.GrabFocus();
+            return;
+        }
     }
 }
diff --git a/menus/scenes/components/SelectedAbility.cs b/menus/scenes/components/SelectedAbility.cs
new file mode 100644
index 00000000..7ef513af
--- /dev/null
+++ b/menus/scenes/components/SelectedAbility.cs
@@ -0,0 +1,56 @@
+using Godot;
+using System;
+using Gamesmiths.Forge.Godot.Resources.Abilities;
+
+[Tool, GlobalClass]
+public partial class SelectedAbility : Control
+{
+    [Signal] public delegate void AbilityRemovedEventHandler(ForgeAbilityBehavior ability);
+    
+    private ForgeAbilityBehavior? _ability;
+    [Export]
+    public ForgeAbilityBehavior? Ability
+    {
+        get => _ability;
+        set
+        {
+            _ability = value;
+            if (_ability == null || !Engine.IsEditorHint()) return;
+            AbilityUpdated();
+        }
+    }
+
+    private TextureRect? _icon;
+    private Label? _title;
+    private Button? _remove;
+
+    public override void _Ready()
+    {
+        _icon = GetNode<TextureRect>("%Icon");
+        _title = GetNode<Label>("%Title");
+        _remove = GetNode<Button>("%Remove");
+        
+        _remove.Pressed += () => EmitSignalAbilityRemoved(Ability);
+    }
+
+    public void SetAbility(ForgeAbilityBehavior ability)
+    {
+        _ability = ability;
+        AbilityUpdated();
+    }
+
+    public void AbilityUpdated()
+    {
+        var icon = _icon ?? GetNode<TextureRect>("%Icon");
+        var title = _title ?? GetNode<Label>("%Title");
+        if (icon == null || title == null) return;
+        if (_ability == null)
+        {
+            icon.Texture = null;
+            title.Text = "";
+            return;
+        }
+        icon.Texture = _ability.Icon;
+        title.Text = _ability.Name;
+    }
+}
\ No newline at end of file
diff --git a/menus/scenes/components/SelectedAbility.cs.uid b/menus/scenes/components/SelectedAbility.cs.uid
new file mode 100644
index 00000000..3605298c
--- /dev/null
+++ b/menus/scenes/components/SelectedAbility.cs.uid
@@ -0,0 +1 @@
+uid://duest06l5answ
diff --git a/menus/scenes/components/ability_selection.tscn b/menus/scenes/components/ability_selection.tscn
index 7d80ecb3..eb5eb00a 100644
--- a/menus/scenes/components/ability_selection.tscn
+++ b/menus/scenes/components/ability_selection.tscn
@@ -1,8 +1,9 @@
 [gd_scene format=3 uid="uid://dmv685sskgh3l"]
 
 [ext_resource type="Script" uid="uid://5emed8iegtui" path="res://menus/scenes/components/AbilitySelection.cs" id="1_fcxyu"]
+[ext_resource type="Resource" uid="uid://ifeavnlps7hy" path="res://scenes/player_controller/resources/forge/exploding_sword.tres" id="2_j1yif"]
 [ext_resource type="Texture2D" uid="uid://by5v33lu8v1fm" path="res://assets/ui/input-prompts/Flairs/Vector/flair_plus.svg" id="2_uf3m5"]
-[ext_resource type="Texture2D" uid="uid://c2akxlg7tdb67" path="res://assets/ui/IconGodotNode/node/icon_projectile.png" id="3_41pdy"]
+[ext_resource type="PackedScene" uid="uid://cjnimmo2jyvx7" path="res://menus/scenes/components/selected_ability.tscn" id="3_cndde"]
 
 [node name="AbilitySelection" type="MarginContainer" unique_id=1373426933]
 size_flags_horizontal = 3
@@ -11,6 +12,9 @@ theme_override_constants/margin_top = 4
 theme_override_constants/margin_right = 4
 theme_override_constants/margin_bottom = 4
 script = ExtResource("1_fcxyu")
+Title = "Test"
+AbilitySelectedItem = ExtResource("3_cndde")
+AbilityBehaviors = [ExtResource("2_j1yif")]
 
 [node name="HBoxContainer" type="VBoxContainer" parent="." unique_id=364343452]
 layout_mode = 2
@@ -18,6 +22,7 @@ layout_mode = 2
 [node name="TitleLabel" type="Label" parent="HBoxContainer" unique_id=8350369]
 unique_name_in_owner = true
 layout_mode = 2
+text = "Test"
 
 [node name="SelectedAbilities" type="VBoxContainer" parent="HBoxContainer" unique_id=1173689490]
 unique_name_in_owner = true
@@ -39,7 +44,3 @@ layout_mode = 2
 focus_mode = 2
 text = "Add ability"
 icon = ExtResource("2_uf3m5")
-item_count = 1
-popup/item_0/text = "Weapon explosion"
-popup/item_0/icon = ExtResource("3_41pdy")
-popup/item_0/id = 0
diff --git a/menus/scenes/components/selected_ability.tscn b/menus/scenes/components/selected_ability.tscn
new file mode 100644
index 00000000..e43c42c5
--- /dev/null
+++ b/menus/scenes/components/selected_ability.tscn
@@ -0,0 +1,30 @@
+[gd_scene format=3 uid="uid://cjnimmo2jyvx7"]
+
+[ext_resource type="Script" uid="uid://duest06l5answ" path="res://menus/scenes/components/SelectedAbility.cs" id="1_dc51o"]
+[ext_resource type="Resource" uid="uid://ifeavnlps7hy" path="res://scenes/player_controller/resources/forge/exploding_sword.tres" id="2_um64s"]
+[ext_resource type="Texture2D" uid="uid://b3403ry3yxw1t" path="res://assets/ui/input-prompts/Flairs/Vector/flair_cross.svg" id="4_x7nho"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2nvj1"]
+atlas = ExtResource("4_x7nho")
+region = Rect2(20, 20, 24, 24)
+
+[node name="SelectedAbility" type="PanelContainer" unique_id=931414010]
+script = ExtResource("1_dc51o")
+Ability = ExtResource("2_um64s")
+
+[node name="HBoxContainer" type="HBoxContainer" parent="." unique_id=489712453]
+layout_mode = 2
+
+[node name="Icon" type="TextureRect" parent="HBoxContainer" unique_id=1615158957]
+unique_name_in_owner = true
+layout_mode = 2
+stretch_mode = 3
+
+[node name="Title" type="Label" parent="HBoxContainer" unique_id=809638027]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="Remove" type="Button" parent="HBoxContainer" unique_id=1761723956]
+unique_name_in_owner = true
+layout_mode = 2
+icon = SubResource("AtlasTexture_2nvj1")
diff --git a/menus/scenes/menus/options_menu/input/input_extras_menu.tscn b/menus/scenes/menus/options_menu/input/input_extras_menu.tscn
index 25cdd56d..1195d556 100644
--- a/menus/scenes/menus/options_menu/input/input_extras_menu.tscn
+++ b/menus/scenes/menus/options_menu/input/input_extras_menu.tscn
@@ -37,6 +37,7 @@ option_name = "Joystick Sensitivity"
 option_section = 1
 key = "LookSensitivity"
 section = "InputSettings"
+default_value = 1.1
 
 [node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl" index="0" unique_id=1789907427]
 text = "Joystick Sensitivity :"
@@ -44,8 +45,8 @@ text = "Joystick Sensitivity :"
 [node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl" index="1" unique_id=494926010]
 min_value = 0.2
 max_value = 2.0
-step = 0.2
-value = 0.6000000000000001
+step = 0.1
+value = 1.1
 tick_count = 10
 
 [node name="MouseSensitivityControl" parent="VBoxContainer/MarginContainer/VBoxContainer" unique_id=1444662884 instance=ExtResource("2_iyvrj")]
@@ -54,16 +55,17 @@ option_name = "Mouse Sensitivity"
 option_section = 1
 key = "MouseSensitivity"
 section = "InputSettings"
+default_value = 25.0
 
 [node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl" index="0" unique_id=1789907427]
 text = "Mouse Sensitivity :"
 
 [node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl" index="1" unique_id=494926010]
 min_value = 1.0
-max_value = 20.0
+max_value = 50.0
 step = 1.0
-value = 8.0
-tick_count = 20
+value = 25.0
+tick_count = 10
 
 [node name="HeadBobbingControl" parent="VBoxContainer/MarginContainer/VBoxContainer" unique_id=1905029466 instance=ExtResource("2_iyvrj")]
 layout_mode = 2
diff --git a/menus/scenes/overlaid_menus/InventoryUI.cs b/menus/scenes/overlaid_menus/InventoryUI.cs
deleted file mode 100644
index 1f1aa0a1..00000000
--- a/menus/scenes/overlaid_menus/InventoryUI.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Godot;
-using Movementtests.managers;
-using Movementtests.systems;
-
-[Tool, GlobalClass, Icon("res://assets/ui/IconGodotNode/control/icon_crate.png")]
-public partial class InventoryUI : Control
-{
-    private AbilitySelection _startedFlyingSelection;
-    private AbilitySelection _whileFlyingSelection;
-    private AbilitySelection _stoppedFlyingSelection;
-    public override void _Ready()
-    {
-        _startedFlyingSelection = GetNode<AbilitySelection>("%StartedFlying");
-        _whileFlyingSelection = GetNode<AbilitySelection>("%WhileFlying");
-        _stoppedFlyingSelection = GetNode<AbilitySelection>("%StoppedFlying");
-        
-        _startedFlyingSelection.AbilityAdded += AddAbilityForEvent;
-        _whileFlyingSelection.AbilityAdded += AddAbilityForEvent;
-        _stoppedFlyingSelection.AbilityAdded += AddAbilityForEvent;
-    }
-
-    public void AddAbilityForEvent(WeaponSystem.WeaponEvent forEvent, string abilityName)
-    {
-        InventoryManager.Instance.AddAbilityForWeaponEvent(forEvent, abilityName);
-    }
-}
diff --git a/menus/scenes/overlaid_menus/InventoryUI.cs.uid b/menus/scenes/overlaid_menus/InventoryUI.cs.uid
deleted file mode 100644
index 8b29429f..00000000
--- a/menus/scenes/overlaid_menus/InventoryUI.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://7yil0fiftvaf
diff --git a/menus/scenes/overlaid_menus/InventoryUi.cs b/menus/scenes/overlaid_menus/InventoryUi.cs
new file mode 100644
index 00000000..ba1a9a81
--- /dev/null
+++ b/menus/scenes/overlaid_menus/InventoryUi.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using Gamesmiths.Forge.Effects;
+using Gamesmiths.Forge.Godot.Resources.Abilities;
+using Godot;
+using Movementtests.managers;
+using Movementtests.systems;
+
+[Tool, GlobalClass, Icon("res://assets/ui/IconGodotNode/control/icon_crate.png")]
+public partial class InventoryUi : Control
+{
+    private AbilitySelection _startedFlyingSelection;
+    private AbilitySelection _whileFlyingSelection;
+    private AbilitySelection _stoppedFlyingSelection;
+    
+    public override void _Ready()
+    {
+        _startedFlyingSelection = GetNode<AbilitySelection>("%StartedFlying");
+        _whileFlyingSelection = GetNode<AbilitySelection>("%WhileFlying");
+        _stoppedFlyingSelection = GetNode<AbilitySelection>("%StoppedFlying");
+
+        _startedFlyingSelection.Initialize(InventoryManager.Instance.WeaponEventsInventory[WeaponSystem.WeaponEvent.StartedFlying]);
+        _whileFlyingSelection.Initialize(InventoryManager.Instance.WeaponEventsInventory[WeaponSystem.WeaponEvent.FlyingTick]);
+        _stoppedFlyingSelection.Initialize(InventoryManager.Instance.WeaponEventsInventory[WeaponSystem.WeaponEvent.StoppedFlying]);
+        
+        _startedFlyingSelection.AbilityAdded += AddAbilityForEvent;
+        _whileFlyingSelection.AbilityAdded += AddAbilityForEvent;
+        _stoppedFlyingSelection.AbilityAdded += AddAbilityForEvent;
+        
+        _startedFlyingSelection.AbilityRemoved += RemoveAbilityForEvent;
+        _whileFlyingSelection.AbilityRemoved += RemoveAbilityForEvent;
+        _stoppedFlyingSelection.AbilityRemoved += RemoveAbilityForEvent;
+        
+        InventoryManager.Instance.WeaponEventAbilityAdded += OnWeaponEventInventoryAdded;
+        InventoryManager.Instance.WeaponEventAbilityRemoved += OnWeaponEventInventoryRemoved;
+    }
+
+    public override void _ExitTree()
+    {
+        InventoryManager.Instance.WeaponEventAbilityAdded -= OnWeaponEventInventoryAdded;
+        InventoryManager.Instance.WeaponEventAbilityRemoved -= OnWeaponEventInventoryRemoved;
+        base._ExitTree();
+    }
+
+    public void AddAbilityForEvent(WeaponSystem.WeaponEvent forEvent, ForgeAbilityBehavior abilityBehavior)
+    {
+        InventoryManager.Instance.AddAbilityForWeaponEvent(forEvent, abilityBehavior);
+    }
+
+    public void RemoveAbilityForEvent(WeaponSystem.WeaponEvent forEvent, ForgeAbilityBehavior abilityBehavior)
+    {
+        InventoryManager.Instance.RemoveAbilityForWeaponEvent(forEvent, abilityBehavior);
+    }
+    
+    public void OnWeaponEventInventoryAdded(WeaponEventAbilityData data)
+    {
+        if (data.Ability is not ForgeAbilityBehavior abilityBehavior) return;
+        
+        var selection = GetAbilitySelection(data.ForEvent);
+        selection.AddSelectedAbility(abilityBehavior);
+    }
+    
+    public void OnWeaponEventInventoryRemoved(WeaponEventAbilityData data)
+    {
+        if (data.Ability is not ForgeAbilityBehavior abilityBehavior) return;
+        
+        var selection = GetAbilitySelection(data.ForEvent);
+        selection.RemoveSelectedAbility(abilityBehavior);
+    }
+
+    public AbilitySelection GetAbilitySelection(WeaponSystem.WeaponEvent forEvent)
+    {
+        var abilitiesSelectionsMap = new Dictionary<WeaponSystem.WeaponEvent, AbilitySelection>
+        {
+            { WeaponSystem.WeaponEvent.StartedFlying, _startedFlyingSelection },
+            { WeaponSystem.WeaponEvent.StoppedFlying, _stoppedFlyingSelection },
+            { WeaponSystem.WeaponEvent.FlyingTick, _whileFlyingSelection },
+        };
+        
+        return abilitiesSelectionsMap[forEvent];
+    }
+}
diff --git a/menus/scenes/overlaid_menus/InventoryUi.cs.uid b/menus/scenes/overlaid_menus/InventoryUi.cs.uid
new file mode 100644
index 00000000..6c2d2e99
--- /dev/null
+++ b/menus/scenes/overlaid_menus/InventoryUi.cs.uid
@@ -0,0 +1 @@
+uid://cvwiftuay8jep
diff --git a/menus/scenes/overlaid_menus/inventory.tscn b/menus/scenes/overlaid_menus/inventory.tscn
index 11a16555..fc5f37a5 100644
--- a/menus/scenes/overlaid_menus/inventory.tscn
+++ b/menus/scenes/overlaid_menus/inventory.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://vu5kh5amnta" path="res://menus/scenes/overlaid_menus/inventory_wrapper.gd" id="1_yst23"]
 [ext_resource type="Script" uid="uid://1nf36h0gms3q" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="2_ijoei"]
-[ext_resource type="Script" uid="uid://7yil0fiftvaf" path="res://menus/scenes/overlaid_menus/Inventory.cs" id="2_sb1gh"]
+[ext_resource type="Script" uid="uid://cvwiftuay8jep" path="res://menus/scenes/overlaid_menus/InventoryUi.cs" id="2_sb1gh"]
 [ext_resource type="PackedScene" uid="uid://dmv685sskgh3l" path="res://menus/scenes/components/ability_selection.tscn" id="3_ijoei"]
 
 [node name="InventoryWrapper" type="Control" unique_id=1853168495]
diff --git a/project.godot b/project.godot
index 7559bb6c..64d5fbb9 100644
--- a/project.godot
+++ b/project.godot
@@ -15,7 +15,7 @@ warnings/check_invalid_track_paths=false
 [application]
 
 config/name="Movement tests"
-run/main_scene="uid://vm22i5sv3p3s"
+run/main_scene="uid://cgi7qekk387cf"
 config/features=PackedStringArray("4.6", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 
diff --git a/scenes/player_controller/components/weapon/WeaponSystem.cs b/scenes/player_controller/components/weapon/WeaponSystem.cs
index d7d2f186..37c6ea63 100644
--- a/scenes/player_controller/components/weapon/WeaponSystem.cs
+++ b/scenes/player_controller/components/weapon/WeaponSystem.cs
@@ -240,9 +240,9 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer, IForgeEntity
         Events.Subscribe(WeaponStoppedFlyingEventTag, _ => { _weaponFlyingAbility.Cancel(); });
     }
 
-    private List<ActiveEffectHandle> _grantedWeaponStartedFlyingAbilities = new List<ActiveEffectHandle>();
-    private List<ActiveEffectHandle> _grantedWeaponStoppedFlyingAbilities = new List<ActiveEffectHandle>();
-    private List<ActiveEffectHandle> _grantedWeaponFlyingTickAbilities = new List<ActiveEffectHandle>();
+    private Dictionary<ForgeAbilityBehavior, ActiveEffectHandle> _grantedWeaponStartedFlyingAbilities = new ();
+    private Dictionary<ForgeAbilityBehavior, ActiveEffectHandle> _grantedWeaponStoppedFlyingAbilities = new ();
+    private Dictionary<ForgeAbilityBehavior, ActiveEffectHandle> _grantedWeaponFlyingTickAbilities = new ();
 
     public enum WeaponEvent
     {
@@ -253,12 +253,9 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer, IForgeEntity
     
     public void GrantNewAbilityForEvent(WeaponEvent forEvent, ForgeAbilityBehavior abilityBehavior)
     {
-        var abilitiesMap = new Dictionary<WeaponEvent, List<ActiveEffectHandle>>
-            {
-                { WeaponEvent.StartedFlying, _grantedWeaponStartedFlyingAbilities },
-                { WeaponEvent.StoppedFlying, _grantedWeaponStoppedFlyingAbilities },
-                { WeaponEvent.FlyingTick, _grantedWeaponFlyingTickAbilities },
-            };
+        var relevantMap = GetGrantedAbilities(forEvent);
+        GD.Print($"Granted {abilityBehavior} for {forEvent}");
+        if (relevantMap.ContainsKey(abilityBehavior)) return;
         
         var eventTagsMap = new Dictionary<WeaponEvent, Tag>
         {
@@ -288,10 +285,28 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer, IForgeEntity
             effectComponents: [leftGrantComponent]);
         var effectHandle = EffectsManager.ApplyEffect(new Effect(leftGrantEffect, new EffectOwnership(this, this)));
         if (effectHandle == null) return;
-        
-        abilitiesMap[forEvent].Add(effectHandle);
+        relevantMap[abilityBehavior] = effectHandle;
+    }
+
+    public void RemoveAbilityForEvent(WeaponEvent forEvent, ForgeAbilityBehavior abilityBehavior)
+    {
+        var relevantMap = GetGrantedAbilities(forEvent);
+        if (!relevantMap.TryGetValue(abilityBehavior, out var effectHandle)) return;
+        EffectsManager.RemoveEffect(effectHandle);
+        relevantMap.Remove(abilityBehavior);
+    }
+
+    public Dictionary<ForgeAbilityBehavior, ActiveEffectHandle> GetGrantedAbilities(WeaponEvent forEvent)
+    {
+        var abilitiesMap = new Dictionary<WeaponEvent, Dictionary<ForgeAbilityBehavior, ActiveEffectHandle>>
+        {
+            { WeaponEvent.StartedFlying, _grantedWeaponStartedFlyingAbilities },
+            { WeaponEvent.StoppedFlying, _grantedWeaponStoppedFlyingAbilities },
+            { WeaponEvent.FlyingTick, _grantedWeaponFlyingTickAbilities },
+        };
+        
+        return abilitiesMap[forEvent];
     }
-    
 
     public void WeaponLeft()
     {
diff --git a/scenes/player_controller/resources/forge/exploding_sword.tres b/scenes/player_controller/resources/forge/exploding_sword.tres
index 0ec6d9df..e1f75163 100644
--- a/scenes/player_controller/resources/forge/exploding_sword.tres
+++ b/scenes/player_controller/resources/forge/exploding_sword.tres
@@ -2,7 +2,11 @@
 
 [ext_resource type="PackedScene" uid="uid://duju3atqgltkg" path="res://scenes/explosion/explosion.tscn" id="1_mnals"]
 [ext_resource type="Script" uid="uid://bnee6amtc2bhj" path="res://forge/abilities/ForgeExplodingSwordBehavior.cs" id="1_ot53g"]
+[ext_resource type="Texture2D" uid="uid://c2akxlg7tdb67" path="res://assets/ui/IconGodotNode/node/icon_projectile.png" id="2_l3coe"]
 
 [resource]
 script = ExtResource("1_ot53g")
 Explosion = ExtResource("1_mnals")
+Name = "Exploding Sword"
+Description = "Make the sword explode"
+Icon = ExtResource("2_l3coe")
diff --git a/scenes/player_controller/resources/forge/flying tick application ability behavior.tres b/scenes/player_controller/resources/forge/flying tick application ability behavior.tres
index f4347680..ba432e75 100644
--- a/scenes/player_controller/resources/forge/flying tick application ability behavior.tres	
+++ b/scenes/player_controller/resources/forge/flying tick application ability behavior.tres	
@@ -6,4 +6,5 @@
 [resource]
 script = ExtResource("2_f5qgs")
 EffectData = ExtResource("1_hlq5f")
+Name = "Flying tick application"
 metadata/_custom_type_script = "uid://cl5hudinl1rex"
diff --git a/scenes/player_controller/scripts/PlayerController.cs b/scenes/player_controller/scripts/PlayerController.cs
index 305fb56d..0b8c7fe4 100644
--- a/scenes/player_controller/scripts/PlayerController.cs
+++ b/scenes/player_controller/scripts/PlayerController.cs
@@ -717,7 +717,8 @@ public partial class PlayerController : CharacterBody3D,
 		_parryDash.StateEntered += OnDashParryStarted;
 		
 		// Inventory Management
-		InventoryManager.Instance.WeaponEventInventoryChanged += OnWeaponEventInventoryChanged;
+		InventoryManager.Instance.WeaponEventAbilityAdded += OnWeaponEventAbilityAdded;
+		InventoryManager.Instance.WeaponEventAbilityRemoved += OnWeaponEventAbilityRemoved;
 		
 		// Forge events
 		var weaponLeftToken = WeaponSystem.Events.Subscribe(WeaponSystem.WeaponStartedFlyingEventTag, OnWeaponLeft);
@@ -751,9 +752,18 @@ public partial class PlayerController : CharacterBody3D,
 			out var failures);
 	}
 
-	public void OnWeaponEventInventoryChanged(WeaponEventInventoryChangedData data)
+	public void OnWeaponEventAbilityAdded(WeaponEventAbilityData data)
 	{
-		WeaponSystem.GrantNewAbilityForEvent(data.ForEvent, WeaponExplosionBehavior);
+		if (data.Ability is not ForgeAbilityBehavior abilityBehavior) return;
+		
+		WeaponSystem.GrantNewAbilityForEvent(data.ForEvent, abilityBehavior);
+	}
+
+	public void OnWeaponEventAbilityRemoved(WeaponEventAbilityData data)
+	{
+		if (data.Ability is not ForgeAbilityBehavior abilityBehavior) return;
+		
+		WeaponSystem.RemoveAbilityForEvent(data.ForEvent, abilityBehavior);
 	}
 	
 	///////////////////////////
@@ -1162,7 +1172,7 @@ public partial class PlayerController : CharacterBody3D,
 		var tween = GetTree().CreateTween();
 		tween.SetParallel();
 		tween.SetTrans(Tween.TransitionType.Cubic);
-		tween.SetEase(Tween.EaseType.InOut);
+		tween.SetEase(Tween.EaseType.In);
 		tween.TweenProperty(this, "global_position", targetLocation, tweenTime);
 
 		return tween;
@@ -2024,8 +2034,8 @@ public partial class PlayerController : CharacterBody3D,
 	
 	public void OnAimingEntered()
 	{
-		if (!CanPerformEmpoweredAction())
-			return;
+		// if (!CanPerformEmpoweredAction())
+		// 	return;
 		
 		// DashIndicatorMesh.Visible = true;
 		if (!isOnFloorCustom())
@@ -2039,8 +2049,8 @@ public partial class PlayerController : CharacterBody3D,
 		// DashIndicatorMeshCylinder.Height = DashSystem.PlannedLocation.DistanceTo(GlobalPosition);
 		// DashIndicatorNode.LookAt(DashSystem.PlannedLocation);
 		
-		if (CanPerformEmpoweredAction())
-			DashSystem.PrepareDash();
+		// if (CanPerformEmpoweredAction())
+		DashSystem.PrepareDash();
 	}
 	public void OnAimingExited()
 	{
@@ -2490,22 +2500,23 @@ public partial class PlayerController : CharacterBody3D,
 		if (!HasSword) return;
 		
 		if (_onWallHanging.Active) return;
-
-		if (_aiming.Active && WeaponSystem.InHandState.Active && CanPerformEmpoweredAction())
+		
+		if (_aiming.Active && WeaponSystem.InHandState.Active)
 		{
 			ThrowWeapon();
 			return;
 		}
-		if (WeaponSystem.FlyingState.Active)
+		if (WeaponSystem.FlyingState.Active && CanPerformEmpoweredAction())
 		{
 			DashToFlyingWeapon();
 			return;
 		}
-		if (WeaponSystem.PlantedState.Active)
+		if (WeaponSystem.PlantedState.Active && CanPerformEmpoweredAction())
 		{
 			DashToPlantedWeapon();
 			return;
 		}
+		if (!WeaponSystem.InHandState.Active) return;
 
 		var attackToDo = _isEnemyInDashAttackRange ? "dash_attack" : "standard_attack";
 		_playerState.SendEvent(attackToDo);