diff --git a/extra/colors/authors.txt b/basis/colors/authors.txt
similarity index 100%
rename from extra/colors/authors.txt
rename to basis/colors/authors.txt
diff --git a/extra/colors/colors.factor b/basis/colors/colors.factor
similarity index 100%
rename from extra/colors/colors.factor
rename to basis/colors/colors.factor
diff --git a/extra/colors/hsv/authors.txt b/basis/colors/hsv/authors.txt
similarity index 100%
rename from extra/colors/hsv/authors.txt
rename to basis/colors/hsv/authors.txt
diff --git a/extra/colors/hsv/hsv.factor b/basis/colors/hsv/hsv.factor
similarity index 100%
rename from extra/colors/hsv/hsv.factor
rename to basis/colors/hsv/hsv.factor
diff --git a/extra/ui/authors.txt b/basis/ui/authors.txt
similarity index 100%
rename from extra/ui/authors.txt
rename to basis/ui/authors.txt
diff --git a/extra/ui/backend/authors.txt b/basis/ui/backend/authors.txt
similarity index 100%
rename from extra/ui/backend/authors.txt
rename to basis/ui/backend/authors.txt
diff --git a/extra/ui/backend/backend.factor b/basis/ui/backend/backend.factor
similarity index 100%
rename from extra/ui/backend/backend.factor
rename to basis/ui/backend/backend.factor
diff --git a/extra/ui/backend/summary.txt b/basis/ui/backend/summary.txt
similarity index 100%
rename from extra/ui/backend/summary.txt
rename to basis/ui/backend/summary.txt
diff --git a/extra/ui/clipboards/authors.txt b/basis/ui/clipboards/authors.txt
similarity index 100%
rename from extra/ui/clipboards/authors.txt
rename to basis/ui/clipboards/authors.txt
diff --git a/extra/ui/clipboards/clipboards-docs.factor b/basis/ui/clipboards/clipboards-docs.factor
similarity index 100%
rename from extra/ui/clipboards/clipboards-docs.factor
rename to basis/ui/clipboards/clipboards-docs.factor
diff --git a/extra/ui/clipboards/clipboards.factor b/basis/ui/clipboards/clipboards.factor
similarity index 100%
rename from extra/ui/clipboards/clipboards.factor
rename to basis/ui/clipboards/clipboards.factor
diff --git a/extra/ui/clipboards/summary.txt b/basis/ui/clipboards/summary.txt
similarity index 100%
rename from extra/ui/clipboards/summary.txt
rename to basis/ui/clipboards/summary.txt
diff --git a/extra/ui/cocoa/authors.txt b/basis/ui/cocoa/authors.txt
similarity index 100%
rename from extra/ui/cocoa/authors.txt
rename to basis/ui/cocoa/authors.txt
diff --git a/extra/ui/cocoa/cocoa.factor b/basis/ui/cocoa/cocoa.factor
similarity index 100%
rename from extra/ui/cocoa/cocoa.factor
rename to basis/ui/cocoa/cocoa.factor
diff --git a/extra/ui/cocoa/summary.txt b/basis/ui/cocoa/summary.txt
similarity index 100%
rename from extra/ui/cocoa/summary.txt
rename to basis/ui/cocoa/summary.txt
diff --git a/extra/ui/cocoa/tags.txt b/basis/ui/cocoa/tags.txt
similarity index 100%
rename from extra/ui/cocoa/tags.txt
rename to basis/ui/cocoa/tags.txt
diff --git a/extra/ui/cocoa/tools/authors.txt b/basis/ui/cocoa/tools/authors.txt
similarity index 100%
rename from extra/ui/cocoa/tools/authors.txt
rename to basis/ui/cocoa/tools/authors.txt
diff --git a/extra/ui/cocoa/tools/summary.txt b/basis/ui/cocoa/tools/summary.txt
similarity index 100%
rename from extra/ui/cocoa/tools/summary.txt
rename to basis/ui/cocoa/tools/summary.txt
diff --git a/extra/ui/cocoa/tools/tags.txt b/basis/ui/cocoa/tools/tags.txt
similarity index 100%
rename from extra/ui/cocoa/tools/tags.txt
rename to basis/ui/cocoa/tools/tags.txt
diff --git a/extra/ui/cocoa/tools/tools.factor b/basis/ui/cocoa/tools/tools.factor
similarity index 100%
rename from extra/ui/cocoa/tools/tools.factor
rename to basis/ui/cocoa/tools/tools.factor
diff --git a/extra/ui/cocoa/views/authors.txt b/basis/ui/cocoa/views/authors.txt
similarity index 100%
rename from extra/ui/cocoa/views/authors.txt
rename to basis/ui/cocoa/views/authors.txt
diff --git a/extra/ui/cocoa/views/summary.txt b/basis/ui/cocoa/views/summary.txt
similarity index 100%
rename from extra/ui/cocoa/views/summary.txt
rename to basis/ui/cocoa/views/summary.txt
diff --git a/extra/ui/cocoa/views/tags.txt b/basis/ui/cocoa/views/tags.txt
similarity index 100%
rename from extra/ui/cocoa/views/tags.txt
rename to basis/ui/cocoa/views/tags.txt
diff --git a/extra/ui/cocoa/views/views.factor b/basis/ui/cocoa/views/views.factor
similarity index 100%
rename from extra/ui/cocoa/views/views.factor
rename to basis/ui/cocoa/views/views.factor
diff --git a/extra/ui/commands/authors.txt b/basis/ui/commands/authors.txt
similarity index 100%
rename from extra/ui/commands/authors.txt
rename to basis/ui/commands/authors.txt
diff --git a/extra/ui/commands/commands-docs.factor b/basis/ui/commands/commands-docs.factor
similarity index 100%
rename from extra/ui/commands/commands-docs.factor
rename to basis/ui/commands/commands-docs.factor
diff --git a/extra/ui/commands/commands-tests.factor b/basis/ui/commands/commands-tests.factor
similarity index 100%
rename from extra/ui/commands/commands-tests.factor
rename to basis/ui/commands/commands-tests.factor
diff --git a/extra/ui/commands/commands.factor b/basis/ui/commands/commands.factor
similarity index 100%
rename from extra/ui/commands/commands.factor
rename to basis/ui/commands/commands.factor
diff --git a/extra/ui/commands/summary.txt b/basis/ui/commands/summary.txt
similarity index 100%
rename from extra/ui/commands/summary.txt
rename to basis/ui/commands/summary.txt
diff --git a/extra/ui/freetype/authors.txt b/basis/ui/freetype/authors.txt
similarity index 100%
rename from extra/ui/freetype/authors.txt
rename to basis/ui/freetype/authors.txt
diff --git a/extra/ui/freetype/freetype-docs.factor b/basis/ui/freetype/freetype-docs.factor
similarity index 100%
rename from extra/ui/freetype/freetype-docs.factor
rename to basis/ui/freetype/freetype-docs.factor
diff --git a/extra/ui/freetype/freetype.factor b/basis/ui/freetype/freetype.factor
similarity index 100%
rename from extra/ui/freetype/freetype.factor
rename to basis/ui/freetype/freetype.factor
diff --git a/extra/ui/freetype/summary.txt b/basis/ui/freetype/summary.txt
similarity index 100%
rename from extra/ui/freetype/summary.txt
rename to basis/ui/freetype/summary.txt
diff --git a/extra/ui/gadgets/authors.txt b/basis/ui/gadgets/authors.txt
similarity index 100%
rename from extra/ui/gadgets/authors.txt
rename to basis/ui/gadgets/authors.txt
diff --git a/extra/ui/gadgets/books/authors.txt b/basis/ui/gadgets/books/authors.txt
similarity index 100%
rename from extra/ui/gadgets/books/authors.txt
rename to basis/ui/gadgets/books/authors.txt
diff --git a/extra/ui/gadgets/books/books-docs.factor b/basis/ui/gadgets/books/books-docs.factor
similarity index 100%
rename from extra/ui/gadgets/books/books-docs.factor
rename to basis/ui/gadgets/books/books-docs.factor
diff --git a/extra/ui/gadgets/books/books-tests.factor b/basis/ui/gadgets/books/books-tests.factor
similarity index 100%
rename from extra/ui/gadgets/books/books-tests.factor
rename to basis/ui/gadgets/books/books-tests.factor
diff --git a/extra/ui/gadgets/books/books.factor b/basis/ui/gadgets/books/books.factor
similarity index 100%
rename from extra/ui/gadgets/books/books.factor
rename to basis/ui/gadgets/books/books.factor
diff --git a/extra/ui/gadgets/books/summary.txt b/basis/ui/gadgets/books/summary.txt
similarity index 100%
rename from extra/ui/gadgets/books/summary.txt
rename to basis/ui/gadgets/books/summary.txt
diff --git a/extra/ui/gadgets/borders/authors.txt b/basis/ui/gadgets/borders/authors.txt
similarity index 100%
rename from extra/ui/gadgets/borders/authors.txt
rename to basis/ui/gadgets/borders/authors.txt
diff --git a/extra/ui/gadgets/borders/borders-docs.factor b/basis/ui/gadgets/borders/borders-docs.factor
similarity index 100%
rename from extra/ui/gadgets/borders/borders-docs.factor
rename to basis/ui/gadgets/borders/borders-docs.factor
diff --git a/extra/ui/gadgets/borders/borders-tests.factor b/basis/ui/gadgets/borders/borders-tests.factor
similarity index 100%
rename from extra/ui/gadgets/borders/borders-tests.factor
rename to basis/ui/gadgets/borders/borders-tests.factor
diff --git a/extra/ui/gadgets/borders/borders.factor b/basis/ui/gadgets/borders/borders.factor
similarity index 100%
rename from extra/ui/gadgets/borders/borders.factor
rename to basis/ui/gadgets/borders/borders.factor
diff --git a/extra/ui/gadgets/borders/summary.txt b/basis/ui/gadgets/borders/summary.txt
similarity index 100%
rename from extra/ui/gadgets/borders/summary.txt
rename to basis/ui/gadgets/borders/summary.txt
diff --git a/extra/ui/gadgets/buttons/authors.txt b/basis/ui/gadgets/buttons/authors.txt
similarity index 100%
rename from extra/ui/gadgets/buttons/authors.txt
rename to basis/ui/gadgets/buttons/authors.txt
diff --git a/extra/ui/gadgets/buttons/buttons-docs.factor b/basis/ui/gadgets/buttons/buttons-docs.factor
similarity index 100%
rename from extra/ui/gadgets/buttons/buttons-docs.factor
rename to basis/ui/gadgets/buttons/buttons-docs.factor
diff --git a/extra/ui/gadgets/buttons/buttons-tests.factor b/basis/ui/gadgets/buttons/buttons-tests.factor
similarity index 100%
rename from extra/ui/gadgets/buttons/buttons-tests.factor
rename to basis/ui/gadgets/buttons/buttons-tests.factor
diff --git a/extra/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
similarity index 98%
rename from extra/ui/gadgets/buttons/buttons.factor
rename to basis/ui/gadgets/buttons/buttons.factor
index c5a5e8bad8..d60901d993 100755
--- a/extra/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -199,14 +199,11 @@ M: radio-control model-changed
 : <radio-button> ( value model label -- gadget )
     <radio-knob> label-on-right radio-button-theme <radio-control> ;
 
