diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp
index 41fe6cd..3deaaf3 100644
--- a/tools/clog-builder.lisp
+++ b/tools/clog-builder.lisp
@@ -1170,14 +1170,7 @@ of controls and double click to select control."
                             (lambda (obj data)
                               (declare (ignore obj))
                               (when (current-editor-is-lisp app)
-                                (ignore-errors
-                                 (let* ((*PACKAGE*                 (find-package package))
-                                        (SWANK::*buffer-package*   (find-package package))
-                                        (SWANK::*buffer-readtable* *readtable*)
-                                        (loc (swank:find-definitions-for-emacs data)))
-                                   (when loc
-                                     (swank:ed-in-emacs (list (second (second (second (car loc))))
-                                                              :position (second (third (second (car loc))))))))))))
+                                (on-new-sys-browser editor :search data))))
     (set-on-change editor
                    (lambda (obj)
                      (let ((s (js-query obj (format nil
@@ -2223,16 +2216,6 @@ of controls and double click to select control."
     (set-geometry (create-clog-builder-repl (window-content win))
                   :units "%" :width 100 :height 100)))
 
-(defun on-new-sys-browser (obj)
-  (let* ((app (connection-data-item obj "builder-app-data"))
-         (win (create-gui-window obj :title "Package Browser"
-                                     :top 40 :left 225
-                                     :width 685 :height 430
-                                     :client-movement t))
-         (panel (create-sys-browser (window-content win))))
-    (set-on-window-size-done win (lambda (obj)
-                                   (clog-ace:resize (src-box panel))))))
-
 (defun on-new-asdf-browser (obj)
   (let* ((app (connection-data-item obj "builder-app-data"))
          (win (create-gui-window obj :title "ASDF System Browser"
@@ -2263,39 +2246,62 @@ of controls and double click to select control."
           (path (asdf:component-pathname n)))
       (add-select-option (files panel) path name))))
 
+(defun on-new-sys-browser (obj &key (search nil))
+  (let* ((app (connection-data-item obj "builder-app-data"))
+         (win (create-gui-window obj :title "System Browser"
+                                     :top 40 :left 225
+                                     :width 685 :height 430
+                                     :client-movement t))
+         (panel (create-sys-browser (window-content win))))
+    (when search
+      (setf (text-value (search-box panel)) search)
+      (sys-browser-populate panel))
+    (set-on-window-size-done win (lambda (obj)
+                                   (clog-ace:resize (src-box panel))))))
+
 (defun sys-browser-populate (panel)
   (setf (inner-html (class-box panel)) "")
   (setf (text-value (src-box panel)) "")
   (setf (text-value (doc-box panel)) "")
   (setf (text-value (file-name panel)) "")
   (setf (fname panel) nil)
-  (setf (classes panel) (definitions:find-definitions
-                         (text-value (package-box panel))
-                         :package (find-package :key)
-                         :type (find-symbol
-                                (text-value (type-box panel))
-                                (find-package :definitions))))
-  (let ((i 0))
-    (dolist (c (classes panel))
-      (let ((pac        (text-value (package-box panel)))
-            (name       (format nil "~A" (definitions:designator c)))
-            (filter     (text-value (search-box panel)))
-            (class-only (checkedp (class-only panel))))
-        (if (or (equal filter "")
-                (search filter name :test #'char-equal))
-            (if class-only
-                (if (equalp (package-name (definitions:package c))
-                            pac)
-                    (add-select-option (class-box panel) i
-                                       (format nil "~A - ~A"
-                                               name
-                                               (definitions:type c))))
-                (add-select-option (class-box panel) i
-                                   (format nil "~A:~A - ~A"
-                                           (package-name (definitions:package c))
-                                           name
-                                           (definitions:type c)))))
-        (incf i)))))
+  (let ((filter     (text-value (search-box panel)))
+        (class-only (checkedp (class-only panel)))
+        (pac        (text-value (package-box panel))))
+    (cond ((equalp pac "All")
+           (setf class-only nil)
+           (setf (classes panel) nil)
+           (unless (equal filter "")
+             (setf (classes panel) (definitions:apropos-definitions
+                                    filter
+                                    :type (find-symbol
+                                           (text-value (type-box panel))
+                                           (find-package :definitions))))))
+          (t
+           (setf (classes panel) (definitions:find-definitions
+                                  (text-value (package-box panel))
+                                  :package (find-package :key)
+                                  :type (find-symbol
+                                         (text-value (type-box panel))
+                                         (find-package :definitions))))))
+    (let ((i 0))
+      (dolist (c (classes panel))
+        (let ((name (format nil "~A" (definitions:designator c))))
+          (if (or (equal filter "")
+                  (search filter name :test #'char-equal))
+              (if class-only
+                  (if (equalp (package-name (definitions:package c))
+                              pac)
+                      (add-select-option (class-box panel) i
+                                         (format nil "~A - ~A"
+                                                 name
+                                                 (definitions:type c))))
+                  (add-select-option (class-box panel) i
+                                     (format nil "~A:~A - ~A"
+                                             (package-name (definitions:package c))
+                                             name
+                                             (definitions:type c)))))
+          (incf i))))))
 
 (defun sys-browser-select (panel target)
   (let* ((item (nth (parse-integer (text-value (class-box panel))) (classes panel))))
@@ -2406,14 +2412,14 @@ of controls and double click to select control."
       (create-gui-menu-item file  :content "New Custom Boot Page"      :on-click 'on-new-builder-custom)
       (create-gui-menu-item file  :content "New Application Template"  :on-click 'on-new-app-template)
       (create-gui-menu-item src   :content "New Source Editor"         :on-click 'on-open-file)
-      (create-gui-menu-item src   :content "New Package Browser"       :on-click 'on-new-sys-browser)
+      (create-gui-menu-item src   :content "New System Browser"        :on-click 'on-new-sys-browser)
       (create-gui-menu-item src   :content "New ASDF System Browser"   :on-click 'on-new-asdf-browser)
       (create-gui-menu-item tools :content "Control Events"            :on-click 'on-show-control-events-win)
       (create-gui-menu-item tools :content "Thread Viewer"             :on-click 'on-show-thread-viewer)
       (create-gui-menu-item tools :content "CLOG Builder REPL"         :on-click 'on-repl)
       (create-gui-menu-item tools :content "Copy/Cut History"          :on-click 'on-show-copy-history-win)
       (create-gui-menu-item tools :content "Image to HTML Data"        :on-click 'on-image-to-data)
-      (create-gui-menu-item tools :content "Launch Package Browser"    :on-click
+      (create-gui-menu-item tools :content "Launch System Browser"     :on-click
                             (lambda (obj)
                               (declare (ignore obj))
                               (open-window (window body) "/sysbrowser")))
diff --git a/tools/sys-browser.clog b/tools/sys-browser.clog
index 6c2d7fa..6e2da32 100644
--- a/tools/sys-browser.clog
+++ b/tools/sys-browser.clog
@@ -1,4 +1,4 @@
-<data id="I3868098456" data-in-package="clog-tools" data-custom-slots="(classes :accessor classes) (fname :accessor fname) (state :accessor state :initform t)" data-clog-next-id="22" data-clog-title="sys-browser"></data><select data-clog-type="dropdown" data-clog-name="type-box" style="box-sizing: content-box; position: absolute; left: 5px; top: 10px; width: 190px; height: 20px;" data-on-create="(add-select-options target '(ALIEN-TYPE
+<data id="I3868308897" data-in-package="clog-tools" data-custom-slots="(classes :accessor classes) (fname :accessor fname) (state :accessor state :initform t)" data-clog-next-id="22" data-clog-title="sys-browser"></data><select data-clog-type="dropdown" data-clog-name="type-box" style="box-sizing: content-box; position: absolute; left: 5px; top: 10px; width: 190px; height: 20px;" data-on-create="(add-select-options target '(ALIEN-TYPE
                              CALLABLE
                              CLASS
                              COMPILER-MACRO
@@ -24,17 +24,23 @@
                              TYPE-DEFINITION
                              VARIABLE
                              VOP))
-(setf (value target) &quot;CALLABLE&quot;)
-                             " data-on-change="(sys-browser-populate panel)"></select><select data-clog-type="dropdown" data-clog-name="package-box" style="box-sizing: content-box; position: absolute; left: 205px; top: 10px; width: 300px; height: 20px; bottom: 335.028px;" data-on-create="(dolist (p (sort (list-all-packages) (lambda (a b)
+(setf (value target) &quot;GLOBAL-DEFINITION&quot;)
+                             " data-on-change="(sys-browser-populate panel)"></select><select data-clog-type="dropdown" data-clog-name="package-box" style="box-sizing: content-box; position: absolute; left: 205px; top: 10px; width: 300px; height: 20px; bottom: 335.028px;" data-on-create="(add-select-option target &quot;All&quot;
+                          &quot;All&quot;)
+(dolist (p (sort (list-all-packages) (lambda (a b)
                                        (string-lessp (package-name a)
                                                      (package-name b)))))
   (add-select-option target (package-name p)
                             (package-name p)))
-(setf (value target) &quot;CLOG-USER&quot;)
+(setf (value target) &quot;All&quot;)
 (sys-browser-populate panel)" data-on-change="(sys-browser-populate panel)"></select><select data-clog-type="listbox" size="4" data-clog-name="class-box" style="box-sizing: content-box; position: absolute; left: 5px; top: 40px; right: 5px; height: 125px;" data-on-change="(sys-browser-select panel target)" class="w3-small"></select><textarea name="" cols="20" rows="2" data-clog-type="textarea" data-clog-name="doc-box" style="box-sizing: content-box; position: absolute; right: 5px; height: 50px; resize: none; min-width: 0px; top: 175px; left: 5px;" class="&nbsp;w3-small"></textarea><div class="ace_editor ace_hidpi ace-xcode ace-tm" data-clog-type="clog-ace" data-clog-composite-control="t" data-clog-ace-theme="ace/theme/xcode" data-clog-ace-mode="ace/mode/lisp" data-clog-ace-tab-size="2" data-clog-name="src-box" style="border: thin solid black; box-sizing: content-box; position: absolute; inset: 240px 5px 50px;" data-on-create="(setup-lisp-ace target (status-box panel))" data-on-input="(unless (state panel)
   (when (fname panel)
     (setf (state panel) t)
-    (setf (disabledp (save-button panel)) nil)))"></div><div data-clog-type="div" data-clog-name="status-box" style="box-sizing: content-box; position: absolute; left: 5px; bottom: 5px; right: 5px;" class="w3-tiny w3-border">status</div><label for="CLOGB386795982312" data-clog-type="label" data-clog-for="class-only" data-clog-name="label-class-only" style="box-sizing: content-box; position: absolute; left: 535px; top: 9px;" class="">pkg only</label><input type="CHECKBOX" value="" data-clog-type="checkbox" data-clog-name="class-only" style="box-sizing: content-box; position: absolute; left: 516px; top: 15px;" checked="checked" data-on-change="(sys-browser-populate panel)"><input type="TEXT" value="" data-clog-type="input" data-clog-name="search-box" style="box-sizing: content-box; position: absolute; inset: 7px 5px 332.045px 605px; height: 22px;" data-on-key-up="(sys-browser-populate panel)" placeholder="search" name=""><input type="BUTTON" value="Save" data-clog-type="fbutton" data-clog-name="save-button" style="box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 5px; bottom: 25px;" class="w3-small" disabled="disabled" data-on-click="(when (fname panel)
+    (setf (disabledp (save-button panel)) nil)))"></div><div data-clog-type="div" data-clog-name="status-box" style="box-sizing: content-box; position: absolute; left: 5px; bottom: 5px; right: 5px;" class="w3-tiny w3-border">status</div><label for="CLOGB386795982312" data-clog-type="label" data-clog-for="class-only" data-clog-name="label-class-only" style="box-sizing: content-box; position: absolute; left: 535px; top: 9px;" class="">pkg only</label><input type="CHECKBOX" value="" data-clog-type="checkbox" data-clog-name="class-only" style="box-sizing: content-box; position: absolute; left: 516px; top: 15px;" checked="checked" data-on-change="(sys-browser-populate panel)"><input type="TEXT" value="" data-clog-type="input" data-clog-name="search-box" style="box-sizing: content-box; position: absolute; inset: 7px 5px 332.045px 605px; height: 22px;" data-on-key-up="(cond ((equal (text-value (package-box panel)) &quot;All&quot;)
+        (when (equalp &quot;enter&quot; (getf data :key))
+          (sys-browser-populate panel)))
+      (t
+       (sys-browser-populate panel)))" placeholder="search" name=""><input type="BUTTON" value="Save" data-clog-type="fbutton" data-clog-name="save-button" style="box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 5px; bottom: 25px;" class="w3-small" disabled="disabled" data-on-click="(when (fname panel)
   (write-file (text-value (src-box panel)) (fname panel))
   (setf (state panel) nil)
   (setf (disabledp (save-button panel)) t))"><input type="BUTTON" value="Eval File" data-clog-type="fbutton" data-clog-name="eval-button" style="box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 75px; bottom: 25px;" class="w3-small" data-on-click="(let ((val (text-value (src-box panel))))
diff --git a/tools/sys-browser.lisp b/tools/sys-browser.lisp
index f945721..ae5b29b 100644
--- a/tools/sys-browser.lisp
+++ b/tools/sys-browser.lisp
@@ -15,48 +15,48 @@
   (let ((panel
          (change-class
           (clog:create-div clog-obj :content
-                           "<select style=\"box-sizing: content-box; position: absolute; left: 5px; top: 10px; width: 190px; height: 20px;\" id=\"CLOGB3868095606\" data-clog-name=\"type-box\"></select><select style=\"box-sizing: content-box; position: absolute; left: 205px; top: 10px; width: 300px; height: 20px; bottom: 335.028px;\" id=\"CLOGB3868095607\" data-clog-name=\"package-box\"></select><select size=\"4\" style=\"box-sizing: content-box; position: absolute; left: 5px; top: 40px; right: 5px; height: 125px;\" class=\"w3-small\" id=\"CLOGB3868095608\" data-clog-name=\"class-box\"></select><textarea name=\"\" cols=\"20\" rows=\"2\" style=\"box-sizing: content-box; position: absolute; right: 5px; height: 50px; resize: none; min-width: 0px; top: 175px; left: 5px;\" class=\"&nbsp;w3-small\" id=\"CLOGB3868095609\" data-clog-name=\"doc-box\"></textarea><div class=\"ace_editor ace_hidpi ace-xcode ace-tm\" style=\"border: thin solid black; box-sizing: content-box; position: absolute; inset: 240px 5px 50px;\" id=\"CLOGB3868095610\" data-clog-name=\"src-box\"></div><div style=\"box-sizing: content-box; position: absolute; left: 5px; bottom: 5px; right: 5px;\" class=\"w3-tiny w3-border\" id=\"CLOGB3868095611\" data-clog-name=\"status-box\">status</div><label for=\"CLOGB386795982312\" style=\"box-sizing: content-box; position: absolute; left: 535px; top: 9px;\" class=\"\" id=\"CLOGB3868095612\" data-clog-name=\"label-class-only\">pkg only</label><input type=\"CHECKBOX\" value=\"\" style=\"box-sizing: content-box; position: absolute; left: 516px; top: 15px;\" checked=\"checked\" id=\"CLOGB3868095613\" data-clog-name=\"class-only\"><input type=\"TEXT\" value=\"\" style=\"box-sizing: content-box; position: absolute; inset: 7px 5px 332.045px 605px; height: 22px;\" placeholder=\"search\" name=\"\" id=\"CLOGB3868095614\" data-clog-name=\"search-box\"><input type=\"BUTTON\" value=\"Save\" style=\"box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 5px; bottom: 25px;\" class=\"w3-small\" disabled=\"disabled\" id=\"CLOGB3868095615\" data-clog-name=\"save-button\"><input type=\"BUTTON\" value=\"Eval File\" style=\"box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 75px; bottom: 25px;\" class=\"w3-small\" disabled=\"disabled\" id=\"CLOGB3868095616\" data-clog-name=\"eval-button\"><input type=\"BUTTON\" value=\"Eval Sel\" style=\"box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 145px; bottom: 25px;\" class=\"w3-small\" placeholder=\"\" disabled=\"disabled\" id=\"CLOGB3868095617\" data-clog-name=\"eval-sel-button\"><div style=\"box-sizing: content-box; position: absolute; left: 5px; bottom: 27px; right: 220px;\" class=\"w3-small\" id=\"CLOGB3868095618\" data-clog-name=\"file-name\">&nbsp;</div>"
+                           "<select style=\"box-sizing: content-box; position: absolute; left: 5px; top: 10px; width: 190px; height: 20px;\" id=\"CLOGB3868308743\" data-clog-name=\"type-box\"></select><select style=\"box-sizing: content-box; position: absolute; left: 205px; top: 10px; width: 300px; height: 20px; bottom: 335.028px;\" id=\"CLOGB3868308744\" data-clog-name=\"package-box\"></select><select size=\"4\" style=\"box-sizing: content-box; position: absolute; left: 5px; top: 40px; right: 5px; height: 125px;\" class=\"w3-small\" id=\"CLOGB3868308745\" data-clog-name=\"class-box\"></select><textarea name=\"\" cols=\"20\" rows=\"2\" style=\"box-sizing: content-box; position: absolute; right: 5px; height: 50px; resize: none; min-width: 0px; top: 175px; left: 5px;\" class=\"&nbsp;w3-small\" id=\"CLOGB3868308746\" data-clog-name=\"doc-box\"></textarea><div class=\"ace_editor ace_hidpi ace-xcode ace-tm\" style=\"border: thin solid black; box-sizing: content-box; position: absolute; inset: 240px 5px 50px;\" id=\"CLOGB3868308747\" data-clog-name=\"src-box\"></div><div style=\"box-sizing: content-box; position: absolute; left: 5px; bottom: 5px; right: 5px;\" class=\"w3-tiny w3-border\" id=\"CLOGB3868308748\" data-clog-name=\"status-box\">status</div><label for=\"CLOGB386795982312\" style=\"box-sizing: content-box; position: absolute; left: 535px; top: 9px;\" class=\"\" id=\"CLOGB3868308749\" data-clog-name=\"label-class-only\">pkg only</label><input type=\"CHECKBOX\" value=\"\" style=\"box-sizing: content-box; position: absolute; left: 516px; top: 15px;\" checked=\"checked\" id=\"CLOGB3868308750\" data-clog-name=\"class-only\"><input type=\"TEXT\" value=\"\" style=\"box-sizing: content-box; position: absolute; inset: 7px 5px 332.045px 605px; height: 22px;\" placeholder=\"search\" name=\"\" id=\"CLOGB3868308751\" data-clog-name=\"search-box\"><input type=\"BUTTON\" value=\"Save\" style=\"box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 5px; bottom: 25px;\" class=\"w3-small\" disabled=\"disabled\" id=\"CLOGB3868308752\" data-clog-name=\"save-button\"><input type=\"BUTTON\" value=\"Eval File\" style=\"box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 75px; bottom: 25px;\" class=\"w3-small\" disabled=\"disabled\" id=\"CLOGB3868308753\" data-clog-name=\"eval-button\"><input type=\"BUTTON\" value=\"Eval Sel\" style=\"box-sizing: content-box; position: absolute; width: 50px; height: 15px; right: 145px; bottom: 25px;\" class=\"w3-small\" placeholder=\"\" disabled=\"disabled\" id=\"CLOGB3868308754\" data-clog-name=\"eval-sel-button\"><div style=\"box-sizing: content-box; position: absolute; left: 5px; bottom: 27px; right: 220px;\" class=\"w3-small\" id=\"CLOGB3868308755\" data-clog-name=\"file-name\">&nbsp;</div>"
                            :hidden hidden :class class :html-id html-id
                            :auto-place auto-place)
           'sys-browser)))
     (setf (slot-value panel 'file-name)
-            (attach-as-child clog-obj "CLOGB3868095618" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308755" :clog-type
              'clog:clog-div :new-id t))
     (setf (slot-value panel 'eval-sel-button)
-            (attach-as-child clog-obj "CLOGB3868095617" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308754" :clog-type
              'clog:clog-form-element :new-id t))
     (setf (slot-value panel 'eval-button)
-            (attach-as-child clog-obj "CLOGB3868095616" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308753" :clog-type
              'clog:clog-form-element :new-id t))
     (setf (slot-value panel 'save-button)
-            (attach-as-child clog-obj "CLOGB3868095615" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308752" :clog-type
              'clog:clog-form-element :new-id t))
     (setf (slot-value panel 'search-box)
-            (attach-as-child clog-obj "CLOGB3868095614" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308751" :clog-type
              'clog:clog-form-element :new-id t))
     (setf (slot-value panel 'class-only)
-            (attach-as-child clog-obj "CLOGB3868095613" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308750" :clog-type
              'clog:clog-form-element :new-id t))
     (setf (slot-value panel 'label-class-only)
-            (attach-as-child clog-obj "CLOGB3868095612" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308749" :clog-type
              'clog:clog-label :new-id t))
     (setf (slot-value panel 'status-box)
-            (attach-as-child clog-obj "CLOGB3868095611" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308748" :clog-type
              'clog:clog-div :new-id t))
     (setf (slot-value panel 'src-box)
-            (attach-as-child clog-obj "CLOGB3868095610" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308747" :clog-type
              'clog-ace:clog-ace-element :new-id t))
     (setf (slot-value panel 'doc-box)
-            (attach-as-child clog-obj "CLOGB3868095609" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308746" :clog-type
              'clog:clog-text-area :new-id t))
     (setf (slot-value panel 'class-box)
-            (attach-as-child clog-obj "CLOGB3868095608" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308745" :clog-type
              'clog:clog-select :new-id t))
     (setf (slot-value panel 'package-box)
-            (attach-as-child clog-obj "CLOGB3868095607" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308744" :clog-type
              'clog:clog-select :new-id t))
     (setf (slot-value panel 'type-box)
-            (attach-as-child clog-obj "CLOGB3868095606" :clog-type
+            (attach-as-child clog-obj "CLOGB3868308743" :clog-type
              'clog:clog-select :new-id t))
     (let ((target (type-box panel)))
       (declare (ignorable target))
@@ -66,16 +66,17 @@
          ir1-convert macro method method-combination optimizer setf-expander
          source-transform special-operator structure symbol-macro transform
          type type-definition variable vop))
-      (setf (value target) "CALLABLE"))
+      (setf (value target) "GLOBAL-DEFINITION"))
     (let ((target (package-box panel)))
       (declare (ignorable target))
+      (add-select-option target "All" "All")
       (dolist
           (p
            (sort (list-all-packages)
                  (lambda (a b)
                    (string-lessp (package-name a) (package-name b)))))
         (add-select-option target (package-name p) (package-name p)))
-      (setf (value target) "CLOG-USER")
+      (setf (value target) "All")
       (sys-browser-populate panel))
     (let ((target (src-box panel)))
       (declare (ignorable target))
@@ -115,7 +116,11 @@
     (clog:set-on-key-up (search-box panel)
                         (lambda (target data)
                           (declare (ignorable target data))
-                          (sys-browser-populate panel)))
+                          (cond
+                           ((equal (text-value (package-box panel)) "All")
+                            (when (equalp "enter" (getf data :key))
+                              (sys-browser-populate panel)))
+                           (t (sys-browser-populate panel)))))
     (clog:set-on-click (save-button panel)
                        (lambda (target)
                          (declare (ignorable target))