diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e3eba23dd8d2d6d95b12fe69d933944da2731d2d..c8be37d6ce41aa6f92edd5c807dfcd335460ebda 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -12,18 +12,10 @@
                 {{ $numtags := len .Params.tags }}
                 {{ $first_tag := index .Params.tags 0 }}
                 {{ if gt $numtags 0 }} {{ if ne $first_tag "" }} {{/* --if-- insert tag box */}}
-                    <div class="tags">
+                    <div class="single-tags">
                     {{ range .Params.tags }}
                         {{ $param_tag_name := . }}
-                        {{ if in $tag_color $param_tag_name }} {{/* if tag_name is defined in categories_color */}}
-                            {{ range $i, $tag_name := $tag_color }}
-                                {{ if eq $tag_name $param_tag_name }} 
-                                    <a href="{{ $.Site.BaseURL | absURL }}{{ $.Site.BaseURL | relLangURL }}/tags/{{ lower $param_tag_name }}" class="tagbutton {{ index $tag_color (add $i 1) }}">{{ $param_tag_name }}</a>
-                                {{ end }}
-                            {{ end }}
-                        {{ else }}
-                            <a href="{{ $.Site.BaseURL | absURL }}{{ $.Site.BaseURL | relLangURL }}/tags/{{ lower $param_tag_name }}" class="tagbutton">{{ $param_tag_name }}</a>
-                        {{ end }}
+                        <a href="{{ $.Site.BaseURL | absURL }}{{ $.Site.BaseURL | relLangURL }}/tags/{{ lower $param_tag_name }}" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a>
                     {{ end }}
                     </div>
                 {{ end }} {{ end }} {{/* --end-- insert tag box */}}
diff --git a/layouts/partials/embedded_css.html b/layouts/partials/embedded_css.html
index bd3645bba2fbf37e0a8e0264a9e072e1552e2321..caedaedf1f8caec4b6d8df92c53cb2216ea646c5 100644
--- a/layouts/partials/embedded_css.html
+++ b/layouts/partials/embedded_css.html
@@ -1,19 +1,17 @@
-<style type="text/css">
-
-{{ range $key, $value := .Site.Data.tag_color }}
 
+<style type="text/css">
+{{ range .Site.Params.category_colors }}
+{{ range $key, $value := . }}
 a.tagbutton.{{ $key }} {
   background-image: linear-gradient(45deg, {{ $value }} 0%, {{ $value }} 100%);
   border: solid 1px {{ $value }};
   color: white;
 }
-
 a.tagbutton.{{ $key }}:hover {
   background : white;
   border: solid 1px {{ $value }};
   color:{{ $value }};
 }
-
+    {{ end }}
 {{ end }}
-
 </style>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index b1562d5faf48c7b8e24b7c6c3ecfcaa6d3277b3a..ff90b79802af423de17f2c42aa51b50c75ec20f1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -36,6 +36,8 @@
       });
     </script>
     {{ end }}
+
+    {{ partial "embedded_css.html" . }}
     
 </head>
 
diff --git a/layouts/partials/postcard.html b/layouts/partials/postcard.html
index 93c0d4c5521387c2c127007fdb32eb086f3bef84..39cc8f0a43d811f0b7c82ff19e2a02d64409490b 100644
--- a/layouts/partials/postcard.html
+++ b/layouts/partials/postcard.html
@@ -12,24 +12,14 @@
             {{ if .Params.tags }}
                 {{ $numtags := len .Params.tags }}
                 {{ $first_tag := index .Params.tags 0 }}
-
                 {{ if gt $numtags 0 }} {{ if ne $first_tag "" }} {{/* --if-- insert tag box */}}
                     <div class="tags">
                     {{ range .Params.tags }}
                         {{ $param_tag_name := . }}
-                        {{ if in $tag_color $param_tag_name }} {{/* if tag_name is defined in categories_color */}}
-                            {{ range $i, $tag_name := $tag_color }}
-                                {{ if eq $tag_name $param_tag_name }} 
-                                    <a href="{{ $.Site.BaseURL | absLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ index $tag_color (add $i 1) }}">{{ $param_tag_name }}</a>
-                                {{ end }}
-                            {{ end }}
-                        {{ else }}
-                            <a href="{{ $.Site.BaseURL | absLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton">{{ $param_tag_name }}</a>
-                        {{ end }}
+                        <a href="{{ $.Site.BaseURL | absLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a>
                     {{ end }}
                     </div>
                 {{ end }} {{ end }} {{/* --end-- insert tag box */}}
-
             {{ end }}
             </div>
 
@@ -41,22 +31,12 @@
                 {{ $numtags := len .Params.tags }}
                 {{ $first_tag := index .Params.tags 0 }}
                 {{ if gt $numtags 0 }} {{ if ne $first_tag "" }}
-
                     <div class="tags"> {{/* --if-- insert tag box */}}
                     {{ range .Params.tags }}
                         {{ $param_tag_name := . }}
-                        {{ if in $tag_color $param_tag_name }} {{/* if tag_name is defined in categories_color */}}
-                            {{ range $i, $tag_name := $tag_color }}
-                                {{ if eq $tag_name $param_tag_name }} 
-                                    <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ index $tag_color (add $i 1) }}">{{ $param_tag_name }}</a>
-                                {{ end }}
-                            {{ end }}
-                        {{ else }}
-                            <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton">{{ $param_tag_name }}</a>
-                        {{ end }}
+                        <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a>
                     {{ end }} {{/* --end-- insert tag box */}}
                     </div>
-
                 {{ end }} {{ end }}
             {{ end }}
             </div>
@@ -80,23 +60,13 @@
         {{ if .Params.tags }}
             {{ $numtags := len .Params.tags }}
             {{ $first_tag := index .Params.tags 0 }}
-
             {{ if gt $numtags 0 }} {{ if ne $first_tag "" }}
                 <div class="tags">
                 {{ range .Params.tags }}
                     {{ $param_tag_name := . }}
-                    {{ if in $tag_color $param_tag_name }} {{/* if tag_name is defined in categories_color */}}
-                        {{ range $i, $tag_name := $tag_color }}
-                            {{ if eq $tag_name $param_tag_name }} 
-                                <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ index $tag_color (add $i 1) }}">{{ $param_tag_name }}</a>
-                            {{ end }}
-                        {{ end }}
-                    {{ else }}
-                        <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton">{{ $param_tag_name }}</a>
-                    {{ end }}
+                    <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a>
                 {{ end }}
                 </div>
-
             {{ end }} {{ end }}
         {{ end }}
         </div>