-: radio-buttons-theme ( gadget -- )
-    { 5 5 } >>gap drop ;
-
 : <radio-buttons> ( model assoc -- gadget )
   <filled-pile>
     -rot
     [ <radio-button> ] <radio-controls>
-  dup radio-buttons-theme ;
+  { 5 5 } >>gap ;
 
 : <toggle-button> ( value model label -- gadget )
     <radio-control> bevel-button-theme ;
diff --git a/extra/ui/gadgets/buttons/summary.txt b/basis/ui/gadgets/buttons/summary.txt
similarity index 100%
rename from extra/ui/gadgets/buttons/summary.txt
rename to basis/ui/gadgets/buttons/summary.txt
diff --git a/extra/ui/gadgets/canvas/authors.txt b/basis/ui/gadgets/canvas/authors.txt
similarity index 100%
rename from extra/ui/gadgets/canvas/authors.txt
rename to basis/ui/gadgets/canvas/authors.txt
diff --git a/extra/ui/gadgets/canvas/canvas.factor b/basis/ui/gadgets/canvas/canvas.factor
similarity index 100%
rename from extra/ui/gadgets/canvas/canvas.factor
rename to basis/ui/gadgets/canvas/canvas.factor
diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/basis/ui/gadgets/cartesian/cartesian.factor
similarity index 100%
rename from extra/ui/gadgets/cartesian/cartesian.factor
rename to basis/ui/gadgets/cartesian/cartesian.factor
diff --git a/extra/ui/gadgets/editors/authors.txt b/basis/ui/gadgets/editors/authors.txt
similarity index 100%
rename from extra/ui/gadgets/editors/authors.txt
rename to basis/ui/gadgets/editors/authors.txt
diff --git a/extra/ui/gadgets/editors/editors-docs.factor b/basis/ui/gadgets/editors/editors-docs.factor
similarity index 100%
rename from extra/ui/gadgets/editors/editors-docs.factor
rename to basis/ui/gadgets/editors/editors-docs.factor
diff --git a/extra/ui/gadgets/editors/editors-tests.factor b/basis/ui/gadgets/editors/editors-tests.factor
similarity index 100%
rename from extra/ui/gadgets/editors/editors-tests.factor
rename to basis/ui/gadgets/editors/editors-tests.factor
diff --git a/extra/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
similarity index 100%
rename from extra/ui/gadgets/editors/editors.factor
rename to basis/ui/gadgets/editors/editors.factor
diff --git a/extra/ui/gadgets/editors/summary.txt b/basis/ui/gadgets/editors/summary.txt
similarity index 100%
rename from extra/ui/gadgets/editors/summary.txt
rename to basis/ui/gadgets/editors/summary.txt
diff --git a/extra/ui/gadgets/frame-buffer/frame-buffer.factor b/basis/ui/gadgets/frame-buffer/frame-buffer.factor
similarity index 100%
rename from extra/ui/gadgets/frame-buffer/frame-buffer.factor
rename to basis/ui/gadgets/frame-buffer/frame-buffer.factor
diff --git a/extra/ui/gadgets/frames/authors.txt b/basis/ui/gadgets/frames/authors.txt
similarity index 100%
rename from extra/ui/gadgets/frames/authors.txt
rename to basis/ui/gadgets/frames/authors.txt
diff --git a/extra/ui/gadgets/frames/frames-docs.factor b/basis/ui/gadgets/frames/frames-docs.factor
similarity index 100%
rename from extra/ui/gadgets/frames/frames-docs.factor
rename to basis/ui/gadgets/frames/frames-docs.factor
diff --git a/extra/ui/gadgets/frames/frames-tests.factor b/basis/ui/gadgets/frames/frames-tests.factor
similarity index 100%
rename from extra/ui/gadgets/frames/frames-tests.factor
rename to basis/ui/gadgets/frames/frames-tests.factor
diff --git a/extra/ui/gadgets/frames/frames.factor b/basis/ui/gadgets/frames/frames.factor
similarity index 100%
rename from extra/ui/gadgets/frames/frames.factor
rename to basis/ui/gadgets/frames/frames.factor
diff --git a/extra/ui/gadgets/frames/summary.txt b/basis/ui/gadgets/frames/summary.txt
similarity index 100%
rename from extra/ui/gadgets/frames/summary.txt
rename to basis/ui/gadgets/frames/summary.txt
diff --git a/extra/ui/gadgets/gadgets-docs.factor b/basis/ui/gadgets/gadgets-docs.factor
similarity index 100%
rename from extra/ui/gadgets/gadgets-docs.factor
rename to basis/ui/gadgets/gadgets-docs.factor
diff --git a/extra/ui/gadgets/gadgets-tests.factor b/basis/ui/gadgets/gadgets-tests.factor
similarity index 100%
rename from extra/ui/gadgets/gadgets-tests.factor
rename to basis/ui/gadgets/gadgets-tests.factor
diff --git a/extra/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor
similarity index 100%
rename from extra/ui/gadgets/gadgets.factor
rename to basis/ui/gadgets/gadgets.factor
diff --git a/extra/ui/gadgets/grid-lines/authors.txt b/basis/ui/gadgets/grid-lines/authors.txt
similarity index 100%
rename from extra/ui/gadgets/grid-lines/authors.txt
rename to basis/ui/gadgets/grid-lines/authors.txt
diff --git a/extra/ui/gadgets/grid-lines/grid-lines-docs.factor b/basis/ui/gadgets/grid-lines/grid-lines-docs.factor
similarity index 100%
rename from extra/ui/gadgets/grid-lines/grid-lines-docs.factor
rename to basis/ui/gadgets/grid-lines/grid-lines-docs.factor
diff --git a/extra/ui/gadgets/grid-lines/grid-lines.factor b/basis/ui/gadgets/grid-lines/grid-lines.factor
similarity index 100%
rename from extra/ui/gadgets/grid-lines/grid-lines.factor
rename to basis/ui/gadgets/grid-lines/grid-lines.factor
diff --git a/extra/ui/gadgets/grid-lines/summary.txt b/basis/ui/gadgets/grid-lines/summary.txt
similarity index 100%
rename from extra/ui/gadgets/grid-lines/summary.txt
rename to basis/ui/gadgets/grid-lines/summary.txt
diff --git a/extra/ui/gadgets/grids/authors.txt b/basis/ui/gadgets/grids/authors.txt
similarity index 100%
rename from extra/ui/gadgets/grids/authors.txt
rename to basis/ui/gadgets/grids/authors.txt
diff --git a/extra/ui/gadgets/grids/grids-docs.factor b/basis/ui/gadgets/grids/grids-docs.factor
similarity index 100%
rename from extra/ui/gadgets/grids/grids-docs.factor
rename to basis/ui/gadgets/grids/grids-docs.factor
diff --git a/extra/ui/gadgets/grids/grids-tests.factor b/basis/ui/gadgets/grids/grids-tests.factor
similarity index 100%
rename from extra/ui/gadgets/grids/grids-tests.factor
rename to basis/ui/gadgets/grids/grids-tests.factor
diff --git a/extra/ui/gadgets/grids/grids.factor b/basis/ui/gadgets/grids/grids.factor
similarity index 100%
rename from extra/ui/gadgets/grids/grids.factor
rename to basis/ui/gadgets/grids/grids.factor
diff --git a/extra/ui/gadgets/grids/summary.txt b/basis/ui/gadgets/grids/summary.txt
similarity index 100%
rename from extra/ui/gadgets/grids/summary.txt
rename to basis/ui/gadgets/grids/summary.txt
diff --git a/extra/ui/gadgets/handler/authors.txt b/basis/ui/gadgets/handler/authors.txt
similarity index 100%
rename from extra/ui/gadgets/handler/authors.txt
rename to basis/ui/gadgets/handler/authors.txt
diff --git a/extra/ui/gadgets/handler/handler.factor b/basis/ui/gadgets/handler/handler.factor
similarity index 100%
rename from extra/ui/gadgets/handler/handler.factor
rename to basis/ui/gadgets/handler/handler.factor
diff --git a/extra/ui/gadgets/incremental/authors.txt b/basis/ui/gadgets/incremental/authors.txt
similarity index 100%
rename from extra/ui/gadgets/incremental/authors.txt
rename to basis/ui/gadgets/incremental/authors.txt
diff --git a/extra/ui/gadgets/incremental/incremental-docs.factor b/basis/ui/gadgets/incremental/incremental-docs.factor
similarity index 100%
rename from extra/ui/gadgets/incremental/incremental-docs.factor
rename to basis/ui/gadgets/incremental/incremental-docs.factor
diff --git a/extra/ui/gadgets/incremental/incremental.factor b/basis/ui/gadgets/incremental/incremental.factor
similarity index 100%
rename from extra/ui/gadgets/incremental/incremental.factor
rename to basis/ui/gadgets/incremental/incremental.factor
diff --git a/extra/ui/gadgets/incremental/summary.txt b/basis/ui/gadgets/incremental/summary.txt
similarity index 100%
rename from extra/ui/gadgets/incremental/summary.txt
rename to basis/ui/gadgets/incremental/summary.txt
diff --git a/extra/ui/gadgets/labelled/authors.txt b/basis/ui/gadgets/labelled/authors.txt
similarity index 100%
rename from extra/ui/gadgets/labelled/authors.txt
rename to basis/ui/gadgets/labelled/authors.txt
diff --git a/extra/ui/gadgets/labelled/labelled-docs.factor b/basis/ui/gadgets/labelled/labelled-docs.factor
similarity index 100%
rename from extra/ui/gadgets/labelled/labelled-docs.factor
rename to basis/ui/gadgets/labelled/labelled-docs.factor
diff --git a/extra/ui/gadgets/labelled/labelled.factor b/basis/ui/gadgets/labelled/labelled.factor
similarity index 100%
rename from extra/ui/gadgets/labelled/labelled.factor
rename to basis/ui/gadgets/labelled/labelled.factor
diff --git a/extra/ui/gadgets/labelled/summary.txt b/basis/ui/gadgets/labelled/summary.txt
similarity index 100%
rename from extra/ui/gadgets/labelled/summary.txt
rename to basis/ui/gadgets/labelled/summary.txt
diff --git a/extra/ui/gadgets/labels/authors.txt b/basis/ui/gadgets/labels/authors.txt
similarity index 100%
rename from extra/ui/gadgets/labels/authors.txt
rename to basis/ui/gadgets/labels/authors.txt
diff --git a/extra/ui/gadgets/labels/labels-docs.factor b/basis/ui/gadgets/labels/labels-docs.factor
similarity index 100%
rename from extra/ui/gadgets/labels/labels-docs.factor
rename to basis/ui/gadgets/labels/labels-docs.factor
diff --git a/extra/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor
similarity index 100%
rename from extra/ui/gadgets/labels/labels.factor
rename to basis/ui/gadgets/labels/labels.factor
diff --git a/extra/ui/gadgets/labels/summary.txt b/basis/ui/gadgets/labels/summary.txt
similarity index 100%
rename from extra/ui/gadgets/labels/summary.txt
rename to basis/ui/gadgets/labels/summary.txt
diff --git a/extra/ui/gadgets/lib/authors.txt b/basis/ui/gadgets/lib/authors.txt
similarity index 100%
rename from extra/ui/gadgets/lib/authors.txt
rename to basis/ui/gadgets/lib/authors.txt
diff --git a/extra/ui/gadgets/lib/lib.factor b/basis/ui/gadgets/lib/lib.factor
similarity index 100%
rename from extra/ui/gadgets/lib/lib.factor
rename to basis/ui/gadgets/lib/lib.factor
diff --git a/extra/ui/gadgets/lists/authors.txt b/basis/ui/gadgets/lists/authors.txt
similarity index 100%
rename from extra/ui/gadgets/lists/authors.txt
rename to basis/ui/gadgets/lists/authors.txt
diff --git a/extra/ui/gadgets/lists/lists-docs.factor b/basis/ui/gadgets/lists/lists-docs.factor
similarity index 100%
rename from extra/ui/gadgets/lists/lists-docs.factor
rename to basis/ui/gadgets/lists/lists-docs.factor
diff --git a/extra/ui/gadgets/lists/lists-tests.factor b/basis/ui/gadgets/lists/lists-tests.factor
similarity index 100%
rename from extra/ui/gadgets/lists/lists-tests.factor
rename to basis/ui/gadgets/lists/lists-tests.factor
diff --git a/extra/ui/gadgets/lists/lists.factor b/basis/ui/gadgets/lists/lists.factor
similarity index 100%
rename from extra/ui/gadgets/lists/lists.factor
rename to basis/ui/gadgets/lists/lists.factor
diff --git a/extra/ui/gadgets/lists/summary.txt b/basis/ui/gadgets/lists/summary.txt
similarity index 100%
rename from extra/ui/gadgets/lists/summary.txt
rename to basis/ui/gadgets/lists/summary.txt
diff --git a/extra/ui/gadgets/menus/authors.txt b/basis/ui/gadgets/menus/authors.txt
similarity index 100%
rename from extra/ui/gadgets/menus/authors.txt
rename to basis/ui/gadgets/menus/authors.txt
diff --git a/extra/ui/gadgets/menus/menus-docs.factor b/basis/ui/gadgets/menus/menus-docs.factor
similarity index 100%
rename from extra/ui/gadgets/menus/menus-docs.factor
rename to basis/ui/gadgets/menus/menus-docs.factor
diff --git a/extra/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor
similarity index 100%
rename from extra/ui/gadgets/menus/menus.factor
rename to basis/ui/gadgets/menus/menus.factor
diff --git a/extra/ui/gadgets/menus/summary.txt b/basis/ui/gadgets/menus/summary.txt
similarity index 100%
rename from extra/ui/gadgets/menus/summary.txt
rename to basis/ui/gadgets/menus/summary.txt
diff --git a/extra/ui/gadgets/packs/authors.txt b/basis/ui/gadgets/packs/authors.txt
similarity index 100%
rename from extra/ui/gadgets/packs/authors.txt
rename to basis/ui/gadgets/packs/authors.txt
diff --git a/extra/ui/gadgets/packs/packs-docs.factor b/basis/ui/gadgets/packs/packs-docs.factor
similarity index 100%
rename from extra/ui/gadgets/packs/packs-docs.factor
rename to basis/ui/gadgets/packs/packs-docs.factor
diff --git a/extra/ui/gadgets/packs/packs-tests.factor b/basis/ui/gadgets/packs/packs-tests.factor
similarity index 100%
rename from extra/ui/gadgets/packs/packs-tests.factor
rename to basis/ui/gadgets/packs/packs-tests.factor
diff --git a/extra/ui/gadgets/packs/packs.factor b/basis/ui/gadgets/packs/packs.factor
similarity index 100%
rename from extra/ui/gadgets/packs/packs.factor
rename to basis/ui/gadgets/packs/packs.factor
diff --git a/extra/ui/gadgets/packs/summary.txt b/basis/ui/gadgets/packs/summary.txt
similarity index 100%
rename from extra/ui/gadgets/packs/summary.txt
rename to basis/ui/gadgets/packs/summary.txt
diff --git a/extra/ui/gadgets/panes/authors.txt b/basis/ui/gadgets/panes/authors.txt
similarity index 100%
rename from extra/ui/gadgets/panes/authors.txt
rename to basis/ui/gadgets/panes/authors.txt
diff --git a/extra/ui/gadgets/panes/panes-docs.factor b/basis/ui/gadgets/panes/panes-docs.factor
similarity index 100%
rename from extra/ui/gadgets/panes/panes-docs.factor
rename to basis/ui/gadgets/panes/panes-docs.factor
diff --git a/extra/ui/gadgets/panes/panes-tests.factor b/basis/ui/gadgets/panes/panes-tests.factor
similarity index 100%
rename from extra/ui/gadgets/panes/panes-tests.factor
rename to basis/ui/gadgets/panes/panes-tests.factor
diff --git a/extra/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor
similarity index 100%
rename from extra/ui/gadgets/panes/panes.factor
rename to basis/ui/gadgets/panes/panes.factor
diff --git a/extra/ui/gadgets/panes/summary.txt b/basis/ui/gadgets/panes/summary.txt
similarity index 100%
rename from extra/ui/gadgets/panes/summary.txt
rename to basis/ui/gadgets/panes/summary.txt
diff --git a/extra/ui/gadgets/paragraphs/authors.txt b/basis/ui/gadgets/paragraphs/authors.txt
similarity index 100%
rename from extra/ui/gadgets/paragraphs/authors.txt
rename to basis/ui/gadgets/paragraphs/authors.txt
diff --git a/extra/ui/gadgets/paragraphs/paragraphs.factor b/basis/ui/gadgets/paragraphs/paragraphs.factor
similarity index 100%
rename from extra/ui/gadgets/paragraphs/paragraphs.factor
rename to basis/ui/gadgets/paragraphs/paragraphs.factor
diff --git a/extra/ui/gadgets/paragraphs/summary.txt b/basis/ui/gadgets/paragraphs/summary.txt
similarity index 100%
rename from extra/ui/gadgets/paragraphs/summary.txt
rename to basis/ui/gadgets/paragraphs/summary.txt
diff --git a/extra/ui/gadgets/plot/plot.factor b/basis/ui/gadgets/plot/plot.factor
similarity index 98%
rename from extra/ui/gadgets/plot/plot.factor
rename to basis/ui/gadgets/plot/plot.factor
index cf48c5ab9d..52cd2faed7 100644
--- a/extra/ui/gadgets/plot/plot.factor
+++ b/basis/ui/gadgets/plot/plot.factor
@@ -28,7 +28,7 @@ TUPLE: function function color ;
 
 GENERIC: plot-function ( plot object -- plot )
 
