diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d1d7c3..897d71d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(Gint 2.11 REQUIRED)
 find_package(LibProf 2.4 REQUIRED)
 
 #set the color mode either to 1b or 2b
-set(COLORMODE_fx 1b)
+set(COLORMODE_fx 2b)
 #set the color mode either to 1b, 2b or EGA64
 set(COLORMODE_cg EGA64)
 
@@ -38,9 +38,9 @@ set(ASSETS
 
 set(ASSETS_cg
   assets-cg/demo_player.png
-  assets-cg/demo_PNJ.png
+  assets-cg/npc/char/npc_male.png
   assets-cg/SignAction.png
-  assets-cg/NPC_Icon.png
+  assets-cg/npc/face/npc_male.png
   assets-cg/SGN_Icon.png
   assets-cg/INFO_Icon.png
   assets-cg/player_face.png
@@ -61,9 +61,9 @@ set(ASSETS_cg_EGA64
 
 set(ASSETS_fx
   assets-fx/demo_player.png
-  assets-fx/demo_PNJ.png
+  assets-fx/npc/char/npc_male.png
   assets-fx/SignAction.png
-  assets-fx/NPC_Icon.png
+  assets-fx/npc/face/npc_male.png
   assets-fx/SGN_Icon.png
   assets-fx/INFO_Icon.png
   assets-fx/player_face.png
diff --git a/assets-cg/NPC_Icon.png b/assets-cg/NPC_Icon.png
deleted file mode 100644
index e9cc819..0000000
Binary files a/assets-cg/NPC_Icon.png and /dev/null differ
diff --git a/assets-cg/npc/char/fxconv-metadata.txt b/assets-cg/npc/char/fxconv-metadata.txt
new file mode 100644
index 0000000..b7658e5
--- /dev/null
+++ b/assets-cg/npc/char/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: demo_PNJ_img
diff --git a/assets-cg/npc/char/npc_male.png b/assets-cg/npc/char/npc_male.png
new file mode 100644
index 0000000..f4d654b
Binary files /dev/null and b/assets-cg/npc/char/npc_male.png differ
diff --git a/assets-cg/npc/face/fxconv-metadata.txt b/assets-cg/npc/face/fxconv-metadata.txt
new file mode 100644
index 0000000..1ac7f6f
--- /dev/null
+++ b/assets-cg/npc/face/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: NPC_Icon_img
diff --git a/assets-cg/npc/face/npc_female.png b/assets-cg/npc/face/npc_female.png
new file mode 100644
index 0000000..8ae75fc
Binary files /dev/null and b/assets-cg/npc/face/npc_female.png differ
diff --git a/assets-cg/npc/face/npc_male.png b/assets-cg/npc/face/npc_male.png
new file mode 100644
index 0000000..c4f4820
Binary files /dev/null and b/assets-cg/npc/face/npc_male.png differ
diff --git a/assets-fx/2bpp_palette.png b/assets-fx/2bpp_palette.png
new file mode 100644
index 0000000..05dc19d
Binary files /dev/null and b/assets-fx/2bpp_palette.png differ
diff --git a/assets-fx/NPC_Icon.png b/assets-fx/NPC_Icon.png
deleted file mode 100644
index b353607..0000000
Binary files a/assets-fx/NPC_Icon.png and /dev/null differ
diff --git a/assets-fx/demo_PNJ.png b/assets-fx/demo_PNJ.png
deleted file mode 100644
index 8198c59..0000000
Binary files a/assets-fx/demo_PNJ.png and /dev/null differ
diff --git a/assets-fx/fxconv-metadata.txt b/assets-fx/fxconv-metadata.txt
index 499f659..12e9d02 100644
--- a/assets-fx/fxconv-metadata.txt
+++ b/assets-fx/fxconv-metadata.txt
@@ -2,10 +2,6 @@ demo_player.png:
   type: bopti-image
   name: demo_player_img
 
-demo_PNJ.png:
-  type: bopti-image
-  name: demo_PNJ_img
-
 player_face.png:
   type: bopti-image
   name: player_face_img
@@ -18,10 +14,6 @@ INFO_Icon.png:
   type: bopti-image
   name: INFO_Icon_img
   
-NPC_Icon.png:
-  type: bopti-image
-  name: NPC_Icon_img
-  
 SGN_Icon.png:
   type: bopti-image
   name: SGN_Icon_img
@@ -34,4 +26,4 @@ font.png:
   grid.padding: 1
   grid.border: 0
   proportional: true
-  height: 5
\ No newline at end of file
+  height: 5
diff --git a/assets-fx/npc/char/fxconv-metadata.txt b/assets-fx/npc/char/fxconv-metadata.txt
new file mode 100644
index 0000000..b7658e5
--- /dev/null
+++ b/assets-fx/npc/char/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: demo_PNJ_img
diff --git a/assets-fx/npc/char/npc_male.png b/assets-fx/npc/char/npc_male.png
new file mode 100644
index 0000000..639504e
Binary files /dev/null and b/assets-fx/npc/char/npc_male.png differ
diff --git a/assets-fx/npc/face/fxconv-metadata.txt b/assets-fx/npc/face/fxconv-metadata.txt
new file mode 100644
index 0000000..1ac7f6f
--- /dev/null
+++ b/assets-fx/npc/face/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: NPC_Icon_img
diff --git a/assets-fx/npc/face/npc_female.png b/assets-fx/npc/face/npc_female.png
new file mode 100644
index 0000000..6727c29
Binary files /dev/null and b/assets-fx/npc/face/npc_female.png differ
diff --git a/assets-fx/npc/face/npc_male.png b/assets-fx/npc/face/npc_male.png
new file mode 100644
index 0000000..994a16d
Binary files /dev/null and b/assets-fx/npc/face/npc_male.png differ