diff --git a/source/clog-web-themes.lisp b/source/clog-web-themes.lisp
index c9830d7..6c451a4 100644
--- a/source/clog-web-themes.lisp
+++ b/source/clog-web-themes.lisp
@@ -220,7 +220,7 @@ Page properties:
 	  (t
 	   ;; Setup CSS style changes
 	   (let ((sb (create-style-block body)))
-	     (add-style sb :element "a" '(("text-decoration" :none))))
+	     (add-style sb :element "a.clog-theme" '(("text-decoration" "none"))))
 	   ;;
 	   ;; Page layout
 	   ;;
@@ -234,6 +234,7 @@ Page properties:
 					 :url-src (logo website))
 			     :height 75))
 	     (create-span (create-a right
+				    :class "clog-theme"
 				    :link (url website))
 			  :content (title website)
 			  :class "w3-xlarge w3-sans-serif"))
@@ -252,6 +253,7 @@ Page properties:
 			     (eq (fourth item) nil))
 		     (incf count)
 		     (create-web-menu-item drop
+					   :class "clog-theme"
 					   :content (first item)
 					   :link (second item))))
 		 (when (eql count 0)
diff --git a/source/clog-web.lisp b/source/clog-web.lisp
index 49ddb48..d7559a8 100644
--- a/source/clog-web.lisp
+++ b/source/clog-web.lisp
@@ -263,9 +263,11 @@ Use to set a link or on-click to set an on-click handler"))
 				   (html-id nil))
   (let ((span
 	  (create-span (if link
-			   (create-a obj :link link)
+			   (create-a obj :class class :link link)
 			   obj)
-		       :content content :class class :html-id html-id)))
+		       :content content
+		       :class (unless link class)
+		       :html-id html-id)))
     (add-class span "w3-bar-item")
     (add-class span "w3-button")
     (set-on-click span on-click)