diff --git a/skintone/emoji.py b/skintone/emoji.py
index 23bd5b871..2f7b2d3a4 100644
--- a/skintone/emoji.py
+++ b/skintone/emoji.py
@@ -8,7 +8,7 @@ class Emoji:
     # This is the case for gender symbols which should be represented as emojis and not as characters
     fe0f_chars = {'♀', '♂'}
 
-    color_regex = re.compile("#([a-f0-9]{6,7})|rgb\(([0-9]{1,3},[0-9]{1,3},[0-9]{1,3})\)", re.IGNORECASE)
+    color_regex = re.compile("#?([a-f0-9]{6,7})|rgb\(([0-9]{1,3},[0-9]{1,3},[0-9]{1,3})\)", re.IGNORECASE)
 
     def __init__(self, modifiers: dict, path: str, base: str, end: bool = False):
         """
diff --git a/skintone/skins/base.json b/skintone/skins/base.json
index 25943b5d2..cb52a12fb 100644
--- a/skintone/skins/base.json
+++ b/skintone/skins/base.json
@@ -13,6 +13,8 @@
     "shadow_3": "#e59600",
     "shadow_4": "#e8a23d",
     "shadow_5": "#e28c25",
+    "shadow_6": "#ffa000",
+    "shadow_7": "#ff8f00",
     "ear": "#e39400",
     "hair": "#6d4c41",
     "hair_beard": "#6d4c41",
diff --git a/skintone/skins/light.json b/skintone/skins/light.json
index 18ae0dfa0..71162acd0 100644
--- a/skintone/skins/light.json
+++ b/skintone/skins/light.json
@@ -8,7 +8,7 @@
     "shadow": "#dba689",
     "ear": "#dba689",
     "hair": "#312d2d",
-    "hair_beard": "212121",
+    "hair_beard": "#212121",
     "pullover": "#00bfa5"
   }
 }
\ No newline at end of file