diff --git a/components/cardword.html b/components/cardword.html
index 2c497d5..8011ed1 100644
--- a/components/cardword.html
+++ b/components/cardword.html
@@ -1,8 +1,14 @@
 {{define "cardword"}}
 {{if .Revealed}}
-<div id="card-{{.Word}}" class="bg-{{.Color}}-600 p-4 rounded-lg min-w-[100px] text-center text-white cursor-pointer" 
-     style="text-shadow: 0 2px 4px rgba(0,0,0,0.8);"> {{.Word}}
-</div>
+  {{if eq .Color "amber"}}
+    <div id="card-{{.Word}}" class="bg-{{.Color}}-100 p-4 rounded-lg min-w-[100px] text-center text-white cursor-pointer" 
+         style="text-shadow: 0 2px 4px rgba(0,0,0,0.9);"> {{.Word}}
+    </div>
+  {{else}}
+    <div id="card-{{.Word}}" class="bg-{{.Color}}-600 p-4 rounded-lg min-w-[100px] text-center text-white cursor-pointer" 
+         style="text-shadow: 0 2px 4px rgba(0,0,0,0.9);"> {{.Word}}
+    </div>
+  {{end}}
 {{else}}
 <div id="card-{{.Word}}" class="bg-stone-600 p-4 rounded-lg min-w-[100px] text-center text-white cursor-pointer" 
      style="text-shadow: 0 2px 4px rgba(0,0,0,0.8);"
diff --git a/wordloader/wordloader.go b/wordloader/wordloader.go
index 993b0f7..c9eef04 100644
--- a/wordloader/wordloader.go
+++ b/wordloader/wordloader.go
@@ -44,7 +44,7 @@ func (l *Loader) Load() ([]models.WordCard, error) {
 		if l.BlackCount > 0 {
 			cards[i] = models.WordCard{
 				Word:  word,
-				Color: "black",
+				Color: models.WordColorBlack,
 			}
 			l.BlackCount--
 			continue
@@ -52,7 +52,7 @@ func (l *Loader) Load() ([]models.WordCard, error) {
 		if l.WhiteCount > 0 {
 			cards[i] = models.WordCard{
 				Word:  word,
-				Color: "white",
+				Color: models.WordColorWhite,
 			}
 			l.WhiteCount--
 			continue
@@ -60,7 +60,7 @@ func (l *Loader) Load() ([]models.WordCard, error) {
 		if l.RedCount > 0 {
 			cards[i] = models.WordCard{
 				Word:  word,
-				Color: "red",
+				Color: models.WordColorRed,
 			}
 			l.RedCount--
 			continue
@@ -68,7 +68,7 @@ func (l *Loader) Load() ([]models.WordCard, error) {
 		if l.BlueCount > 0 {
 			cards[i] = models.WordCard{
 				Word:  word,
-				Color: "blue",
+				Color: models.WordColorBlue,
 			}
 			l.BlueCount--
 		}