diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index 6cb482413b3aff141277af18658c178065023955..6782bdd8c315f32fb98ae2eadf1d8d66260eb805 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -23,10 +23,12 @@
 ."+_art_display_class+" .boob    { "+_boobSkinStyle+"; }
 ."+_art_display_class+" .penis   { "+_penisSkinStyle+"; }
 ."+_art_display_class+" .scrotum { "+_scrotumSkinStyle+"; }
-."+_art_display_class+" .belly	 { "+_bellySkinStyle+"; }
+."+_art_display_class+" .belly   { "+_bellySkinStyle+"; }
 ."+_art_display_class+" .areola  { "+_areolaStyle+"; }
 ."+_art_display_class+" .labia   { "+_labiaStyle+"; }
 ."+_art_display_class+" .hair    { fill:"+_hairColour+"; }
+."+_art_display_class+" .pubic_hair     { fill:"+_pubicHairColour+"; }
+."+_art_display_class+" .underarm_hair  { fill:"+_underarmHairColour+"; }
 ."+_art_display_class+" .shoe    { fill:"+_shoeColour+"; }
 ."+_art_display_class+" .shoe_shadow    { fill:"+_shoeShadowColour+"; }
 ."+_art_display_class+" .smart_piercing { fill:#4DB748; }
diff --git a/src/art/vector/Set_Colour_Hair.tw b/src/art/vector/Set_Colour_Hair.tw
index d3eb0a1a1a4a3ecbb69a2ad6c78c35cfb10b0a0d..23d45df451fc77bb648e542d1858c39ae1fcd458 100644
--- a/src/art/vector/Set_Colour_Hair.tw
+++ b/src/art/vector/Set_Colour_Hair.tw
@@ -3,58 +3,9 @@
 /* 
 "Free-Cities Dyes (taken from Cosmetic Rules Assistant Settings)"-
 to-"HTML Color"-Map
-courtesy of Nov-X */
+courtesy of Nov-X 
+*/
 
-<<switch _artSlave.hColor>>
-<<case "auburn">>
-  <<set _hairColour = "#7e543e">>
-<<case "black">>
-  <<set _hairColour = "#3F4040">>
-<<case "blonde">>
-  <<set _hairColour = "#F4F1A3">>
-<<case "blue">>
-  <<set _hairColour = "#4685C5">>
-<<case "brown">>
-  <<set _hairColour = "#8D4F21">>
-<<case "burgundy">>
-  <<set _hairColour = "#5f3946">>
-<<case "chestnut">>
-  <<set _hairColour = "#663622">>
-<<case "chocolate">>
-  <<set _hairColour = "#6e4937">>
-<<case "copper">>
-  <<set _hairColour = "#a16145">>
-<<case "dark brown">>
-  <<set _hairColour = "#463325">>
-<<case "ginger">>
-  <<set _hairColour = "#da822d">>
-<<case "golden">>
-  <<set _hairColour = "#ffdf31">>
-<<case "green">>
-  <<set _hairColour = "#5FBA46">>
-<<case "grey">>
-  <<set _hairColour = "#9e9fa4">>
-<<case "hazel">>
-  <<set _hairColour = "#8d6f1f">>
-<<case "pink">>
-  <<set _hairColour = "#D18CBC">>
-<<case "platinum blonde">>
-  <<set _hairColour = "#fcf3c1">>
-<<case "red">>
-  <<set _hairColour = "#BB2027">>
-<<case "silver">>
-  <<set _hairColour = "#cdc9c6">>
-<<case "strawberry-blonde">>
-  <<set _hairColour = "#e5a88c">>
-<<case "blazing red">>
-  <<set _hairColour = "#E00E2B">>
-<<case "neon green">>
-  <<set _hairColour = "#25d12b">>
-<<case "neon blue">>
-  <<set _hairColour = "#2284C3">>
-<<case "neon pink">>
-  <<set _hairColour = "#cc26aa">>
-<<default>>
-  /* everything else: assume it already is HTML compliant color name or value */
-  <<set _hairColour to extractHairColor(_artSlave.hColor) >>
-<</switch>> 
+<<set _hairColour to extractHairColor(_artSlave.hColor) >>
+<<set _pubicHairColour to extractHairColor(_artSlave.pubicHColor) >>
+<<set _underarmHairColour to extractHairColor(_artSlave.underArmHColor) >>