diff --git a/bottle/bottle.tscn b/bottle/bottle.tscn
index 51a532b..c5b3946 100644
--- a/bottle/bottle.tscn
+++ b/bottle/bottle.tscn
@@ -1,10 +1,8 @@
 [gd_scene load_steps=5 format=3 uid="uid://bllsprv8orpn4"]
 
+[ext_resource type="PhysicsMaterial" uid="uid://b5egitifjvcqo" path="res://entity/gem_physics_material.tres" id="1_4mug4"]
 [ext_resource type="Texture2D" uid="uid://vmedndbi8crf" path="res://bottle/glass_tileset.png" id="1_qvgnf"]
 
-[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_y0g3v"]
-friction = 0.1
-
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_6tyce"]
 texture = ExtResource("1_qvgnf")
 0:0/0 = 0
@@ -107,7 +105,7 @@ texture = ExtResource("1_qvgnf")
 [sub_resource type="TileSet" id="TileSet_tr7be"]
 physics_layer_0/collision_layer = 18
 physics_layer_0/collision_mask = 0
-physics_layer_0/physics_material = SubResource("PhysicsMaterial_y0g3v")
+physics_layer_0/physics_material = ExtResource("1_4mug4")
 sources/1 = SubResource("TileSetAtlasSource_6tyce")
 
 [node name="Bottle" type="TileMap"]
diff --git a/entity/coal_diamond/coal.tscn b/entity/coal_diamond/coal.tscn
index baafeca..3ad55f5 100644
--- a/entity/coal_diamond/coal.tscn
+++ b/entity/coal_diamond/coal.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=3 uid="uid://diy8fj7mcc00p"]
 
-[ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="1_ftt7x"]
+[ext_resource type="PhysicsMaterial" uid="uid://b2ghrg3vynbi8" path="res://entity/coal_physics_material.tres" id="1_03a3j"]
 [ext_resource type="Texture2D" uid="uid://bnfwmlf7ems16" path="res://entity/coal_diamond/coal.png" id="2_ok4kf"]
 [ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="4_e8hbs"]
 [ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="5_3e4d8"]
@@ -8,10 +8,9 @@
 [node name="Coal" type="RigidBody2D"]
 collision_layer = 4
 collision_mask = 14
-mass = 0.75
-inertia = 1200.0
-physics_material_override = ExtResource("1_ftt7x")
-continuous_cd = 1
+mass = 0.5
+inertia = 300.0
+physics_material_override = ExtResource("1_03a3j")
 can_sleep = false
 linear_damp = 0.1
 angular_damp = 0.1
diff --git a/entity/coal_diamond/diamond.tscn b/entity/coal_diamond/diamond.tscn
index a7c6e32..b159e1e 100644
--- a/entity/coal_diamond/diamond.tscn
+++ b/entity/coal_diamond/diamond.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=3 uid="uid://cr5tiep20hk0s"]
 
-[ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="1_mma75"]
+[ext_resource type="PhysicsMaterial" uid="uid://b5egitifjvcqo" path="res://entity/gem_physics_material.tres" id="1_1hg8e"]
 [ext_resource type="Texture2D" uid="uid://bquk2q5g6bst5" path="res://entity/coal_diamond/diamond.png" id="2_abwth"]
 [ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="3_n4fa5"]
 [ext_resource type="PackedScene" uid="uid://ujpra0s1kpqi" path="res://value/valuable.tscn" id="4_yfos5"]
@@ -8,10 +8,9 @@
 [node name="Diamond" type="RigidBody2D"]
 collision_layer = 4
 collision_mask = 14
-mass = 3.0
-inertia = 400.0
-physics_material_override = ExtResource("1_mma75")
-continuous_cd = 1
+mass = 10.0
+inertia = 1500.0
+physics_material_override = ExtResource("1_1hg8e")
 can_sleep = false
 linear_damp = 0.1
 angular_damp = 0.1
diff --git a/entity/coal_physics_material.tres b/entity/coal_physics_material.tres
new file mode 100644
index 0000000..65c86fe
--- /dev/null
+++ b/entity/coal_physics_material.tres
@@ -0,0 +1,4 @@
+[gd_resource type="PhysicsMaterial" format=3 uid="uid://b2ghrg3vynbi8"]
+
+[resource]
+rough = true
diff --git a/entity/coin_copper/coin_copper.tscn b/entity/coin_copper/coin_copper.tscn
index e9b9a0f..ce5121b 100644
--- a/entity/coin_copper/coin_copper.tscn
+++ b/entity/coin_copper/coin_copper.tscn
@@ -15,7 +15,6 @@ collision_layer = 4
 collision_mask = 14
 inertia = 1000.0
 physics_material_override = ExtResource("1_1fypc")
-continuous_cd = 1
 can_sleep = false
 linear_damp = 0.1
 angular_damp = 0.1
diff --git a/entity/coin_gold/coin_gold.tscn b/entity/coin_gold/coin_gold.tscn
index f3b704f..7008f62 100644
--- a/entity/coin_gold/coin_gold.tscn
+++ b/entity/coin_gold/coin_gold.tscn
@@ -15,7 +15,6 @@ collision_mask = 14
 mass = 2.0
 inertia = 600.0
 physics_material_override = ExtResource("1_nfq5t")