-M: quotation plot-function ( plot quotation -- plot )
+M: callable plot-function ( plot quotation -- plot )
   >r dup plot-range r> '[ dup @ 2array ] map line-strip ;
 
 M: function plot-function ( plot function -- plot )
diff --git a/extra/ui/gadgets/presentations/authors.txt b/basis/ui/gadgets/presentations/authors.txt
similarity index 100%
rename from extra/ui/gadgets/presentations/authors.txt
rename to basis/ui/gadgets/presentations/authors.txt
diff --git a/extra/ui/gadgets/presentations/presentations-docs.factor b/basis/ui/gadgets/presentations/presentations-docs.factor
similarity index 100%
rename from extra/ui/gadgets/presentations/presentations-docs.factor
rename to basis/ui/gadgets/presentations/presentations-docs.factor
diff --git a/extra/ui/gadgets/presentations/presentations-tests.factor b/basis/ui/gadgets/presentations/presentations-tests.factor
similarity index 100%
rename from extra/ui/gadgets/presentations/presentations-tests.factor
rename to basis/ui/gadgets/presentations/presentations-tests.factor
diff --git a/extra/ui/gadgets/presentations/presentations.factor b/basis/ui/gadgets/presentations/presentations.factor
similarity index 100%
rename from extra/ui/gadgets/presentations/presentations.factor
rename to basis/ui/gadgets/presentations/presentations.factor
diff --git a/extra/ui/gadgets/presentations/summary.txt b/basis/ui/gadgets/presentations/summary.txt
similarity index 100%
rename from extra/ui/gadgets/presentations/summary.txt
rename to basis/ui/gadgets/presentations/summary.txt
diff --git a/extra/ui/gadgets/scrollers/authors.txt b/basis/ui/gadgets/scrollers/authors.txt
similarity index 100%
rename from extra/ui/gadgets/scrollers/authors.txt
rename to basis/ui/gadgets/scrollers/authors.txt
diff --git a/extra/ui/gadgets/scrollers/scrollers-docs.factor b/basis/ui/gadgets/scrollers/scrollers-docs.factor
similarity index 100%
rename from extra/ui/gadgets/scrollers/scrollers-docs.factor
rename to basis/ui/gadgets/scrollers/scrollers-docs.factor
diff --git a/extra/ui/gadgets/scrollers/scrollers-tests.factor b/basis/ui/gadgets/scrollers/scrollers-tests.factor
similarity index 100%
rename from extra/ui/gadgets/scrollers/scrollers-tests.factor
rename to basis/ui/gadgets/scrollers/scrollers-tests.factor
diff --git a/extra/ui/gadgets/scrollers/scrollers.factor b/basis/ui/gadgets/scrollers/scrollers.factor
similarity index 100%
rename from extra/ui/gadgets/scrollers/scrollers.factor
rename to basis/ui/gadgets/scrollers/scrollers.factor
diff --git a/extra/ui/gadgets/scrollers/summary.txt b/basis/ui/gadgets/scrollers/summary.txt
similarity index 100%
rename from extra/ui/gadgets/scrollers/summary.txt
rename to basis/ui/gadgets/scrollers/summary.txt
diff --git a/extra/ui/gadgets/slate/authors.txt b/basis/ui/gadgets/slate/authors.txt
similarity index 100%
rename from extra/ui/gadgets/slate/authors.txt
rename to basis/ui/gadgets/slate/authors.txt
diff --git a/extra/ui/gadgets/slate/slate.factor b/basis/ui/gadgets/slate/slate.factor
similarity index 100%
rename from extra/ui/gadgets/slate/slate.factor
rename to basis/ui/gadgets/slate/slate.factor
diff --git a/extra/ui/gadgets/sliders/authors.txt b/basis/ui/gadgets/sliders/authors.txt
similarity index 100%
rename from extra/ui/gadgets/sliders/authors.txt
rename to basis/ui/gadgets/sliders/authors.txt
diff --git a/extra/ui/gadgets/sliders/sliders-docs.factor b/basis/ui/gadgets/sliders/sliders-docs.factor
similarity index 100%
rename from extra/ui/gadgets/sliders/sliders-docs.factor
rename to basis/ui/gadgets/sliders/sliders-docs.factor
diff --git a/extra/ui/gadgets/sliders/sliders.factor b/basis/ui/gadgets/sliders/sliders.factor
similarity index 100%
rename from extra/ui/gadgets/sliders/sliders.factor
rename to basis/ui/gadgets/sliders/sliders.factor
diff --git a/extra/ui/gadgets/sliders/summary.txt b/basis/ui/gadgets/sliders/summary.txt
similarity index 100%
rename from extra/ui/gadgets/sliders/summary.txt
rename to basis/ui/gadgets/sliders/summary.txt
diff --git a/extra/ui/gadgets/slots/authors.txt b/basis/ui/gadgets/slots/authors.txt
similarity index 100%
rename from extra/ui/gadgets/slots/authors.txt
rename to basis/ui/gadgets/slots/authors.txt
diff --git a/extra/ui/gadgets/slots/slots-tests.factor b/basis/ui/gadgets/slots/slots-tests.factor
similarity index 100%
rename from extra/ui/gadgets/slots/slots-tests.factor
rename to basis/ui/gadgets/slots/slots-tests.factor
diff --git a/extra/ui/gadgets/slots/slots.factor b/basis/ui/gadgets/slots/slots.factor
similarity index 100%
rename from extra/ui/gadgets/slots/slots.factor
rename to basis/ui/gadgets/slots/slots.factor
diff --git a/extra/ui/gadgets/slots/summary.txt b/basis/ui/gadgets/slots/summary.txt
similarity index 100%
rename from extra/ui/gadgets/slots/summary.txt
rename to basis/ui/gadgets/slots/summary.txt
diff --git a/extra/ui/gadgets/status-bar/authors.txt b/basis/ui/gadgets/status-bar/authors.txt
similarity index 100%
rename from extra/ui/gadgets/status-bar/authors.txt
rename to basis/ui/gadgets/status-bar/authors.txt
diff --git a/extra/ui/gadgets/status-bar/status-bar-docs.factor b/basis/ui/gadgets/status-bar/status-bar-docs.factor
similarity index 100%
rename from extra/ui/gadgets/status-bar/status-bar-docs.factor
rename to basis/ui/gadgets/status-bar/status-bar-docs.factor
diff --git a/extra/ui/gadgets/status-bar/status-bar.factor b/basis/ui/gadgets/status-bar/status-bar.factor
similarity index 100%
rename from extra/ui/gadgets/status-bar/status-bar.factor
rename to basis/ui/gadgets/status-bar/status-bar.factor
diff --git a/extra/ui/gadgets/status-bar/summary.txt b/basis/ui/gadgets/status-bar/summary.txt
similarity index 100%
rename from extra/ui/gadgets/status-bar/summary.txt
rename to basis/ui/gadgets/status-bar/summary.txt
diff --git a/extra/ui/gadgets/summary.txt b/basis/ui/gadgets/summary.txt
similarity index 100%
rename from extra/ui/gadgets/summary.txt
rename to basis/ui/gadgets/summary.txt
diff --git a/extra/ui/gadgets/tabs/authors.txt b/basis/ui/gadgets/tabs/authors.txt
similarity index 100%
rename from extra/ui/gadgets/tabs/authors.txt
rename to basis/ui/gadgets/tabs/authors.txt
diff --git a/extra/ui/gadgets/tabs/summary.txt b/basis/ui/gadgets/tabs/summary.txt
similarity index 100%
rename from extra/ui/gadgets/tabs/summary.txt
rename to basis/ui/gadgets/tabs/summary.txt
diff --git a/extra/ui/gadgets/tabs/tabs.factor b/basis/ui/gadgets/tabs/tabs.factor
similarity index 100%
rename from extra/ui/gadgets/tabs/tabs.factor
rename to basis/ui/gadgets/tabs/tabs.factor
diff --git a/extra/ui/gadgets/theme/authors.txt b/basis/ui/gadgets/theme/authors.txt
similarity index 100%
rename from extra/ui/gadgets/theme/authors.txt
rename to basis/ui/gadgets/theme/authors.txt
diff --git a/extra/ui/gadgets/theme/summary.txt b/basis/ui/gadgets/theme/summary.txt
similarity index 100%
rename from extra/ui/gadgets/theme/summary.txt
rename to basis/ui/gadgets/theme/summary.txt
diff --git a/extra/ui/gadgets/theme/theme.factor b/basis/ui/gadgets/theme/theme.factor
similarity index 54%
rename from extra/ui/gadgets/theme/theme.factor
rename to basis/ui/gadgets/theme/theme.factor
index 20f560e309..46fa0105a3 100644
--- a/extra/ui/gadgets/theme/theme.factor
+++ b/basis/ui/gadgets/theme/theme.factor
@@ -18,41 +18,41 @@ IN: ui.gadgets.theme
 
 : plain-gradient
     T{ gradient f {
-        T{ rgba f 0.94 0.94 0.94 1.0 }
-        T{ rgba f 0.83 0.83 0.83 1.0 }
-        T{ rgba f 0.83 0.83 0.83 1.0 }
-        T{ rgba f 0.62 0.62 0.62 1.0 }
+        T{ gray f 0.94 1.0 }
+        T{ gray f 0.83 1.0 }
+        T{ gray f 0.83 1.0 }
+        T{ gray f 0.62 1.0 }
     } } ;
 
 : rollover-gradient
     T{ gradient f {
-        T{ rgba f 1.0 1.0 1.0 1.0 }
-        T{ rgba f 0.9 0.9 0.9 1.0 }
-        T{ rgba f 0.9 0.9 0.9 1.0 }
-        T{ rgba f 0.75 0.75 0.75 1.0 }
+        T{ gray f 1.0  1.0 }
+        T{ gray f 0.9  1.0 }
+        T{ gray f 0.9  1.0 }
+        T{ gray f 0.75 1.0 }
     } } ;
 
 : pressed-gradient
     T{ gradient f {
-        T{ rgba f 0.75 0.75 0.75 1.0 }
-        T{ rgba f 0.9 0.9 0.9 1.0 }
-        T{ rgba f 0.9 0.9 0.9 1.0 }
-        T{ rgba f 1.0 1.0 1.0 1.0 }
+        T{ gray f 0.75 1.0 }
+        T{ gray f 0.9  1.0 }
+        T{ gray f 0.9  1.0 }
+        T{ gray f 1.0  1.0 }
     } } ;
 
 : selected-gradient
     T{ gradient f {
-        T{ rgba f 0.65 0.65 0.65 1.0 }
-        T{ rgba f 0.8 0.8 0.8 1.0 }
-        T{ rgba f 0.8 0.8 0.8 1.0 }
-        T{ rgba f 1.0 1.0 1.0 1.0 }
+        T{ gray f 0.65 1.0 }
+        T{ gray f 0.8  1.0 }
+        T{ gray f 0.8  1.0 }
+        T{ gray f 1.0  1.0 }
     } } ;
 
 : lowered-gradient
     T{ gradient f {
-        T{ rgba f 0.37 0.37 0.37 1.0 }
-        T{ rgba f 0.43 0.43 0.43 1.0 }
-        T{ rgba f 0.5 0.5 0.5 1.0 }
+        T{ gray f 0.37 1.0 }
+        T{ gray f 0.43 1.0 }
+        T{ gray f 0.5  1.0 }
     } } ;
 
 : sans-serif-font { "sans-serif" plain 12 } ;
