diff --git a/source/clog-form.lisp b/source/clog-form.lisp
index e6378d8..1622243 100644
--- a/source/clog-form.lisp
+++ b/source/clog-form.lisp
@@ -765,6 +765,31 @@ virtual keyboards."))
 				""))
 		:clog-type 'clog-fieldset :html-id html-id :auto-place t))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Implementation - clog-legend
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defclass clog-legend (clog-element)()
+  (:documentation "CLOG Fieldset Legend Object"));
+
+;;;;;;;;;;;;;;;;;;;
+;; create-legend ;;
+;;;;;;;;;;;;;;;;;;;
+
+(defgeneric create-legend (clog-obj &key content class html-id)
+  (:documentation "Create a new clog-legend as child of CLOG-OBJ."))
+
+(defmethod create-legend ((obj clog-obj) &key (content "")
+					     (class nil)
+					     (html-id nil))
+  (create-child obj (format nil "<legend~A>~A</legend>"
+			    (if class
+				(format nil " class='~A'"
+					(escape-string class))
+				"")
+			    content)
+		:clog-type 'clog-legend :html-id html-id :auto-place t))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Implementation - clog-data-list
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/source/clog.lisp b/source/clog.lisp
index b20b6bd..a5173e5 100644
--- a/source/clog.lisp
+++ b/source/clog.lisp
@@ -517,6 +517,9 @@ embedded in a native template application.)"
   (clog-fieldset   class)
   (create-fieldset generic-function)
 
+  "CLOG-Legend - Class for CLOG Legends"
+  (clog-legend   class)
+  (create-legend generic-function)
 
   "CLOG-Form-Element - Class for form elements"
   (clog-form-element   class)
diff --git a/tools/clog-builder-settings.lisp b/tools/clog-builder-settings.lisp
index a321c6d..af90eb0 100644
--- a/tools/clog-builder-settings.lisp
+++ b/tools/clog-builder-settings.lisp
@@ -47,6 +47,12 @@
 	  :control "tcol")
 	'(:tag "span"
 	  :control "span")
+	'(:tag "style"
+	  :control "style-block")
+	'(:tag "fieldset"
+	  :control "fieldset")
+	'(:tag "legend"
+	  :control "legend")
 	'(:tag "div"
 	  :control "div")))
 
@@ -386,6 +392,19 @@
      :create-type    :element
      :create-content ""
      :properties     (,@*props-element*))
+   `(:name           "fieldset"
+     :description    "Fieldset"
+     :clog-type      clog:clog-fieldset
+     :create         clog:create-fieldset
+     :create-type    :base
+     :properties     (,@*props-base*))
+   `(:name           "legend"
+     :description    "Fieldset Legend"
+     :clog-type      clog:clog-legend
+     :create         clog:create-legend
+     :create-content "Legend here"
+     :create-type    :element
+     :properties     (,@*props-element*))
    `(:name           "span"
      :description    "Span"
      :clog-type      clog:clog-span
@@ -792,4 +811,14 @@
      :clog-type      clog:clog-canvas
      :create         clog:create-canvas
      :create-type    :base
-     :properties     (,@*props-base*))))
+     :properties     (,@*props-base*))
+   `(:name           "style-block"
+     :description    "Style"
+     :clog-type      clog:clog-style-block
+     :create         clog:create-style-block
+     :create-type    :base
+     :properties     ((:name "media"
+		       :attr "media")
+		      (:name "type"
+		       :prop "type")
+		      ,@*props-text*))))