diff --git a/mods/player_skins/init.lua b/mods/player_skins/init.lua
index c5d719d..da0f171 100644
--- a/mods/player_skins/init.lua
+++ b/mods/player_skins/init.lua
@@ -20,11 +20,14 @@ function player_skins.get_skin(name)
 end
 
 local components = {
-	-- TODO: Add support for skin colors 0-9
+	--skin_colors = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" },
 	skin_colors = { "1" },
 	cloth_colors = { "red", "redviolet", "magenta", "purple", "blue", "cyan", "green", "yellow", "orange" },
 	band_colors = { "red", "redviolet", "magenta", "purple", "blue", "skyblue", "cyan", "turquoise", "lime", "green", "yellow", "orange" },
-	hairs = { "beard", "short" },
+	hairs = {
+		"beard_brown", "beard_dark_brown", "beard_silver", "beard_black", "beard_red", "beard_orange",
+		"short_brown", "short_dark_brown", "short_silver", "short_black", "short_red", "short_orange",
+	},
 	eye_colors = { "green", "blue", "brown" },
 }
 
@@ -123,6 +126,7 @@ function player_skins.get_formspec(playername)
 	form = form .. "model[0.2,0.5;4,8;player_skins_skin_select_model;character.b3d;"..player_skins.skins[playername]..";0,180;false;false;0,0;0]"
 	form = form .. default.ui.button(3.5, 0.3, 3, 1, "player_skins_skin_select_hairs", S("Hair"))
 	form = form .. default.ui.button(3.5, 1.3, 3, 1, "player_skins_skin_select_eye_colors", S("Eyes"))
+	form = form .. default.ui.button(3.5, 2.3, 3, 1, "player_skins_skin_select_skin_colors", S("Skin"))
 	form = form .. default.ui.button(3.5, 3, 3, 1, "player_skins_skin_select_cloth_colors", S("Shirt"))
 	form = form .. default.ui.button(3.5, 5, 3, 1, "player_skins_skin_select_band_colors", S("Trousers"))
 	form = form .. default.ui.button(3.5, 7.75, 3, 1, "player_skins_skin_select_random", S("Random"))
diff --git a/mods/player_skins/textures/player_skins_hair_beard_black.png b/mods/player_skins/textures/player_skins_hair_beard_black.png
new file mode 100644
index 0000000..b3dbdc8
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_beard_black.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_beard.png b/mods/player_skins/textures/player_skins_hair_beard_brown.png
similarity index 100%
rename from mods/player_skins/textures/player_skins_hair_beard.png
rename to mods/player_skins/textures/player_skins_hair_beard_brown.png
diff --git a/mods/player_skins/textures/player_skins_hair_beard_dark_brown.png b/mods/player_skins/textures/player_skins_hair_beard_dark_brown.png
new file mode 100644
index 0000000..c84ab70
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_beard_dark_brown.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_beard_orange.png b/mods/player_skins/textures/player_skins_hair_beard_orange.png
new file mode 100644
index 0000000..f0b5e2b
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_beard_orange.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_beard_red.png b/mods/player_skins/textures/player_skins_hair_beard_red.png
new file mode 100644
index 0000000..765c5de
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_beard_red.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_beard_silver.png b/mods/player_skins/textures/player_skins_hair_beard_silver.png
new file mode 100644
index 0000000..0cc8fd3
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_beard_silver.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_short_black.png b/mods/player_skins/textures/player_skins_hair_short_black.png
new file mode 100644
index 0000000..4218789
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_short_black.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_short.png b/mods/player_skins/textures/player_skins_hair_short_brown.png
similarity index 100%
rename from mods/player_skins/textures/player_skins_hair_short.png
rename to mods/player_skins/textures/player_skins_hair_short_brown.png
diff --git a/mods/player_skins/textures/player_skins_hair_short_dark_brown.png b/mods/player_skins/textures/player_skins_hair_short_dark_brown.png
new file mode 100644
index 0000000..f631e4a
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_short_dark_brown.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_short_orange.png b/mods/player_skins/textures/player_skins_hair_short_orange.png
new file mode 100644
index 0000000..154eabe
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_short_orange.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_short_red.png b/mods/player_skins/textures/player_skins_hair_short_red.png
new file mode 100644
index 0000000..0fa41ee
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_short_red.png differ
diff --git a/mods/player_skins/textures/player_skins_hair_short_silver.png b/mods/player_skins/textures/player_skins_hair_short_silver.png
new file mode 100644
index 0000000..b479486
Binary files /dev/null and b/mods/player_skins/textures/player_skins_hair_short_silver.png differ