diff --git a/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5 b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5
index e3aa620..eeb5468 100644
--- a/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5
+++ b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5
@@ -1,3 +1,3 @@
 source_md5="d7fa4a808d473904c3043c7892700d02"
-dest_md5="603497c5e82c90610e6693faacd65c41"
+dest_md5="79d2761024299394407590a3c9590ba8"
 
diff --git a/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex
index df0ccf2..537d353 100644
Binary files a/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex and b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex differ
diff --git a/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.md5 b/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.md5
index 1dfc95e..49a68f9 100644
--- a/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.md5
+++ b/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.md5
@@ -1,3 +1,3 @@
 source_md5="e860aab5fa3b6ce9c5831b3624861eb0"
-dest_md5="a265f8881bf649748bb86076a1059462"
+dest_md5="6cfd2389113f263dc5b688a08942f9dd"
 
diff --git a/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex b/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex
index 55bfb08..85c6aa0 100644
Binary files a/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex and b/godot_ship/.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex differ
diff --git a/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.md5 b/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.md5
index af8612f..31c48f2 100644
--- a/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.md5
+++ b/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.md5
@@ -1,3 +1,3 @@
 source_md5="f1043053126af1a739ae9a6d20541705"
-dest_md5="33d90f901d38e94006bc94b2bafbcc7f"
+dest_md5="b8036943867f6bf24077960327ed2b97"
 
diff --git a/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex b/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex
index 5ff27bd..db84eac 100644
Binary files a/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex and b/godot_ship/.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex differ
diff --git a/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.md5 b/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.md5
index 7591b93..4920a27 100644
--- a/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.md5
+++ b/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.md5
@@ -1,3 +1,3 @@
 source_md5="e5510033f1a1421d95771be4d1f17c06"
-dest_md5="acfea8b7761d165a201dbc0a0af2c167"
+dest_md5="e80f208bbbbd2ca30e0a7359660729b1"
 
diff --git a/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex b/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex
index 1811209..8b63653 100644
Binary files a/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex and b/godot_ship/.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex differ
diff --git a/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.md5 b/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.md5
index 87e41aa..4037f4a 100644
--- a/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.md5
+++ b/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.md5
@@ -1,3 +1,3 @@
 source_md5="236f053c1af2cb6dc8fb21dd8c49fee6"
-dest_md5="e8811c15e8ebcd4a71c62994dc9c6d5a"
+dest_md5="7fc84b78077c1b49d4a882905def4f97"
 
diff --git a/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex b/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex
index ce2db60..a9f5fa9 100644
Binary files a/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex and b/godot_ship/.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex differ
diff --git a/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.md5 b/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.md5
index 1e48c63..7642e5c 100644
--- a/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.md5
+++ b/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.md5
@@ -1,3 +1,3 @@
 source_md5="dc5c89239ead115c7989cdbee213c307"
-dest_md5="d26cc3c5d8c5165d3f5afb242806bdb4"
+dest_md5="2b046b004e32d55eddb3f221f313e885"
 
diff --git a/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.stex b/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.stex
index c38240f..3d98236 100644
Binary files a/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.stex and b/godot_ship/.import/Icon32.png-ba330b5438b784e541f4d4c7ff1165f1.stex differ
diff --git a/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.md5 b/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.md5
index 804c2ab..1c21ad2 100644
--- a/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.md5
+++ b/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.md5
@@ -1,3 +1,3 @@
 source_md5="d743da5448801d5a71eb2caff679e6ff"
-dest_md5="5d974b679ce52f358bf54f29b7a68669"
+dest_md5="3184b5500b4d274c2a28f30369cb91fe"
 
diff --git a/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.stex b/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.stex
index 9906f38..3726b40 100644
Binary files a/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.stex and b/godot_ship/.import/Icon64.png-688550eb2085ba14f76a5ffeb3504d87.stex differ
diff --git a/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.md5 b/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.md5
index 7d23ae6..2bf057f 100644
--- a/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.md5
+++ b/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.md5
@@ -1,3 +1,3 @@
 source_md5="4608512057ad7b079766b3ddf107024a"
-dest_md5="8f5996bd2322644767582317aefaf44d"
+dest_md5="360db98d84e4b72717b0996af7233b3b"
 
