 	(t
 	 (switch-to-buffer name)
 	 (buffer-disable-undo)
-	 ;; #### This is a temporary fix until wid-edit gets fixed right.
-	 ;; We don't do everything that widget-button-click does -- i.e.
-	 ;; we don't change the link color on button down -- but that's
-	 ;; not important.
-	 ;; (add-local-hook
-	 ;;  'mouse-track-click-hook
-	 ;;  #'(lambda (event count)
-	 ;;      (cond
-	 ;;       ((widget-event-point event)
-	 ;;        (let* ((pos (widget-event-point event))
-	 ;;               (button (get-char-property pos 'button)))
-	 ;;          (when button
-	 ;;            (widget-apply-action button event)
-	 ;;            t))))))
-	 (set-specifier left-margin-width about-left-margin (current-buffer))
-	 (set (make-local-variable 'widget-button-face) 'about-specware-link-face)
+	 ;(set-specifier left-margin-width about-left-margin (current-buffer))
 	 nil)))
 
-(defun about-specware-center (string-or-glyph)
-  (let ((n (- (startup-center-spaces string-or-glyph) about-left-margin)))
+(defun about-specware-center (str)
+  (let ((n (- (length str) about-left-margin)))
     (make-string (if (natnump n) n 0) ?\ )))
 
 (defun about-specware-finish-buffer ()
-  (widget-insert "\n")
-  (widget-create 'link
-		 :help-echo "Bury this buffer"
-		 :action (lambda (widget event)
-			   (if event
-			       ;; For some reason,
-			       ;; (bury-buffer (event-buffer event))
-			       ;; doesn't work.
-			       (with-selected-window (event-window event)
-				 (bury-buffer))
-			     (bury-buffer)))
-		 :tag "Bury")
-  (widget-insert " this buffer and return to previous.\n")
+  (goto-char (point-max))
+  (insert "\n\n\n")
+  (insert-button "Bury"
+                                        ;  'face 'Bold
+                                        ;  'help-echo "mouse-1, see Specware Web Page"
+                 'action (lambda (_button) (bury-buffer))
+                 'follow-link t)
+  (insert " this buffer and return to previous.\n")
+  (center-line)
   (use-local-map (make-sparse-keymap))
-  (set-keymap-parent (current-local-map) widget-keymap)
   (local-set-key "q" 'bury-buffer)
   (local-set-key "l" 'bury-buffer)
   (local-set-key " " 'scroll-up)
   (local-set-key [backspace] 'scroll-down)
   (local-set-key "\177" 'scroll-down)
-  (widget-setup)
+ ; (widget-setup)
   (goto-char (point-min))
   (read-only-mode)
   (set-buffer-modified-p nil))


(when sw:use-hide-show
  ;(setq hs-minor-mode-map nil)		; Force resetting in case of old version
  (load-library "hideshow")
  (setq hs-allow-nesting t)
  (add-to-list 'hs-special-modes-alist
	       `(specware-mode ,(concat "\\(\\s(\\|\\<def\\>\\|"

;(defun insert-beta () (interactive) (insert ""))
;(defun insert-negation () (interactive) (insert ""))
;(defun insert-emptyset () (interactive) (insert ""))

(defvar x-symbol-mode)

(defun sw:x-symbol-toggle ()
  (customize-set-variable 'sw:use-x-symbol (not sw:use-x-symbol))
