diff --git a/extra/bubble-chamber/bubble-chamber.factor b/extra/bubble-chamber/bubble-chamber.factor
index fb6acb5579..075dfa5b4e 100644
--- a/extra/bubble-chamber/bubble-chamber.factor
+++ b/extra/bubble-chamber/bubble-chamber.factor
@@ -1,8 +1,10 @@
-USING: accessors arrays calendar colors colors.gray
+USING: accessors arrays ascii calendar colors colors.gray
 combinators.short-circuit frame-buffer kernel locals math
 math.constants math.functions math.libm math.order math.points
 math.ranges math.vectors namespaces opengl processing.shapes
-random sequences threads ui ui.gadgets ui.gestures ;
+quotations random sequences splitting threads ui ui.gadgets
+ui.gadgets.borders ui.gadgets.buttons ui.gadgets.packs
+ui.gestures ;
 
 IN: bubble-chamber
 
@@ -498,3 +500,14 @@ bubble-chamber H{
      111 [ <axion>  add-particle ] times
     dup particles>> [ collide randomize-collision-theta ] each
     drop ;
+
+MAIN-WINDOW: run-bubble-chamber { { title "Bubble Chamber" } }
+    <pile> 1 >>fill { 2 2 } >>gap {
+        original small medium large hadron-chamber
+        quark-chamber muon-chamber ten-hadrons
+        original-big-bang original-big-bang-variant
+    } [
+        [ name>> "-" " " replace >title ]
+        [ 1quotation [ drop ] prepend ] bi
+        <border-button> add-gadget
+    ] each { 2 2 } <border> >>gadgets ;
diff --git a/extra/bubble-chamber/hadron-chamber/hadron-chamber.factor b/extra/bubble-chamber/hadron-chamber/hadron-chamber.factor
deleted file mode 100644
index 092dd1e2ad..0000000000
--- a/extra/bubble-chamber/hadron-chamber/hadron-chamber.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-USING: ui bubble-chamber ;
-
-IN: bubble-chamber.hadron-chamber
-
-: main ( -- ) [ hadron-chamber ] with-ui ;
-
-MAIN: main
diff --git a/extra/bubble-chamber/hadron-chamber/tags.txt b/extra/bubble-chamber/hadron-chamber/tags.txt
deleted file mode 100644
index cb5fc203e1..0000000000
--- a/extra/bubble-chamber/hadron-chamber/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-demos
diff --git a/extra/bubble-chamber/large/large.factor b/extra/bubble-chamber/large/large.factor
deleted file mode 100644
index aef9d38ece..0000000000
--- a/extra/bubble-chamber/large/large.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-USING: ui bubble-chamber ;
-
-IN: bubble-chamber.large
-
-: main ( -- ) [ large ] with-ui ;
-
-MAIN: main
diff --git a/extra/bubble-chamber/large/tags.txt b/extra/bubble-chamber/large/tags.txt
deleted file mode 100644
index cb5fc203e1..0000000000
--- a/extra/bubble-chamber/large/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-demos
diff --git a/extra/bubble-chamber/medium/medium.factor b/extra/bubble-chamber/medium/medium.factor
deleted file mode 100644
index a72ca1c58b..0000000000
--- a/extra/bubble-chamber/medium/medium.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-USING: ui bubble-chamber ;
-
-IN: bubble-chamber.medium
-
-: main ( -- ) [ medium ] with-ui ;
-
-MAIN: main
diff --git a/extra/bubble-chamber/medium/tags.txt b/extra/bubble-chamber/medium/tags.txt
deleted file mode 100644
index cb5fc203e1..0000000000
--- a/extra/bubble-chamber/medium/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-demos
diff --git a/extra/bubble-chamber/original/original.factor b/extra/bubble-chamber/original/original.factor
deleted file mode 100644
index 4940957801..0000000000
--- a/extra/bubble-chamber/original/original.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-USING: ui bubble-chamber ;
-
-IN: bubble-chamber.original
-
-: main ( -- ) [ original ] with-ui ;
-
-MAIN: main
diff --git a/extra/bubble-chamber/original/tags.txt b/extra/bubble-chamber/original/tags.txt
deleted file mode 100644
index cb5fc203e1..0000000000
--- a/extra/bubble-chamber/original/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-demos
diff --git a/extra/bubble-chamber/quark-chamber/quark-chamber.factor b/extra/bubble-chamber/quark-chamber/quark-chamber.factor
deleted file mode 100644
index 97aaebe18a..0000000000
--- a/extra/bubble-chamber/quark-chamber/quark-chamber.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-USING: ui bubble-chamber ;
-
-IN: bubble-chamber.quark-chamber
-
-: main ( -- ) [ quark-chamber ] with-ui ;
-
-MAIN: main
diff --git a/extra/bubble-chamber/quark-chamber/tags.txt b/extra/bubble-chamber/quark-chamber/tags.txt
deleted file mode 100644
index cb5fc203e1..0000000000
--- a/extra/bubble-chamber/quark-chamber/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-demos
diff --git a/extra/bubble-chamber/small/small.factor b/extra/bubble-chamber/small/small.factor
deleted file mode 100644
index 774a2bcd7d..0000000000
--- a/extra/bubble-chamber/small/small.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-USING: ui bubble-chamber ;
-
-IN: bubble-chamber.small
-
-: main ( -- ) [ small ] with-ui ;
-
-MAIN: main
diff --git a/extra/bubble-chamber/small/tags.txt b/extra/bubble-chamber/small/tags.txt
deleted file mode 100644
index cb5fc203e1..0000000000
--- a/extra/bubble-chamber/small/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-demos
diff --git a/extra/bubble-chamber/ten-hadrons/tags.txt b/extra/bubble-chamber/ten-hadrons/tags.txt
deleted file mode 100644
index cb5fc203e1..0000000000
--- a/extra/bubble-chamber/ten-hadrons/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-demos
diff --git a/extra/bubble-chamber/ten-hadrons/ten-hadrons.factor b/extra/bubble-chamber/ten-hadrons/ten-hadrons.factor
deleted file mode 100644
index 7eb6673021..0000000000
--- a/extra/bubble-chamber/ten-hadrons/ten-hadrons.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-USING: ui bubble-chamber ;
-
-IN: bubble-chamber.ten-hadrons
-
-: main ( -- ) [ ten-hadrons ] with-ui ;
-
-MAIN: main