diff --git a/templates/categories.html b/templates/categories.html
index 37a9db8..fa0c5e4 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -21,11 +21,11 @@
-
+
-
\ No newline at end of file
+
diff --git a/templates/tags.html b/templates/tags.html
index d58f5a7..885f581 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -16,11 +16,11 @@
-
-
\ No newline at end of file
+
diff --git a/templates/widget/categories.html b/templates/widget/categories.html
index b608d23..c515a51 100644
--- a/templates/widget/categories.html
+++ b/templates/widget/categories.html
@@ -1,6 +1,6 @@
+ th:class="'card widget ' + ${sidebar.hide}"
th:with="num = ${#strings.isEmpty(theme.config.sidebar.categories_num)? 10 : T(java.lang.Integer).parseInt(theme.config.sidebar.categories_num)},
categories = ${categoryFinder.list(1,num)},
isEmpty = ${#lists.isEmpty(categories)}">
@@ -20,4 +20,4 @@
-
\ No newline at end of file
+
diff --git a/templates/widget/tagcloud.html b/templates/widget/tagcloud.html
index a631bdc..1d826b1 100644
--- a/templates/widget/tagcloud.html
+++ b/templates/widget/tagcloud.html
@@ -16,7 +16,7 @@
th:each="tag : ${tags}"
th:href="@{${tag.status.permalink}}"
th:text="${tag.spec.displayName}"
- th:with="size = ${#strings.length(tag.spec.displayName) + #strings.length(tag.spec.slug) + tag.postCount}"
+ th:with="size = ${#strings.length(tag.spec.displayName) + #strings.length(tag.spec.slug) + (tag.postCount != null ? tag.postCount : 0)}"
th:style="'font-size: ' + ${size < 14 ? 14 : size > 32 ? 32 : size} + 'px;' + ${(enableTagsColor && tag.spec.color != '#ffffff')? 'color: ' + tag.spec.color +';' : ''}">
-
\ No newline at end of file
+