diff --git a/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.stex b/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.stex
index 3b242eb..0cb7292 100644
Binary files a/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.stex and b/godot_ship/.import/TextureAtlas.png-f8378824db0f2b64b8339984d33f1a41.stex differ
diff --git a/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.md5 b/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.md5
index 870e2e2..ffca372 100644
--- a/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.md5
+++ b/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.md5
@@ -1,3 +1,3 @@
 source_md5="d170428fb8fee49a5eb5678c98b2250a"
-dest_md5="b0ca5f775a2fc3f7bb0490efd7529b1f"
+dest_md5="87e09d85627d00797694e1356ac184f6"
 
diff --git a/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.stex b/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.stex
index 2cd0ce5..535a92e 100644
Binary files a/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.stex and b/godot_ship/.import/board.png-9e4a38787502ba50f20171816826c39a.stex differ
diff --git a/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.md5 b/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.md5
index b81f750..4639844 100644
--- a/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.md5
+++ b/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.md5
@@ -1,3 +1,3 @@
 source_md5="63dd36a667b0c12811b2125ee52eccfa"
-dest_md5="6d17cd95e250f32964311c12ff5cfaf8"
+dest_md5="c4ef4c1f90d4bda5ea479c896e10e94f"
 
diff --git a/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.stex b/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.stex
index a229728..5d3bd09 100644
Binary files a/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.stex and b/godot_ship/.import/board_dark.png-8ab92393097062ca3eabf40325bbb36d.stex differ
diff --git a/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.md5 b/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.md5
index b6747b4..22d3461 100644
--- a/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.md5
+++ b/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.md5
@@ -1,3 +1,3 @@
 source_md5="005f64fb1ff8de71218d3545cc20441c"
-dest_md5="dcee8e0391b5bffbc76299f1b93a1100"
+dest_md5="0908c08a25eefd29b814ad5d83f456c9"
 
diff --git a/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.stex b/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.stex
index a57c1c5..8a2b8a0 100644
Binary files a/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.stex and b/godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.stex differ
diff --git a/godot_ship/assets/backgrounds/splash_image.png.import b/godot_ship/assets/backgrounds/splash_image.png.import
index 2015646..af4a442 100644
--- a/godot_ship/assets/backgrounds/splash_image.png.import
+++ b/godot_ship/assets/backgrounds/splash_image.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
diff --git a/godot_ship/assets/game/Hit.png.import b/godot_ship/assets/game/Hit.png.import
index 81b5358..3ecd247 100644
--- a/godot_ship/assets/game/Hit.png.import
+++ b/godot_ship/assets/game/Hit.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
diff --git a/godot_ship/assets/game/HitMissAtlas.png.import b/godot_ship/assets/game/HitMissAtlas.png.import
index 171103e..ea2ff89 100644
--- a/godot_ship/assets/game/HitMissAtlas.png.import
+++ b/godot_ship/assets/game/HitMissAtlas.png.import
@@ -2,24 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-<<<<<<< HEAD:godot_ship/assets/backgrounds/Background_Dark.png.import
-path="res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex"
-=======
 path="res://.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex"
->>>>>>> game-logic:godot_ship/assets/game/HitMissAtlas.png.import
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-<<<<<<< HEAD:godot_ship/assets/backgrounds/Background_Dark.png.import
-source_file="res://assets/backgrounds/Background_Dark.png"
-dest_files=[ "res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex" ]
-=======
 source_file="res://assets/game/HitMissAtlas.png"
 dest_files=[ "res://.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex" ]
->>>>>>> game-logic:godot_ship/assets/game/HitMissAtlas.png.import
 
 [params]
 
