diff --git a/tools/clog-builder-settings.lisp b/tools/clog-builder-settings.lisp
index 28fc752..0f14ac3 100644
--- a/tools/clog-builder-settings.lisp
+++ b/tools/clog-builder-settings.lisp
@@ -2268,11 +2268,15 @@
 
 (defparameter *supported-templates*
   (list
+   '(:name    "CLOG Builder - Panel Templates"
+     :code    :group)
    '(:name    "New Builder Panel Project"
      :code    "nbp"
      :type    :system
      :www     "templates/www/"
      :loc     "templates/projects/clog-panel/")
+   '(:name    "CLOG Templates - General"
+     :code    :group)
    '(:name    "New CLOG Basic HTML Project"
      :code    "ncp"
      :type    :system
@@ -2293,6 +2297,8 @@
      :type    :system
      :www     "templates/www/"
      :loc     "templates/projects/clog-web-site/")
+   '(:name    "CLOG/CLOG Builder - Extension Templates"
+     :code    :group)
    '(:name    "New CLOG/CLOG-Builder Plugin Project"
      :code    "ncplug"
      :type    :system
diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp
index 52e1138..bdd3c0d 100644
--- a/tools/clog-builder.lisp
+++ b/tools/clog-builder.lisp
@@ -2123,7 +2123,9 @@ of controls and double click to select control."
     (window-center win)
     (setf (win ct) win)
     (dolist (tmpl *supported-templates*)
-      (add-select-option (template-box ct) (getf tmpl :code) (getf tmpl :name)))))
+      (if (eq (getf tmpl :code) :group)
+          (add-select-optgroup (template-box ct) (getf tmpl :name))
+          (add-select-option (template-box ct) (getf tmpl :code) (getf tmpl :name))))))
 
 (defun fill-button-clicked (panel)
   "Template fill botton clicked"