-continuous_cd = 1
 can_sleep = false
 linear_damp = 0.1
 angular_damp = 0.1
diff --git a/entity/coin_physics_material.tres b/entity/coin_physics_material.tres
index 5bfe039..9fc045e 100644
--- a/entity/coin_physics_material.tres
+++ b/entity/coin_physics_material.tres
@@ -1,5 +1,6 @@
 [gd_resource type="PhysicsMaterial" format=3 uid="uid://c6kn1an85lccr"]
 
 [resource]
-friction = 0.5
+friction = 0.65
+rough = true
 bounce = 0.1
diff --git a/entity/coin_silver/coin_silver.tscn b/entity/coin_silver/coin_silver.tscn
index a7a9412..69c1ba8 100644
--- a/entity/coin_silver/coin_silver.tscn
+++ b/entity/coin_silver/coin_silver.tscn
@@ -16,7 +16,6 @@ collision_mask = 14
 mass = 1.5
 inertia = 800.0
 physics_material_override = ExtResource("1_4sq1a")
-continuous_cd = 1
 can_sleep = false
 linear_damp = 0.1
 angular_damp = 0.1
diff --git a/entity/gem/gem.tscn b/entity/gem/gem.tscn
index a31e4e0..46565cc 100644
--- a/entity/gem/gem.tscn
+++ b/entity/gem/gem.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=9 format=3 uid="uid://bawprh8kluilq"]
 
-[ext_resource type="PhysicsMaterial" uid="uid://c6kn1an85lccr" path="res://entity/coin_physics_material.tres" id="1_vmemd"]
+[ext_resource type="PhysicsMaterial" uid="uid://b5egitifjvcqo" path="res://entity/gem_physics_material.tres" id="1_bt3de"]
 [ext_resource type="Texture2D" uid="uid://b21bsbo5f0ed7" path="res://entity/gem/gemstone.png" id="3_6jejy"]
 [ext_resource type="PackedScene" uid="uid://vkvtap437nnf" path="res://color/colored.tscn" id="4_2cetq"]
 [ext_resource type="PackedScene" uid="uid://bk1vvq5rug01m" path="res://collector/collectible.tscn" id="4_idoeu"]
@@ -15,10 +15,9 @@ height = 9.0
 [node name="Gem" type="RigidBody2D"]
 collision_layer = 4
 collision_mask = 14
-mass = 1.5
-inertia = 800.0
-physics_material_override = ExtResource("1_vmemd")
-continuous_cd = 1
+mass = 8.0
+inertia = 1500.0
+physics_material_override = ExtResource("1_bt3de")
 can_sleep = false
 linear_damp = 0.1
 angular_damp = 0.1
diff --git a/entity/gem_physics_material.tres b/entity/gem_physics_material.tres
new file mode 100644
index 0000000..c92660b
--- /dev/null
+++ b/entity/gem_physics_material.tres
@@ -0,0 +1,4 @@
+[gd_resource type="PhysicsMaterial" format=3 uid="uid://b5egitifjvcqo"]
+
+[resource]
+friction = 0.1
diff --git a/entity/item/item_chalice.tscn b/entity/item/item_chalice.tscn
index cb9ecce..8f19f2f 100644
--- a/entity/item/item_chalice.tscn
+++ b/entity/item/item_chalice.tscn
@@ -12,10 +12,9 @@
 [node name="ItemChalice" type="RigidBody2D"]
 collision_layer = 4
 collision_mask = 14
-mass = 2.7
-inertia = 450.0
+mass = 24.0
+inertia = 1250.0
 physics_material_override = ExtResource("1_vp2el")
-continuous_cd = 1
 linear_damp = 0.1
 angular_damp = 0.1
 
diff --git a/entity/item/item_crown.tscn b/entity/item/item_crown.tscn
index 8e0f67c..49fbb41 100644
--- a/entity/item/item_crown.tscn
+++ b/entity/item/item_crown.tscn
@@ -15,10 +15,9 @@ radius = 12.25
 [node name="ItemCrown" type="RigidBody2D"]
 collision_layer = 4
 collision_mask = 14
-mass = 2.8
-inertia = 425.0
+mass = 48.0
+inertia = 2500.0
 physics_material_override = ExtResource("1_j1ug7")
-continuous_cd = 1
 linear_damp = 0.1
 angular_damp = 0.1
 
diff --git a/entity/item/item_ring.tscn b/entity/item/item_ring.tscn
index ae25cd1..a560855 100644
--- a/entity/item/item_ring.tscn
+++ b/entity/item/item_ring.tscn
@@ -16,10 +16,9 @@ height = 14.5
 [node name="ItemRing" type="RigidBody2D"]
 collision_layer = 4
 collision_mask = 14
-mass = 2.6
-inertia = 475.0
+mass = 12.0
+inertia = 800.0
 physics_material_override = ExtResource("1_yyeot")
-continuous_cd = 1
 linear_damp = 0.1
 angular_damp = 0.1