diff -rN -u old-ftd/application.lisp new-ftd/application.lisp
--- old-ftd/application.lisp	2006-12-29 15:35:37.000000000 +0100
+++ new-ftd/application.lisp	2006-12-29 15:35:37.000000000 +0100
@@ -114,8 +114,8 @@
 
 (defun current-pane ()
   (car (rassoc
-	(tab-layout::tab-pane-pane
-	 (enabled-pane
+	(tab-page-pane
+	 (tab-layout-enabled-page
 	  (find-pane-named *application-frame* 'tab-layout-pane)))
 	(pane/window *application-frame*))))
 
@@ -867,9 +867,8 @@
 	    (make-window directory)
 	  (let ((tab-pane (find-pane-named *application-frame* 'tab-layout-pane))
 		(new-tab
-		 (make-tab-pane-from-list title
-					  window)))
-	    (add-pane new-tab tab-pane t)
+		 (make-instance 'tab-page :title title :pane window)))
+	    (add-page new-tab tab-pane t)
 	    (setf (pane-needs-redisplay pane) enabled))))
 
 (defun close-tab (pane)
@@ -878,8 +877,7 @@
 				  :test #'equal :key #'car)))
 	   (setf (pane/window *application-frame*)
 		 (delete pane/window (pane/window *application-frame*)))
-	 (remove-pane (cdr pane/window)
-		      (find-pane-named *application-frame* 'tab-layout-pane))))
+	 (remove-page (sheet-to-page (cdr pane/window)))))
 	(t
 	 (beep)
 	 (display-message "Can't close the last tab. Type C-x C-c to quit."))))
@@ -1867,8 +1865,7 @@
 	 (let ((existing-tab
 		(find-if #'directory-match (pane/window *application-frame*))))
 	   (if existing-tab
-	       (switch-to-pane (cdr existing-tab)
-			       'tab-layout-pane)
+	       (switch-to-page (sheet-to-page (cdr existing-tab)))
 	       (add-tab-for-directory
 		(make-instance 'ftd-directory :pathname current-pathname)
 		(let ((last1 (last1 (pathname-directory current-pathname))))
diff -rN -u old-ftd/ftd.asd new-ftd/ftd.asd
--- old-ftd/ftd.asd	2006-12-29 15:35:37.000000000 +0100
+++ new-ftd/ftd.asd	2006-12-29 15:35:37.000000000 +0100
@@ -11,7 +11,7 @@
     :description "Flexi-Trivial Directory editor"
     :version "0.0.3"
     :author "John Splittist <splittist at yahoo.com>"
-    :depends-on (:mcclim :tab-layout :esa :cl-fad :cl-ppcre :cffi-unix :flexichain)
+    :depends-on (:mcclim :esa :cl-fad :cl-ppcre :cffi-unix :flexichain)
     :components ((:file "package")
 		 (:file "variables" :depends-on ("package"))
 		 (:file "user-variables" :depends-on ("package" "variables"))
diff -rN -u old-ftd/package.lisp new-ftd/package.lisp
--- old-ftd/package.lisp	2006-12-29 15:35:37.000000000 +0100
+++ new-ftd/package.lisp	2006-12-29 15:35:37.000000000 +0100
@@ -3,7 +3,7 @@
 ;;; See licence and disclaimer in application.lisp
 
 (cl:defpackage :ftd
-  (:use :clim :clim-lisp :esa :tab-layout)
+  (:use :clim :clim-lisp :esa :clim-tab-layout)
   (:export #:ftd))
 
 (cl:defpackage #:ftd-directory