diff --git a/config/awesome/noodle/icon_taglist.lua b/config/awesome/noodle/icon_taglist.lua
index 425d6a4..5597213 100644
--- a/config/awesome/noodle/icon_taglist.lua
+++ b/config/awesome/noodle/icon_taglist.lua
@@ -65,14 +65,15 @@ local function update_widget()
     if s.tags[i] then
       tag_clients = s.tags[i]:clients()
     end
+
     if s.tags[i] and s.tags[i].selected then
-      tag_icons[i].image = beautiful.taglist_icons_focused[i]
+      tag_icons[i].image = beautiful.taglist_icons_focused[i] or beautiful.awesome_icon
     elseif s.tags[i] and s.tags[i].urgent then
-      tag_icons[i].image = beautiful.taglist_icons_urgent[i]
+      tag_icons[i].image = beautiful.taglist_icons_urgent[i] or beautiful.awesome_icon
     elseif tag_clients and #tag_clients > 0 then
-      tag_icons[i].image = beautiful.taglist_icons_occupied[i]
+      tag_icons[i].image = beautiful.taglist_icons_occupied[i] or beautiful.awesome_icon
     else
-      tag_icons[i].image = beautiful.taglist_icons_empty[i]
+      tag_icons[i].image = beautiful.taglist_icons_empty[i] or beautiful.awesome_icon
     end
   end
 end
diff --git a/config/awesome/noodle/text_taglist.lua b/config/awesome/noodle/text_taglist.lua
index 0abb820..d256f3c 100644
--- a/config/awesome/noodle/text_taglist.lua
+++ b/config/awesome/noodle/text_taglist.lua
@@ -73,7 +73,6 @@ gears.table.join(
   end)
 ))
 
-
 local function update_widget()
   for i = 1, ntags do
     local tag_clients
@@ -81,13 +80,13 @@ local function update_widget()
       tag_clients = s.tags[i]:clients()
     end
     if s.tags[i] and s.tags[i].selected then
-      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_focused[i], beautiful.taglist_text_color_focused[i])
+      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_focused[i] or tostring(i), beautiful.taglist_text_color_focused[i] or beautiful.fg_focus)
     elseif s.tags[i] and s.tags[i].urgent then
-      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_urgent[i], beautiful.taglist_text_color_urgent[i])
+      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_urgent[i] or tostring(i), beautiful.taglist_text_color_urgent[i] or beautiful.fg_urgent)
     elseif tag_clients and #tag_clients > 0 then
-      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_occupied[i], beautiful.taglist_text_color_occupied[i])
+      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_occupied[i] or tostring(i), beautiful.taglist_text_color_occupied[i] or beautiful.fg_normal)
     else
-      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_empty[i], beautiful.taglist_text_color_empty[i])
+      tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_empty[i] or tostring(i), beautiful.taglist_text_color_empty[i] or beautiful.fg_minimize)
     end
   end
 end