@@ -29,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
diff --git a/godot_ship/assets/game/TextureAtlas.png.import b/godot_ship/assets/game/TextureAtlas.png.import
index 60101a4..b753396 100644
--- a/godot_ship/assets/game/TextureAtlas.png.import
+++ b/godot_ship/assets/game/TextureAtlas.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
diff --git a/godot_ship/assets/game/board.png.import b/godot_ship/assets/game/board.png.import
index 10b024f..9cebfe2 100644
--- a/godot_ship/assets/game/board.png.import
+++ b/godot_ship/assets/game/board.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
diff --git a/godot_ship/assets/game/board_dark.png.import b/godot_ship/assets/game/board_dark.png.import
index 8662067..880edb1 100644
--- a/godot_ship/assets/game/board_dark.png.import
+++ b/godot_ship/assets/game/board_dark.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
diff --git a/godot_ship/assets/icons/Icon128.png.import b/godot_ship/assets/icons/Icon128.png.import
index 56fcaa9..12e51a3 100644
--- a/godot_ship/assets/icons/Icon128.png.import
+++ b/godot_ship/assets/icons/Icon128.png.import
@@ -2,24 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-<<<<<<< HEAD:godot_ship/assets/game/2Ship.png.import
-path="res://.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex"
-=======
 path="res://.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex"
->>>>>>> game-logic:godot_ship/assets/icons/Icon128.png.import
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-<<<<<<< HEAD:godot_ship/assets/game/2Ship.png.import
-source_file="res://assets/game/2Ship.png"
-dest_files=[ "res://.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex" ]
-=======
 source_file="res://assets/icons/Icon128.png"
 dest_files=[ "res://.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex" ]
->>>>>>> game-logic:godot_ship/assets/icons/Icon128.png.import
 
 [params]
 
@@ -39,5 +30,5 @@ process/HDR_as_SRGB=false
 process/invert_color=false
 stream=false
 size_limit=0
-detect_3d=false
+detect_3d=true
 svg/scale=1.0
diff --git a/godot_ship/assets/icons/Icon16.png.import b/godot_ship/assets/icons/Icon16.png.import
index 198822c..7d3bd78 100644
--- a/godot_ship/assets/icons/Icon16.png.import
+++ b/godot_ship/assets/icons/Icon16.png.import
@@ -2,24 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-<<<<<<< HEAD:godot_ship/assets/game/3ShipA.png.import
-path="res://.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex"
-=======
 path="res://.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex"
->>>>>>> game-logic:godot_ship/assets/icons/Icon16.png.import
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-<<<<<<< HEAD:godot_ship/assets/game/3ShipA.png.import
-source_file="res://assets/game/3ShipA.png"
-dest_files=[ "res://.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex" ]
-=======
 source_file="res://assets/icons/Icon16.png"
 dest_files=[ "res://.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex" ]
->>>>>>> game-logic:godot_ship/assets/icons/Icon16.png.import
 
 [params]
 
@@ -39,5 +30,5 @@ process/HDR_as_SRGB=false
 process/invert_color=false
 stream=false
 size_limit=0
-detect_3d=false
+detect_3d=true
 svg/scale=1.0
diff --git a/godot_ship/assets/icons/Icon256.png.import b/godot_ship/assets/icons/Icon256.png.import
index 3af21cf..d7d10fd 100644
--- a/godot_ship/assets/icons/Icon256.png.import
+++ b/godot_ship/assets/icons/Icon256.png.import
@@ -2,24 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-<<<<<<< HEAD:godot_ship/assets/game/3ShipB.png.import
-path="res://.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex"
-=======
 path="res://.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex"
->>>>>>> game-logic:godot_ship/assets/icons/Icon256.png.import
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-<<<<<<< HEAD:godot_ship/assets/game/3ShipB.png.import
-source_file="res://assets/game/3ShipB.png"
-dest_files=[ "res://.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex" ]
-=======
 source_file="res://assets/icons/Icon256.png"
 dest_files=[ "res://.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex" ]
->>>>>>> game-logic:godot_ship/assets/icons/Icon256.png.import
 
 [params]
 
@@ -39,5 +30,5 @@ process/HDR_as_SRGB=false
 process/invert_color=false
 stream=false
 size_limit=0
-detect_3d=false
+detect_3d=true
 svg/scale=1.0
diff --git a/godot_ship/assets/icons/Icon32.png.import b/godot_ship/assets/icons/Icon32.png.import
index cfbcce5..e7a5e08 100644
--- a/godot_ship/assets/icons/Icon32.png.import
+++ b/godot_ship/assets/icons/Icon32.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
diff --git a/godot_ship/assets/icons/Icon64.png.import b/godot_ship/assets/icons/Icon64.png.import
index 71d7482..f5c2d43 100644
--- a/godot_ship/assets/icons/Icon64.png.import
+++ b/godot_ship/assets/icons/Icon64.png.import
@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2