diff --git a/extra/ui/gadgets/tiling/tiling.factor b/basis/ui/gadgets/tiling/tiling.factor
similarity index 100%
rename from extra/ui/gadgets/tiling/tiling.factor
rename to basis/ui/gadgets/tiling/tiling.factor
diff --git a/extra/ui/gadgets/tracks/authors.txt b/basis/ui/gadgets/tracks/authors.txt
similarity index 100%
rename from extra/ui/gadgets/tracks/authors.txt
rename to basis/ui/gadgets/tracks/authors.txt
diff --git a/extra/ui/gadgets/tracks/summary.txt b/basis/ui/gadgets/tracks/summary.txt
similarity index 100%
rename from extra/ui/gadgets/tracks/summary.txt
rename to basis/ui/gadgets/tracks/summary.txt
diff --git a/extra/ui/gadgets/tracks/tracks-docs.factor b/basis/ui/gadgets/tracks/tracks-docs.factor
similarity index 100%
rename from extra/ui/gadgets/tracks/tracks-docs.factor
rename to basis/ui/gadgets/tracks/tracks-docs.factor
diff --git a/extra/ui/gadgets/tracks/tracks-tests.factor b/basis/ui/gadgets/tracks/tracks-tests.factor
similarity index 100%
rename from extra/ui/gadgets/tracks/tracks-tests.factor
rename to basis/ui/gadgets/tracks/tracks-tests.factor
diff --git a/extra/ui/gadgets/tracks/tracks.factor b/basis/ui/gadgets/tracks/tracks.factor
similarity index 100%
rename from extra/ui/gadgets/tracks/tracks.factor
rename to basis/ui/gadgets/tracks/tracks.factor
diff --git a/extra/ui/gadgets/viewports/authors.txt b/basis/ui/gadgets/viewports/authors.txt
similarity index 100%
rename from extra/ui/gadgets/viewports/authors.txt
rename to basis/ui/gadgets/viewports/authors.txt
diff --git a/extra/ui/gadgets/viewports/summary.txt b/basis/ui/gadgets/viewports/summary.txt
similarity index 100%
rename from extra/ui/gadgets/viewports/summary.txt
rename to basis/ui/gadgets/viewports/summary.txt
diff --git a/extra/ui/gadgets/viewports/viewports-docs.factor b/basis/ui/gadgets/viewports/viewports-docs.factor
similarity index 100%
rename from extra/ui/gadgets/viewports/viewports-docs.factor
rename to basis/ui/gadgets/viewports/viewports-docs.factor
diff --git a/extra/ui/gadgets/viewports/viewports.factor b/basis/ui/gadgets/viewports/viewports.factor
similarity index 100%
rename from extra/ui/gadgets/viewports/viewports.factor
rename to basis/ui/gadgets/viewports/viewports.factor
diff --git a/extra/ui/gadgets/worlds/authors.txt b/basis/ui/gadgets/worlds/authors.txt
similarity index 100%
rename from extra/ui/gadgets/worlds/authors.txt
rename to basis/ui/gadgets/worlds/authors.txt
diff --git a/extra/ui/gadgets/worlds/summary.txt b/basis/ui/gadgets/worlds/summary.txt
similarity index 100%
rename from extra/ui/gadgets/worlds/summary.txt
rename to basis/ui/gadgets/worlds/summary.txt
diff --git a/extra/ui/gadgets/worlds/worlds-docs.factor b/basis/ui/gadgets/worlds/worlds-docs.factor
similarity index 100%
rename from extra/ui/gadgets/worlds/worlds-docs.factor
rename to basis/ui/gadgets/worlds/worlds-docs.factor
diff --git a/extra/ui/gadgets/worlds/worlds-tests.factor b/basis/ui/gadgets/worlds/worlds-tests.factor
similarity index 100%
rename from extra/ui/gadgets/worlds/worlds-tests.factor
rename to basis/ui/gadgets/worlds/worlds-tests.factor
diff --git a/extra/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor
similarity index 100%
rename from extra/ui/gadgets/worlds/worlds.factor
rename to basis/ui/gadgets/worlds/worlds.factor
diff --git a/extra/ui/gadgets/wrappers/wrappers.factor b/basis/ui/gadgets/wrappers/wrappers.factor
similarity index 100%
rename from extra/ui/gadgets/wrappers/wrappers.factor
rename to basis/ui/gadgets/wrappers/wrappers.factor
diff --git a/extra/ui/gestures/authors.txt b/basis/ui/gestures/authors.txt
similarity index 100%
rename from extra/ui/gestures/authors.txt
rename to basis/ui/gestures/authors.txt
diff --git a/extra/ui/gestures/gestures-docs.factor b/basis/ui/gestures/gestures-docs.factor
similarity index 100%
rename from extra/ui/gestures/gestures-docs.factor
rename to basis/ui/gestures/gestures-docs.factor
diff --git a/extra/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor
similarity index 100%
rename from extra/ui/gestures/gestures.factor
rename to basis/ui/gestures/gestures.factor
diff --git a/extra/ui/gestures/summary.txt b/basis/ui/gestures/summary.txt
similarity index 100%
rename from extra/ui/gestures/summary.txt
rename to basis/ui/gestures/summary.txt
diff --git a/extra/ui/operations/authors.txt b/basis/ui/operations/authors.txt
similarity index 100%
rename from extra/ui/operations/authors.txt
rename to basis/ui/operations/authors.txt
diff --git a/extra/ui/operations/operations-docs.factor b/basis/ui/operations/operations-docs.factor
similarity index 100%
rename from extra/ui/operations/operations-docs.factor
rename to basis/ui/operations/operations-docs.factor
diff --git a/extra/ui/operations/operations-tests.factor b/basis/ui/operations/operations-tests.factor
similarity index 100%
rename from extra/ui/operations/operations-tests.factor
rename to basis/ui/operations/operations-tests.factor
diff --git a/extra/ui/operations/operations.factor b/basis/ui/operations/operations.factor
similarity index 100%
rename from extra/ui/operations/operations.factor
rename to basis/ui/operations/operations.factor
diff --git a/extra/ui/operations/summary.txt b/basis/ui/operations/summary.txt
similarity index 100%
rename from extra/ui/operations/summary.txt
rename to basis/ui/operations/summary.txt
diff --git a/extra/ui/render/authors.txt b/basis/ui/render/authors.txt
similarity index 100%
rename from extra/ui/render/authors.txt
rename to basis/ui/render/authors.txt
diff --git a/extra/ui/render/render-docs.factor b/basis/ui/render/render-docs.factor
similarity index 100%
rename from extra/ui/render/render-docs.factor
rename to basis/ui/render/render-docs.factor
diff --git a/extra/ui/render/render.factor b/basis/ui/render/render.factor
similarity index 100%
rename from extra/ui/render/render.factor
rename to basis/ui/render/render.factor
diff --git a/extra/ui/render/summary.txt b/basis/ui/render/summary.txt
similarity index 100%
rename from extra/ui/render/summary.txt
rename to basis/ui/render/summary.txt
diff --git a/extra/ui/summary.txt b/basis/ui/summary.txt
similarity index 100%
rename from extra/ui/summary.txt
rename to basis/ui/summary.txt
diff --git a/extra/ui/tools/authors.txt b/basis/ui/tools/authors.txt
similarity index 100%
rename from extra/ui/tools/authors.txt
rename to basis/ui/tools/authors.txt
diff --git a/extra/ui/tools/browser/authors.txt b/basis/ui/tools/browser/authors.txt
similarity index 100%
rename from extra/ui/tools/browser/authors.txt
rename to basis/ui/tools/browser/authors.txt
diff --git a/extra/ui/tools/browser/browser-tests.factor b/basis/ui/tools/browser/browser-tests.factor
similarity index 100%
rename from extra/ui/tools/browser/browser-tests.factor
rename to basis/ui/tools/browser/browser-tests.factor
diff --git a/extra/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
similarity index 100%
rename from extra/ui/tools/browser/browser.factor
rename to basis/ui/tools/browser/browser.factor
diff --git a/extra/ui/tools/browser/summary.txt b/basis/ui/tools/browser/summary.txt
similarity index 100%
rename from extra/ui/tools/browser/summary.txt
rename to basis/ui/tools/browser/summary.txt
diff --git a/extra/ui/tools/browser/tags.txt b/basis/ui/tools/browser/tags.txt
similarity index 100%
rename from extra/ui/tools/browser/tags.txt
rename to basis/ui/tools/browser/tags.txt
diff --git a/extra/ui/tools/debugger/authors.txt b/basis/ui/tools/debugger/authors.txt
similarity index 100%
rename from extra/ui/tools/debugger/authors.txt
rename to basis/ui/tools/debugger/authors.txt
diff --git a/extra/ui/tools/debugger/debugger-docs.factor b/basis/ui/tools/debugger/debugger-docs.factor
similarity index 100%
rename from extra/ui/tools/debugger/debugger-docs.factor
rename to basis/ui/tools/debugger/debugger-docs.factor
diff --git a/extra/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor
similarity index 100%
rename from extra/ui/tools/debugger/debugger.factor
rename to basis/ui/tools/debugger/debugger.factor
diff --git a/extra/ui/tools/debugger/summary.txt b/basis/ui/tools/debugger/summary.txt
similarity index 100%
rename from extra/ui/tools/debugger/summary.txt
rename to basis/ui/tools/debugger/summary.txt
diff --git a/extra/ui/tools/debugger/tags.txt b/basis/ui/tools/debugger/tags.txt
similarity index 100%
rename from extra/ui/tools/debugger/tags.txt
rename to basis/ui/tools/debugger/tags.txt
diff --git a/extra/ui/tools/deploy/authors.txt b/basis/ui/tools/deploy/authors.txt
similarity index 100%
rename from extra/ui/tools/deploy/authors.txt
rename to basis/ui/tools/deploy/authors.txt
diff --git a/extra/ui/tools/deploy/deploy-docs.factor b/basis/ui/tools/deploy/deploy-docs.factor
similarity index 100%
rename from extra/ui/tools/deploy/deploy-docs.factor
rename to basis/ui/tools/deploy/deploy-docs.factor
diff --git a/extra/ui/tools/deploy/deploy.factor b/basis/ui/tools/deploy/deploy.factor
similarity index 100%
rename from extra/ui/tools/deploy/deploy.factor
rename to basis/ui/tools/deploy/deploy.factor
diff --git a/extra/ui/tools/inspector/authors.txt b/basis/ui/tools/inspector/authors.txt
similarity index 100%
rename from extra/ui/tools/inspector/authors.txt
rename to basis/ui/tools/inspector/authors.txt
diff --git a/extra/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor
similarity index 100%
rename from extra/ui/tools/inspector/inspector.factor
rename to basis/ui/tools/inspector/inspector.factor
diff --git a/extra/ui/tools/inspector/summary.txt b/basis/ui/tools/inspector/summary.txt
similarity index 100%
rename from extra/ui/tools/inspector/summary.txt
rename to basis/ui/tools/inspector/summary.txt
diff --git a/extra/ui/tools/inspector/tags.txt b/basis/ui/tools/inspector/tags.txt
similarity index 100%
rename from extra/ui/tools/inspector/tags.txt
rename to basis/ui/tools/inspector/tags.txt
diff --git a/extra/ui/tools/interactor/authors.txt b/basis/ui/tools/interactor/authors.txt
similarity index 100%
rename from extra/ui/tools/interactor/authors.txt
rename to basis/ui/tools/interactor/authors.txt
diff --git a/extra/ui/tools/interactor/interactor-docs.factor b/basis/ui/tools/interactor/interactor-docs.factor
similarity index 100%
rename from extra/ui/tools/interactor/interactor-docs.factor
rename to basis/ui/tools/interactor/interactor-docs.factor
diff --git a/extra/ui/tools/interactor/interactor-tests.factor b/basis/ui/tools/interactor/interactor-tests.factor
similarity index 100%
rename from extra/ui/tools/interactor/interactor-tests.factor
rename to basis/ui/tools/interactor/interactor-tests.factor
diff --git a/extra/ui/tools/interactor/interactor.factor b/basis/ui/tools/interactor/interactor.factor
similarity index 100%
rename from extra/ui/tools/interactor/interactor.factor
rename to basis/ui/tools/interactor/interactor.factor
diff --git a/extra/ui/tools/interactor/summary.txt b/basis/ui/tools/interactor/summary.txt
similarity index 100%
rename from extra/ui/tools/interactor/summary.txt
rename to basis/ui/tools/interactor/summary.txt
diff --git a/extra/ui/tools/listener/authors.txt b/basis/ui/tools/listener/authors.txt
similarity index 100%
rename from extra/ui/tools/listener/authors.txt
rename to basis/ui/tools/listener/authors.txt
diff --git a/extra/ui/tools/listener/listener-tests.factor b/basis/ui/tools/listener/listener-tests.factor
similarity index 100%
rename from extra/ui/tools/listener/listener-tests.factor
rename to basis/ui/tools/listener/listener-tests.factor
diff --git a/extra/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
similarity index 100%
rename from extra/ui/tools/listener/listener.factor
rename to basis/ui/tools/listener/listener.factor
diff --git a/extra/ui/tools/listener/summary.txt b/basis/ui/tools/listener/summary.txt
similarity index 100%
rename from extra/ui/tools/listener/summary.txt
rename to basis/ui/tools/listener/summary.txt
diff --git a/extra/ui/tools/listener/tags.txt b/basis/ui/tools/listener/tags.txt
similarity index 100%
rename from extra/ui/tools/listener/tags.txt
rename to basis/ui/tools/listener/tags.txt
diff --git a/extra/ui/tools/operations/authors.txt b/basis/ui/tools/operations/authors.txt
similarity index 100%
rename from extra/ui/tools/operations/authors.txt
rename to basis/ui/tools/operations/authors.txt
diff --git a/extra/ui/tools/operations/operations.factor b/basis/ui/tools/operations/operations.factor
similarity index 100%
rename from extra/ui/tools/operations/operations.factor
rename to basis/ui/tools/operations/operations.factor
diff --git a/extra/ui/tools/operations/summary.txt b/basis/ui/tools/operations/summary.txt
similarity index 100%
rename from extra/ui/tools/operations/summary.txt
rename to basis/ui/tools/operations/summary.txt
diff --git a/extra/ui/tools/profiler/authors.txt b/basis/ui/tools/profiler/authors.txt
similarity index 100%
rename from extra/ui/tools/profiler/authors.txt
rename to basis/ui/tools/profiler/authors.txt
diff --git a/extra/ui/tools/profiler/profiler.factor b/basis/ui/tools/profiler/profiler.factor
similarity index 100%
rename from extra/ui/tools/profiler/profiler.factor
rename to basis/ui/tools/profiler/profiler.factor
diff --git a/extra/ui/tools/profiler/summary.txt b/basis/ui/tools/profiler/summary.txt
similarity index 100%
rename from extra/ui/tools/profiler/summary.txt
rename to basis/ui/tools/profiler/summary.txt
diff --git a/extra/ui/tools/profiler/tags.txt b/basis/ui/tools/profiler/tags.txt
similarity index 100%
rename from extra/ui/tools/profiler/tags.txt
rename to basis/ui/tools/profiler/tags.txt
diff --git a/extra/ui/tools/search/authors.txt b/basis/ui/tools/search/authors.txt
similarity index 100%
rename from extra/ui/tools/search/authors.txt
rename to basis/ui/tools/search/authors.txt
diff --git a/extra/ui/tools/search/search-tests.factor b/basis/ui/tools/search/search-tests.factor
similarity index 100%
rename from extra/ui/tools/search/search-tests.factor
rename to basis/ui/tools/search/search-tests.factor
diff --git a/extra/ui/tools/search/search.factor b/basis/ui/tools/search/search.factor
similarity index 100%
rename from extra/ui/tools/search/search.factor
rename to basis/ui/tools/search/search.factor
diff --git a/extra/ui/tools/search/summary.txt b/basis/ui/tools/search/summary.txt
similarity index 100%
rename from extra/ui/tools/search/summary.txt
rename to basis/ui/tools/search/summary.txt
diff --git a/extra/ui/tools/summary.txt b/basis/ui/tools/summary.txt
similarity index 100%
rename from extra/ui/tools/summary.txt
rename to basis/ui/tools/summary.txt
diff --git a/extra/ui/tools/tags.txt b/basis/ui/tools/tags.txt
similarity index 100%
rename from extra/ui/tools/tags.txt
rename to basis/ui/tools/tags.txt
diff --git a/extra/ui/tools/tools-docs.factor b/basis/ui/tools/tools-docs.factor
similarity index 100%
rename from extra/ui/tools/tools-docs.factor
rename to basis/ui/tools/tools-docs.factor
diff --git a/extra/ui/tools/tools-tests.factor b/basis/ui/tools/tools-tests.factor
similarity index 100%
rename from extra/ui/tools/tools-tests.factor
rename to basis/ui/tools/tools-tests.factor
diff --git a/extra/ui/tools/tools.factor b/basis/ui/tools/tools.factor
similarity index 100%
rename from extra/ui/tools/tools.factor
rename to basis/ui/tools/tools.factor
diff --git a/extra/ui/tools/traceback/authors.txt b/basis/ui/tools/traceback/authors.txt
similarity index 100%
rename from extra/ui/tools/traceback/authors.txt
rename to basis/ui/tools/traceback/authors.txt
diff --git a/extra/ui/tools/traceback/summary.txt b/basis/ui/tools/traceback/summary.txt
similarity index 100%
rename from extra/ui/tools/traceback/summary.txt
rename to basis/ui/tools/traceback/summary.txt
diff --git a/extra/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor
similarity index 100%
rename from extra/ui/tools/traceback/traceback.factor
rename to basis/ui/tools/traceback/traceback.factor
diff --git a/extra/ui/tools/walker/authors.txt b/basis/ui/tools/walker/authors.txt
similarity index 100%
rename from extra/ui/tools/walker/authors.txt
rename to basis/ui/tools/walker/authors.txt
diff --git a/extra/ui/tools/walker/summary.txt b/basis/ui/tools/walker/summary.txt
similarity index 100%
rename from extra/ui/tools/walker/summary.txt
rename to basis/ui/tools/walker/summary.txt
diff --git a/extra/ui/tools/walker/tags.txt b/basis/ui/tools/walker/tags.txt
similarity index 100%
rename from extra/ui/tools/walker/tags.txt
rename to basis/ui/tools/walker/tags.txt
diff --git a/extra/ui/tools/walker/walker-docs.factor b/basis/ui/tools/walker/walker-docs.factor
similarity index 100%
rename from extra/ui/tools/walker/walker-docs.factor
rename to basis/ui/tools/walker/walker-docs.factor
diff --git a/extra/ui/tools/walker/walker-tests.factor b/basis/ui/tools/walker/walker-tests.factor
similarity index 100%
rename from extra/ui/tools/walker/walker-tests.factor
rename to basis/ui/tools/walker/walker-tests.factor
diff --git a/extra/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor
similarity index 100%
rename from extra/ui/tools/walker/walker.factor
rename to basis/ui/tools/walker/walker.factor
diff --git a/extra/ui/tools/workspace/authors.txt b/basis/ui/tools/workspace/authors.txt
similarity index 100%
rename from extra/ui/tools/workspace/authors.txt
rename to basis/ui/tools/workspace/authors.txt
diff --git a/extra/ui/tools/workspace/summary.txt b/basis/ui/tools/workspace/summary.txt
similarity index 100%
rename from extra/ui/tools/workspace/summary.txt
rename to basis/ui/tools/workspace/summary.txt
diff --git a/extra/ui/tools/workspace/tags.txt b/basis/ui/tools/workspace/tags.txt
similarity index 100%
rename from extra/ui/tools/workspace/tags.txt
rename to basis/ui/tools/workspace/tags.txt
diff --git a/extra/ui/tools/workspace/workspace-tests.factor b/basis/ui/tools/workspace/workspace-tests.factor
similarity index 100%
rename from extra/ui/tools/workspace/workspace-tests.factor
rename to basis/ui/tools/workspace/workspace-tests.factor
diff --git a/extra/ui/tools/workspace/workspace.factor b/basis/ui/tools/workspace/workspace.factor
similarity index 100%
rename from extra/ui/tools/workspace/workspace.factor
rename to basis/ui/tools/workspace/workspace.factor
diff --git a/extra/ui/traverse/authors.txt b/basis/ui/traverse/authors.txt
similarity index 100%
rename from extra/ui/traverse/authors.txt
rename to basis/ui/traverse/authors.txt
diff --git a/extra/ui/traverse/summary.txt b/basis/ui/traverse/summary.txt
similarity index 100%
rename from extra/ui/traverse/summary.txt
rename to basis/ui/traverse/summary.txt
diff --git a/extra/ui/traverse/traverse-tests.factor b/basis/ui/traverse/traverse-tests.factor
similarity index 100%
rename from extra/ui/traverse/traverse-tests.factor
rename to basis/ui/traverse/traverse-tests.factor
diff --git a/extra/ui/traverse/traverse.factor b/basis/ui/traverse/traverse.factor
similarity index 100%
rename from extra/ui/traverse/traverse.factor
rename to basis/ui/traverse/traverse.factor
diff --git a/extra/ui/ui-docs.factor b/basis/ui/ui-docs.factor
similarity index 100%
rename from extra/ui/ui-docs.factor
rename to basis/ui/ui-docs.factor
diff --git a/extra/ui/ui.factor b/basis/ui/ui.factor
similarity index 100%
rename from extra/ui/ui.factor
rename to basis/ui/ui.factor
diff --git a/extra/ui/windows/authors.txt b/basis/ui/windows/authors.txt
similarity index 100%
rename from extra/ui/windows/authors.txt
rename to basis/ui/windows/authors.txt
diff --git a/extra/ui/windows/tags.txt b/basis/ui/windows/tags.txt
similarity index 100%
rename from extra/ui/windows/tags.txt
rename to basis/ui/windows/tags.txt
diff --git a/extra/ui/windows/windows.factor b/basis/ui/windows/windows.factor
similarity index 100%
rename from extra/ui/windows/windows.factor
rename to basis/ui/windows/windows.factor
diff --git a/extra/ui/x11/authors.txt b/basis/ui/x11/authors.txt
similarity index 100%
rename from extra/ui/x11/authors.txt
rename to basis/ui/x11/authors.txt
diff --git a/extra/ui/x11/tags.txt b/basis/ui/x11/tags.txt
similarity index 100%
rename from extra/ui/x11/tags.txt
rename to basis/ui/x11/tags.txt
diff --git a/extra/ui/x11/x11.factor b/basis/ui/x11/x11.factor
similarity index 100%
rename from extra/ui/x11/x11.factor
rename to basis/ui/x11/x11.factor
diff --git a/extra/cfdg/models/rules08/rules08.factor b/extra/cfdg/models/rules08/rules08.factor
index 20099d225a..f5398582c9 100644
--- a/extra/cfdg/models/rules08/rules08.factor
+++ b/extra/cfdg/models/rules08/rules08.factor
@@ -17,37 +17,21 @@ DEFER: line
 
 : ligne ( -- )
   {
-    { 1   [ 4.5 y 1.15 0.8 size* -0.3 b line ] do }
+    { 1   [ 4.5 y 1.15 0.8 size* -0.3 b line ] }
     { 0.5 [ ] }
   }
-  call-random-weighted ;
+  rules ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: line ( -- ) [ insct ligne ] recursive ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+: line ( -- ) { [ insct ligne ] } rule ;
 
 : sole ( -- )
-  [
-    {
-      {
-        1 [
-            [ 1 brightness 0.5 saturation ligne ] do
-            [ 140 r 1 hue                 sole  ] do
-          ]
-      }
-      { 0.01 [ ] }
-    }
-    call-random-weighted
-  ]
-  recursive ;
+  {
+    { 1    [ 1 brightness 0.5 saturation ligne ] [ 140 r 1 hue sole ] }
+    { 0.01 [ ] }
+  }
+  rules ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: centre ( -- )
-  [ 1 b 5 s circle ] do
-  [ sole ] do ;
+: centre ( -- ) { [ 1 b 5 s circle ] [ sole ] } rule ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!