From 723e6d94f52056fd67223c3f8884ba5b6fa3ba80 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 9 Apr 2025 14:50:49 +0200
Subject: [PATCH 1/7] Rename bubbles => cards

---
 .../images/{bubble-add.svg => card-add.svg}   |   0
 app/assets/images/{bubbles.svg => cards.svg}  |   0
 app/assets/images/{pop.svg => closure.svg}    |   0
 app/assets/stylesheets/animation.css          |   4 +-
 app/assets/stylesheets/bubbles.css            |  48 +-
 app/assets/stylesheets/cards.css              |  64 +-
 .../stylesheets/{popup.css => closureup.css}  |   0
 .../{buckets.css => collections.css}          |  10 +-
 app/assets/stylesheets/color-picker.css       |   2 +-
 app/assets/stylesheets/events.css             |   4 +-
 app/assets/stylesheets/icons.css              |   6 +-
 app/assets/stylesheets/pins.css               |   6 +-
 app/assets/stylesheets/workflows.css          |  12 +-
 .../bubbles/assignments_controller.rb         |  10 -
 app/controllers/bubbles/boosts_controller.rb  |  12 -
 .../bubbles/engagements_controller.rb         |  13 -
 app/controllers/bubbles/images_controller.rb  |   8 -
 app/controllers/bubbles/pops_controller.rb    |  13 -
 .../bubbles/publishes_controller.rb           |   8 -
 .../bubbles/readings_controller.rb            |  13 -
 .../bubbles/recovers_controller.rb            |   7 -
 .../bubbles/stagings_controller.rb            |  11 -
 app/controllers/bubbles/watches_controller.rb |  13 -
 app/controllers/bubbles_controller.rb         |  71 --
 .../buckets/involvements_controller.rb        |   7 -
 .../buckets/workflows_controller.rb           |  16 -
 app/controllers/buckets_controller.rb         |  50 --
 .../cards/assignments_controller.rb           |  10 +
 app/controllers/cards/boosts_controller.rb    |  12 +
 app/controllers/cards/closures_controller.rb  |  13 +
 .../cards/engagements_controller.rb           |  13 +
 app/controllers/cards/images_controller.rb    |   8 +
 .../{bubbles => cards}/pins_controller.rb     |  12 +-
 app/controllers/cards/publishes_controller.rb |   8 +
 app/controllers/cards/readings_controller.rb  |  13 +
 app/controllers/cards/recovers_controller.rb  |   7 +
 app/controllers/cards/stagings_controller.rb  |  11 +
 .../{bubbles => cards}/taggings_controller.rb |   6 +-
 app/controllers/cards/watches_controller.rb   |  13 +
 app/controllers/cards_controller.rb           |  71 ++
 .../collections/involvements_controller.rb    |   7 +
 .../collections/workflows_controller.rb       |  16 +
 app/controllers/collections_controller.rb     |  50 ++
 .../comments/reactions_controller.rb          |   2 +-
 app/controllers/comments_controller.rb        |   8 +-
 app/controllers/concerns/bubble_scoped.rb     |  16 -
 app/controllers/concerns/bucket_filterable.rb |  24 -
 app/controllers/concerns/bucket_scoped.rb     |  12 -
 app/controllers/concerns/card_scoped.rb       |  16 +
 .../concerns/collection_filterable.rb         |  24 +
 app/controllers/concerns/collection_scoped.rb |  12 +
 app/controllers/concerns/events_timeline.rb   |  12 +-
 app/controllers/events_controller.rb          |   4 +-
 app/controllers/filters_controller.rb         |   4 +-
 app/controllers/my/pins_controller.rb         |   2 +-
 .../notifications/settings_controller.rb      |   2 +-
 app/controllers/terminals_controller.rb       |   6 +-
 app/helpers/accesses_helper.rb                |  28 +-
 app/helpers/bubbles_helper.rb                 |  24 -
 app/helpers/cards_helper.rb                   |  24 +
 app/helpers/comments_helper.rb                |   4 +-
 app/helpers/events_helper.rb                  |  38 +-
 app/helpers/filters_helper.rb                 |  10 +-
 app/helpers/messages_helper.rb                |   6 +-
 app/helpers/notifications_helper.rb           |   6 +-
 app/helpers/translations_helper.rb            |   2 +-
 app/helpers/workflows_helper.rb               |   6 +-
 ..._controller.js => card_size_controller.js} |  12 +-
 ...ontroller.js => closureover_controller.js} |   0
 .../controllers/local_save_controller.js      |   2 +-
 .../controllers/paste_controller.js           |   2 +-
 .../auto_closure_all_due_job.rb}              |   4 +-
 .../auto_reconsider_all_stagnated_job.rb      |   4 +-
 app/jobs/remove_abandoned_creations_job.rb    |   2 +-
 app/models/access.rb                          |   2 +-
 app/models/account.rb                         |   6 +-
 .../{pop_reasons.rb => closure_reasons.rb}    |  10 +-
 app/models/assignment.rb                      |   2 +-
 app/models/bubble/engagement.rb               |   3 -
 app/models/bubble/poppable.rb                 |  56 --
 app/models/bucket.rb                          |  21 -
 app/models/bucket/broadcastable.rb            |   8 -
 app/models/{bubble.rb => card.rb}             |  14 +-
 app/models/{bubble => card}/assignable.rb     |   2 +-
 app/models/{bubble => card}/boostable.rb      |   2 +-
 app/models/card/closeable.rb                  |  56 ++
 app/models/{bubble => card}/colored.rb        |   2 +-
 app/models/{bubble => card}/commentable.rb    |   2 +-
 app/models/{bubble => card}/engageable.rb     |   8 +-
 app/models/card/engagement.rb                 |   3 +
 app/models/{bubble => card}/eventable.rb      |   4 +-
 app/models/{bubble => card}/messages.rb       |   2 +-
 app/models/{bubble => card}/pinnable.rb       |   2 +-
 app/models/{bubble => card}/scorable.rb       |   6 +-
 app/models/{bubble => card}/searchable.rb     |   8 +-
 app/models/{bubble => card}/staged.rb         |   2 +-
 app/models/{bubble => card}/statuses.rb       |  10 +-
 app/models/{bubble => card}/taggable.rb       |   4 +-
 app/models/{bubble => card}/watchable.rb      |   4 +-
 app/models/closure.rb                         |   4 +
 app/models/closure/reason.rb                  |   3 +
 app/models/collection.rb                      |  21 +
 .../{bucket => collection}/accessible.rb      |   4 +-
 app/models/collection/broadcastable.rb        |   8 +
 app/models/comment.rb                         |  14 +-
 app/models/concerns/filter/params.rb          |   4 +-
 app/models/concerns/messageable.rb            |   2 +-
 app/models/event.rb                           |   4 +-
 app/models/event_summary.rb                   |   4 +-
 app/models/filter.rb                          |  20 +-
 app/models/filter/params.rb                   |   4 +-
 app/models/filter/resources.rb                |   6 +-
 app/models/filter/summarized.rb               |   8 +-
 app/models/message.rb                         |   6 +-
 app/models/notification.rb                    |   2 +-
 app/models/notifier.rb                        |  10 +-
 app/models/notifier/assigned.rb               |   2 +-
 app/models/notifier/closed.rb                 |   2 +
 app/models/notifier/popped.rb                 |   2 -
 app/models/notifier/published.rb              |   2 +-
 app/models/pin.rb                             |   2 +-
 app/models/pop.rb                             |   4 -
 app/models/pop/reason.rb                      |   3 -
 app/models/tag.rb                             |   2 +-
 app/models/tagging.rb                         |   2 +-
 app/models/user.rb                            |   4 +-
 app/models/user/accessor.rb                   |  10 +-
 app/models/user/assignee.rb                   |   2 +-
 app/models/watch.rb                           |   2 +-
 app/presenters/bucket_filter_presenter.rb     |  29 -
 app/presenters/collection_filter_presenter.rb |  29 +
 app/views/bubbles/_comments.html.erb          |   6 -
 app/views/bubbles/_date.html.erb              |   9 -
 app/views/bubbles/_publish.html.erb           |   3 -
 .../assignments/create.turbo_stream.erb       |   1 -
 app/views/bubbles/boosts/_boosts.html.erb     |  10 -
 .../bubbles/boosts/create.turbo_stream.erb    |   7 -
 app/views/bubbles/cards/_mini.html.erb        |  22 -
 app/views/bubbles/cards/_perma.html.erb       |  44 --
 app/views/bubbles/cards/_preview.html.erb     |  31 -
 .../bubbles/cards/common/_background.html.erb |  11 -
 app/views/bubbles/cards/mini/_tags.html.erb   |   1 -
 .../bubbles/cards/perma/_assignees.html.erb   |   3 -
 .../bubbles/cards/perma/_boosts.html.erb      |   3 -
 app/views/bubbles/cards/perma/_meta.html.erb  |   3 -
 .../bubbles/cards/perma/_people.html.erb      |   3 -
 .../bubbles/cards/preview/_assignees.html.erb |   1 -
 .../bubbles/cards/preview/_boosts.html.erb    |   8 -
 .../bubbles/cards/preview/_meta.html.erb      |   3 -
 .../bubbles/cards/preview/_people.html.erb    |   3 -
 .../bubbles/cards/preview/_tags.html.erb      |  12 -
 app/views/bubbles/index.html.erb              |  14 -
 .../bubbles/index/_buckets_filter.html.erb    |  23 -
 app/views/bubbles/stagings/_stages.html.erb   |   9 -
 .../bubbles/stagings/create.turbo_stream.erb  |   3 -
 .../bubbles/taggings/create.turbo_stream.erb  |   1 -
 app/views/bubbles/watches/show.html.erb       |  13 -
 app/views/buckets/_bucket.html.erb            |  27 -
 .../buckets/involvements/update.html.erb      |   1 -
 .../_closure_toggle.html.erb}                 |  20 +-
 app/views/{bubbles => cards}/_color.html.erb  |   4 +-
 app/views/cards/_comments.html.erb            |   6 +
 app/views/cards/_date.html.erb                |   9 +
 .../_display_count_selector.html.erb          |   0
 .../{bubbles => cards}/_filters.html.erb      |   0
 app/views/{bubbles => cards}/_image.html.erb  |   6 +-
 .../{bubbles => cards}/_messages.html.erb     |  10 +-
 app/views/cards/_publish.html.erb             |   3 +
 .../cards/assignments/create.turbo_stream.erb |   1 +
 .../assignments/new.html.erb                  |   8 +-
 app/views/cards/boosts/_boosts.html.erb       |  10 +
 .../cards/boosts/create.turbo_stream.erb      |   7 +
 app/views/cards/cards/_mini.html.erb          |  22 +
 app/views/cards/cards/_perma.html.erb         |  44 ++
 app/views/cards/cards/_preview.html.erb       |  31 +
 .../cards/common/_assignees.html.erb          |   6 +-
 .../cards/cards/common/_background.html.erb   |  11 +
 .../cards/common/_meta.html.erb               |  12 +-
 .../cards/common/_people.html.erb             |   2 +-
 .../cards/mini/_assignees.html.erb            |   6 +-
 app/views/cards/cards/mini/_tags.html.erb     |   1 +
 .../cards/cards/perma/_assignees.html.erb     |   3 +
 app/views/cards/cards/perma/_boosts.html.erb  |   3 +
 app/views/cards/cards/perma/_meta.html.erb    |   3 +
 app/views/cards/cards/perma/_people.html.erb  |   3 +
 .../cards/perma/_tags.html.erb                |  14 +-
 .../cards/cards/preview/_assignees.html.erb   |   1 +
 .../cards/cards/preview/_boosts.html.erb      |   8 +
 app/views/cards/cards/preview/_meta.html.erb  |   3 +
 .../cards/cards/preview/_people.html.erb      |   3 +
 .../cards/preview/_stages.html.erb            |   4 +-
 app/views/cards/cards/preview/_tags.html.erb  |  12 +
 app/views/{bubbles => cards}/edit.html.erb    |   6 +-
 app/views/cards/index.html.erb                |  14 +
 .../cards/index/_collections_filter.html.erb  |  23 +
 .../{bubbles => cards}/index/_header.html.erb |  18 +-
 .../index/_sorting_options.html.erb           |   2 +-
 .../index/_workflow_filter.html.erb           |   4 +-
 .../index/cards/_closed.html.erb}             |   4 +-
 .../index/cards}/_considering.html.erb        |   4 +-
 .../index/cards}/_doing.html.erb              |   8 +-
 .../{bubbles => cards}/pins/show.html.erb     |   8 +-
 .../readings/create.turbo_stream.erb          |   0
 app/views/{bubbles => cards}/show.html.erb    |  62 +-
 app/views/cards/stagings/_stages.html.erb     |   9 +
 .../cards/stagings/create.turbo_stream.erb    |   3 +
 .../cards/taggings/create.turbo_stream.erb    |   1 +
 .../{bubbles => cards}/taggings/new.html.erb  |   8 +-
 .../tags/_listbox_option.html.erb             |   2 +-
 app/views/cards/watches/show.html.erb         |  13 +
 .../_access_toggle.erb                        |   0
 app/views/collections/_collection.html.erb    |  27 +
 .../{buckets => collections}/edit.html.erb    |  24 +-
 .../collections/involvements/update.html.erb  |   1 +
 .../{buckets => collections}/new.html.erb     |   6 +-
 app/views/comments/_body.html.erb             |   4 +-
 app/views/comments/_new.html.erb              |   6 +-
 app/views/comments/create.html.erb            |   2 +-
 app/views/comments/edit.html.erb              |   8 +-
 .../comments/reactions/_reaction.html.erb     |   2 +-
 .../comments/reactions/_reactions.html.erb    |   2 +-
 app/views/comments/reactions/new.html.erb     |   4 +-
 app/views/events/_event.html.erb              |  14 +-
 app/views/events/_filter.html.erb             |  12 +-
 app/views/events/index.html.erb               |   8 +-
 app/views/filters/_assignees.html.erb         |   4 +-
 app/views/filters/_broadcasts.html.erb        |   8 +-
 ...buckets.html.erb => _collections.html.erb} |  18 +-
 app/views/filters/_creators.html.erb          |   4 +-
 app/views/filters/_dialog.html.erb            |  16 +-
 app/views/filters/_filter.html.erb            |  24 +-
 app/views/filters/_indexed_by.html.erb        |   2 +-
 app/views/filters/_settings.html.erb          |   4 +-
 app/views/filters/_stages.html.erb            |   2 +-
 app/views/filters/_tags.html.erb              |   4 +-
 app/views/my/pins/_pin.html.erb               |  22 +-
 .../notifications/_notification.html.erb      |   2 +-
 ...{_bucket.html.erb => _collection.html.erb} |   6 +-
 .../notifications/settings/show.html.erb      |   2 +-
 app/views/pwa/manifest.json.erb               |   2 +-
 app/views/tags/index.html.erb                 |   2 +-
 app/views/terminals/_event.html.erb           |   2 +-
 app/views/terminals/edit.html.erb             |   2 +-
 app/views/users/show.html.erb                 |   4 +-
 config/recurring.yml                          |   6 +-
 config/routes.rb                              |  18 +-
 config/storage.yml                            |   4 +-
 .../20250409043626_rename_bubbles_to_cards.rb |  53 ++
 db/schema.rb                                  | 134 ++--
 db/schema_cache.yml                           | 634 +++++++++---------
 script/closureulate/collections_and_cards.rb  |  17 +
 ...ons.rb => fill_account_closure_reasons.rb} |   2 +-
 script/populate/buckets_and_bubbles.rb        |  17 -
 script/remove_duplicated_tags.rb              |   4 +-
 script/renaming/content.rb                    |  64 ++
 script/renaming/files.rb                      |  75 +++
 .../bubbles/assignments_controller_test.rb    |  24 -
 .../bubbles/boosts_controller_test.rb         |  27 -
 .../bubbles/engagements_controller_test.rb    |  27 -
 .../bubbles/pins_controller_test.rb           |  31 -
 .../bubbles/pops_controller_test.rb           |  29 -
 .../bubbles/publishes_controller_test.rb      |  18 -
 .../bubbles/taggings_controller_test.rb       |  26 -
 .../bubbles/watches_controller_test.rb        |  27 -
 test/controllers/bubbles_controller_test.rb   |  65 --
 .../buckets/involvements_controller_test.rb   |  18 -
 .../buckets/workflows_controller_test.rb      |  16 -
 test/controllers/buckets_controller_test.rb   |  63 --
 .../cards/assignments_controller_test.rb      |  24 +
 .../cards/boosts_controller_test.rb           |  27 +
 .../cards/closures_controller_test.rb         |  29 +
 .../cards/engagements_controller_test.rb      |  27 +
 .../controllers/cards/pins_controller_test.rb |  31 +
 .../cards/publishes_controller_test.rb        |  18 +
 .../readings_controller_test.rb               |   4 +-
 .../cards/taggings_controller_test.rb         |  26 +
 .../cards/watches_controller_test.rb          |  27 +
 test/controllers/cards_controller_test.rb     |  65 ++
 .../involvements_controller_test.rb           |  18 +
 .../collections/workflows_controller_test.rb  |  16 +
 .../collections_controller_test.rb            |  63 ++
 test/controllers/comments_controller_test.rb  |   8 +-
 test/controllers/events_controller_test.rb    |   6 +-
 test/controllers/filters_controller_test.rb   |  12 +-
 test/controllers/my/pins_controller_test.rb   |   2 +-
 test/controllers/reactions_controller_test.rb |   6 +-
 test/controllers/recovers_controller_test.rb  |  14 +-
 test/fixtures/accesses.yml                    |   6 +-
 test/fixtures/assignments.yml                 |   6 +-
 .../fixtures/{bubble => card}/engagements.yml |   2 +-
 test/fixtures/{bubbles.yml => cards.yml}      |   8 +-
 test/fixtures/{pops.yml => closures.yml}      |   2 +-
 .../fixtures/{buckets.yml => collections.yml} |   0
 test/fixtures/events.yml                      |  32 +-
 test/fixtures/messages.yml                    |  18 +-
 test/fixtures/notifications.yml               |   6 +-
 test/fixtures/pins.yml                        |   4 +-
 test/fixtures/taggings.yml                    |   8 +-
 test/fixtures/watches.yml                     |  18 +-
 test/integration/bubble_messages.rb           |  50 --
 test/integration/card_messages.rb             |  50 ++
 test/models/account/closure_reasons_test.rb   |   8 +
 test/models/account/pop_reasons_test.rb       |   8 -
 test/models/bubble/assignable_test.rb         |  15 -
 test/models/bubble/commentable_test.rb        |  14 -
 test/models/bubble/engageable_test.rb         |  63 --
 test/models/bubble/eventable_test.rb          |  21 -
 test/models/bubble/messages_test.rb           |  46 --
 test/models/bubble/poppable_test.rb           |  31 -
 test/models/bubble/scorable_test.rb           |  90 ---
 test/models/bubble/searchable_test.rb         |  24 -
 test/models/bubble/statuses_test.rb           |  61 --
 test/models/bubble/taggable_test.rb           |  19 -
 test/models/bubble/watchable_test.rb          |  43 --
 test/models/bubble_test.rb                    | 147 ----
 test/models/bucket_test.rb                    |  33 -
 test/models/card/assignable_test.rb           |  15 +
 test/models/card/closeable_test.rb            |  31 +
 test/models/card/commentable_test.rb          |  14 +
 test/models/card/engageable_test.rb           |  63 ++
 test/models/card/eventable_test.rb            |  21 +
 test/models/card/messages_test.rb             |  46 ++
 test/models/card/scorable_test.rb             |  90 +++
 test/models/card/searchable_test.rb           |  24 +
 test/models/card/statuses_test.rb             |  61 ++
 test/models/card/taggable_test.rb             |  19 +
 test/models/card/watchable_test.rb            |  43 ++
 test/models/card_test.rb                      | 147 ++++
 test/models/collection_test.rb                |  33 +
 test/models/comment_test.rb                   |  40 +-
 test/models/filter_test.rb                    |  66 +-
 test/models/notifier_test.rb                  |  14 +-
 test/models/user_test.rb                      |   4 +-
 333 files changed, 3012 insertions(+), 2820 deletions(-)
 rename app/assets/images/{bubble-add.svg => card-add.svg} (100%)
 rename app/assets/images/{bubbles.svg => cards.svg} (100%)
 rename app/assets/images/{pop.svg => closure.svg} (100%)
 rename app/assets/stylesheets/{popup.css => closureup.css} (100%)
 rename app/assets/stylesheets/{buckets.css => collections.css} (85%)
 delete mode 100644 app/controllers/bubbles/assignments_controller.rb
 delete mode 100644 app/controllers/bubbles/boosts_controller.rb
 delete mode 100644 app/controllers/bubbles/engagements_controller.rb
 delete mode 100644 app/controllers/bubbles/images_controller.rb
 delete mode 100644 app/controllers/bubbles/pops_controller.rb
 delete mode 100644 app/controllers/bubbles/publishes_controller.rb
 delete mode 100644 app/controllers/bubbles/readings_controller.rb
 delete mode 100644 app/controllers/bubbles/recovers_controller.rb
 delete mode 100644 app/controllers/bubbles/stagings_controller.rb
 delete mode 100644 app/controllers/bubbles/watches_controller.rb
 delete mode 100644 app/controllers/bubbles_controller.rb
 delete mode 100644 app/controllers/buckets/involvements_controller.rb
 delete mode 100644 app/controllers/buckets/workflows_controller.rb
 delete mode 100644 app/controllers/buckets_controller.rb
 create mode 100644 app/controllers/cards/assignments_controller.rb
 create mode 100644 app/controllers/cards/boosts_controller.rb
 create mode 100644 app/controllers/cards/closures_controller.rb
 create mode 100644 app/controllers/cards/engagements_controller.rb
 create mode 100644 app/controllers/cards/images_controller.rb
 rename app/controllers/{bubbles => cards}/pins_controller.rb (60%)
 create mode 100644 app/controllers/cards/publishes_controller.rb
 create mode 100644 app/controllers/cards/readings_controller.rb
 create mode 100644 app/controllers/cards/recovers_controller.rb
 create mode 100644 app/controllers/cards/stagings_controller.rb
 rename app/controllers/{bubbles => cards}/taggings_controller.rb (59%)
 create mode 100644 app/controllers/cards/watches_controller.rb
 create mode 100644 app/controllers/cards_controller.rb
 create mode 100644 app/controllers/collections/involvements_controller.rb
 create mode 100644 app/controllers/collections/workflows_controller.rb
 create mode 100644 app/controllers/collections_controller.rb
 delete mode 100644 app/controllers/concerns/bubble_scoped.rb
 delete mode 100644 app/controllers/concerns/bucket_filterable.rb
 delete mode 100644 app/controllers/concerns/bucket_scoped.rb
 create mode 100644 app/controllers/concerns/card_scoped.rb
 create mode 100644 app/controllers/concerns/collection_filterable.rb
 create mode 100644 app/controllers/concerns/collection_scoped.rb
 delete mode 100644 app/helpers/bubbles_helper.rb
 create mode 100644 app/helpers/cards_helper.rb
 rename app/javascript/controllers/{bubble_size_controller.js => card_size_controller.js} (69%)
 rename app/javascript/controllers/{popover_controller.js => closureover_controller.js} (100%)
 rename app/jobs/{bubble/auto_pop_all_due_job.rb => card/auto_closure_all_due_job.rb} (57%)
 rename app/jobs/{bubble => card}/auto_reconsider_all_stagnated_job.rb (50%)
 rename app/models/account/{pop_reasons.rb => closure_reasons.rb} (58%)
 delete mode 100644 app/models/bubble/engagement.rb
 delete mode 100644 app/models/bubble/poppable.rb
 delete mode 100644 app/models/bucket.rb
 delete mode 100644 app/models/bucket/broadcastable.rb
 rename app/models/{bubble.rb => card.rb} (81%)
 rename app/models/{bubble => card}/assignable.rb (97%)
 rename app/models/{bubble => card}/boostable.rb (92%)
 create mode 100644 app/models/card/closeable.rb
 rename app/models/{bubble => card}/colored.rb (87%)
 rename app/models/{bubble => card}/commentable.rb (93%)
 rename app/models/{bubble => card}/engageable.rb (82%)
 create mode 100644 app/models/card/engagement.rb
 rename app/models/{bubble => card}/eventable.rb (86%)
 rename app/models/{bubble => card}/messages.rb (97%)
 rename app/models/{bubble => card}/pinnable.rb (92%)
 rename app/models/{bubble => card}/scorable.rb (92%)
 rename app/models/{bubble => card}/searchable.rb (75%)
 rename app/models/{bubble => card}/staged.rb (95%)
 rename app/models/{bubble => card}/statuses.rb (66%)
 rename app/models/{bubble => card}/taggable.rb (83%)
 rename app/models/{bubble => card}/watchable.rb (88%)
 create mode 100644 app/models/closure.rb
 create mode 100644 app/models/closure/reason.rb
 create mode 100644 app/models/collection.rb
 rename app/models/{bucket => collection}/accessible.rb (85%)
 create mode 100644 app/models/collection/broadcastable.rb
 create mode 100644 app/models/notifier/closed.rb
 delete mode 100644 app/models/notifier/popped.rb
 delete mode 100644 app/models/pop.rb
 delete mode 100644 app/models/pop/reason.rb
 delete mode 100644 app/presenters/bucket_filter_presenter.rb
 create mode 100644 app/presenters/collection_filter_presenter.rb
 delete mode 100644 app/views/bubbles/_comments.html.erb
 delete mode 100644 app/views/bubbles/_date.html.erb
 delete mode 100644 app/views/bubbles/_publish.html.erb
 delete mode 100644 app/views/bubbles/assignments/create.turbo_stream.erb
 delete mode 100644 app/views/bubbles/boosts/_boosts.html.erb
 delete mode 100644 app/views/bubbles/boosts/create.turbo_stream.erb
 delete mode 100644 app/views/bubbles/cards/_mini.html.erb
 delete mode 100644 app/views/bubbles/cards/_perma.html.erb
 delete mode 100644 app/views/bubbles/cards/_preview.html.erb
 delete mode 100644 app/views/bubbles/cards/common/_background.html.erb
 delete mode 100644 app/views/bubbles/cards/mini/_tags.html.erb
 delete mode 100644 app/views/bubbles/cards/perma/_assignees.html.erb
 delete mode 100644 app/views/bubbles/cards/perma/_boosts.html.erb
 delete mode 100644 app/views/bubbles/cards/perma/_meta.html.erb
 delete mode 100644 app/views/bubbles/cards/perma/_people.html.erb
 delete mode 100644 app/views/bubbles/cards/preview/_assignees.html.erb
 delete mode 100644 app/views/bubbles/cards/preview/_boosts.html.erb
 delete mode 100644 app/views/bubbles/cards/preview/_meta.html.erb
 delete mode 100644 app/views/bubbles/cards/preview/_people.html.erb
 delete mode 100644 app/views/bubbles/cards/preview/_tags.html.erb
 delete mode 100644 app/views/bubbles/index.html.erb
 delete mode 100644 app/views/bubbles/index/_buckets_filter.html.erb
 delete mode 100644 app/views/bubbles/stagings/_stages.html.erb
 delete mode 100644 app/views/bubbles/stagings/create.turbo_stream.erb
 delete mode 100644 app/views/bubbles/taggings/create.turbo_stream.erb
 delete mode 100644 app/views/bubbles/watches/show.html.erb
 delete mode 100644 app/views/buckets/_bucket.html.erb
 delete mode 100644 app/views/buckets/involvements/update.html.erb
 rename app/views/{bubbles/_pop_toggle.html.erb => cards/_closure_toggle.html.erb} (58%)
 rename app/views/{bubbles => cards}/_color.html.erb (86%)
 create mode 100644 app/views/cards/_comments.html.erb
 create mode 100644 app/views/cards/_date.html.erb
 rename app/views/{bubbles => cards}/_display_count_selector.html.erb (100%)
 rename app/views/{bubbles => cards}/_filters.html.erb (100%)
 rename app/views/{bubbles => cards}/_image.html.erb (69%)
 rename app/views/{bubbles => cards}/_messages.html.erb (50%)
 create mode 100644 app/views/cards/_publish.html.erb
 create mode 100644 app/views/cards/assignments/create.turbo_stream.erb
 rename app/views/{bubbles => cards}/assignments/new.html.erb (59%)
 create mode 100644 app/views/cards/boosts/_boosts.html.erb
 create mode 100644 app/views/cards/boosts/create.turbo_stream.erb
 create mode 100644 app/views/cards/cards/_mini.html.erb
 create mode 100644 app/views/cards/cards/_perma.html.erb
 create mode 100644 app/views/cards/cards/_preview.html.erb
 rename app/views/{bubbles => cards}/cards/common/_assignees.html.erb (55%)
 create mode 100644 app/views/cards/cards/common/_background.html.erb
 rename app/views/{bubbles => cards}/cards/common/_meta.html.erb (59%)
 rename app/views/{bubbles => cards}/cards/common/_people.html.erb (84%)
 rename app/views/{bubbles => cards}/cards/mini/_assignees.html.erb (58%)
 create mode 100644 app/views/cards/cards/mini/_tags.html.erb
 create mode 100644 app/views/cards/cards/perma/_assignees.html.erb
 create mode 100644 app/views/cards/cards/perma/_boosts.html.erb
 create mode 100644 app/views/cards/cards/perma/_meta.html.erb
 create mode 100644 app/views/cards/cards/perma/_people.html.erb
 rename app/views/{bubbles => cards}/cards/perma/_tags.html.erb (50%)
 create mode 100644 app/views/cards/cards/preview/_assignees.html.erb
 create mode 100644 app/views/cards/cards/preview/_boosts.html.erb
 create mode 100644 app/views/cards/cards/preview/_meta.html.erb
 create mode 100644 app/views/cards/cards/preview/_people.html.erb
 rename app/views/{bubbles => cards}/cards/preview/_stages.html.erb (77%)
 create mode 100644 app/views/cards/cards/preview/_tags.html.erb
 rename app/views/{bubbles => cards}/edit.html.erb (68%)
 create mode 100644 app/views/cards/index.html.erb
 create mode 100644 app/views/cards/index/_collections_filter.html.erb
 rename app/views/{bubbles => cards}/index/_header.html.erb (59%)
 rename app/views/{bubbles => cards}/index/_sorting_options.html.erb (90%)
 rename app/views/{bubbles => cards}/index/_workflow_filter.html.erb (89%)
 rename app/views/{bubbles/index/bubbles/_popped.html.erb => cards/index/cards/_closed.html.erb} (68%)
 rename app/views/{bubbles/index/bubbles => cards/index/cards}/_considering.html.erb (73%)
 rename app/views/{bubbles/index/bubbles => cards/index/cards}/_doing.html.erb (60%)
 rename app/views/{bubbles => cards}/pins/show.html.erb (50%)
 rename app/views/{bubbles => cards}/readings/create.turbo_stream.erb (100%)
 rename app/views/{bubbles => cards}/show.html.erb (58%)
 create mode 100644 app/views/cards/stagings/_stages.html.erb
 create mode 100644 app/views/cards/stagings/create.turbo_stream.erb
 create mode 100644 app/views/cards/taggings/create.turbo_stream.erb
 rename app/views/{bubbles => cards}/taggings/new.html.erb (67%)
 rename app/views/{bubbles => cards}/tags/_listbox_option.html.erb (69%)
 create mode 100644 app/views/cards/watches/show.html.erb
 rename app/views/{buckets => collections}/_access_toggle.erb (100%)
 create mode 100644 app/views/collections/_collection.html.erb
 rename app/views/{buckets => collections}/edit.html.erb (73%)
 create mode 100644 app/views/collections/involvements/update.html.erb
 rename app/views/{buckets => collections}/new.html.erb (80%)
 rename app/views/filters/{_buckets.html.erb => _collections.html.erb} (62%)
 rename app/views/notifications/settings/{_bucket.html.erb => _collection.html.erb} (68%)
 create mode 100644 db/migrate/20250409043626_rename_bubbles_to_cards.rb
 create mode 100644 script/closureulate/collections_and_cards.rb
 rename script/{fill_account_pop_reasons.rb => fill_account_closure_reasons.rb} (75%)
 delete mode 100644 script/populate/buckets_and_bubbles.rb
 create mode 100644 script/renaming/content.rb
 create mode 100644 script/renaming/files.rb
 delete mode 100644 test/controllers/bubbles/assignments_controller_test.rb
 delete mode 100644 test/controllers/bubbles/boosts_controller_test.rb
 delete mode 100644 test/controllers/bubbles/engagements_controller_test.rb
 delete mode 100644 test/controllers/bubbles/pins_controller_test.rb
 delete mode 100644 test/controllers/bubbles/pops_controller_test.rb
 delete mode 100644 test/controllers/bubbles/publishes_controller_test.rb
 delete mode 100644 test/controllers/bubbles/taggings_controller_test.rb
 delete mode 100644 test/controllers/bubbles/watches_controller_test.rb
 delete mode 100644 test/controllers/bubbles_controller_test.rb
 delete mode 100644 test/controllers/buckets/involvements_controller_test.rb
 delete mode 100644 test/controllers/buckets/workflows_controller_test.rb
 delete mode 100644 test/controllers/buckets_controller_test.rb
 create mode 100644 test/controllers/cards/assignments_controller_test.rb
 create mode 100644 test/controllers/cards/boosts_controller_test.rb
 create mode 100644 test/controllers/cards/closures_controller_test.rb
 create mode 100644 test/controllers/cards/engagements_controller_test.rb
 create mode 100644 test/controllers/cards/pins_controller_test.rb
 create mode 100644 test/controllers/cards/publishes_controller_test.rb
 rename test/controllers/{bubbles => cards}/readings_controller_test.rb (62%)
 create mode 100644 test/controllers/cards/taggings_controller_test.rb
 create mode 100644 test/controllers/cards/watches_controller_test.rb
 create mode 100644 test/controllers/cards_controller_test.rb
 create mode 100644 test/controllers/collections/involvements_controller_test.rb
 create mode 100644 test/controllers/collections/workflows_controller_test.rb
 create mode 100644 test/controllers/collections_controller_test.rb
 rename test/fixtures/{bubble => card}/engagements.yml (53%)
 rename test/fixtures/{bubbles.yml => cards.yml} (89%)
 rename test/fixtures/{pops.yml => closures.yml} (68%)
 rename test/fixtures/{buckets.yml => collections.yml} (100%)
 delete mode 100644 test/integration/bubble_messages.rb
 create mode 100644 test/integration/card_messages.rb
 create mode 100644 test/models/account/closure_reasons_test.rb
 delete mode 100644 test/models/account/pop_reasons_test.rb
 delete mode 100644 test/models/bubble/assignable_test.rb
 delete mode 100644 test/models/bubble/commentable_test.rb
 delete mode 100644 test/models/bubble/engageable_test.rb
 delete mode 100644 test/models/bubble/eventable_test.rb
 delete mode 100644 test/models/bubble/messages_test.rb
 delete mode 100644 test/models/bubble/poppable_test.rb
 delete mode 100644 test/models/bubble/scorable_test.rb
 delete mode 100644 test/models/bubble/searchable_test.rb
 delete mode 100644 test/models/bubble/statuses_test.rb
 delete mode 100644 test/models/bubble/taggable_test.rb
 delete mode 100644 test/models/bubble/watchable_test.rb
 delete mode 100644 test/models/bubble_test.rb
 delete mode 100644 test/models/bucket_test.rb
 create mode 100644 test/models/card/assignable_test.rb
 create mode 100644 test/models/card/closeable_test.rb
 create mode 100644 test/models/card/commentable_test.rb
 create mode 100644 test/models/card/engageable_test.rb
 create mode 100644 test/models/card/eventable_test.rb
 create mode 100644 test/models/card/messages_test.rb
 create mode 100644 test/models/card/scorable_test.rb
 create mode 100644 test/models/card/searchable_test.rb
 create mode 100644 test/models/card/statuses_test.rb
 create mode 100644 test/models/card/taggable_test.rb
 create mode 100644 test/models/card/watchable_test.rb
 create mode 100644 test/models/card_test.rb
 create mode 100644 test/models/collection_test.rb

diff --git a/app/assets/images/bubble-add.svg b/app/assets/images/card-add.svg
similarity index 100%
rename from app/assets/images/bubble-add.svg
rename to app/assets/images/card-add.svg
diff --git a/app/assets/images/bubbles.svg b/app/assets/images/cards.svg
similarity index 100%
rename from app/assets/images/bubbles.svg
rename to app/assets/images/cards.svg
diff --git a/app/assets/images/pop.svg b/app/assets/images/closure.svg
similarity index 100%
rename from app/assets/images/pop.svg
rename to app/assets/images/closure.svg
diff --git a/app/assets/stylesheets/animation.css b/app/assets/stylesheets/animation.css
index a0d250fe0..c2a510c18 100644
--- a/app/assets/stylesheets/animation.css
+++ b/app/assets/stylesheets/animation.css
@@ -38,7 +38,7 @@
   }
 
   @keyframes wobble {
-    0%  { transform: rotate(calc(var(--bubble-rotate) + 90deg)); }
+    0%  { transform: rotate(calc(var(--card-rotate) + 90deg)); }
     15% { border-radius: 66% 34% 72% 28% / 39% 63% 37% 61%; }
     25% { border-radius: 55% 47% 62% 40% / 58% 50% 52% 44%; }
     33% { border-radius: 46% 54% 61% 39% / 50% 51% 49% 50%; }
@@ -47,7 +47,7 @@
   }
 
   @keyframes wobble-alt {
-    0%  { transform: rotate(calc(var(--bubble-rotate) + -90deg)); }
+    0%  { transform: rotate(calc(var(--card-rotate) + -90deg)); }
     12% { border-radius: 66% 34% 72% 28% / 39% 63% 37% 61%; }
     25% { border-radius: 53% 45% 60% 38% / 56% 48% 50% 42%; }
     33% { border-radius: 55% 47% 62% 40% / 58% 50% 52% 44%; }
diff --git a/app/assets/stylesheets/bubbles.css b/app/assets/stylesheets/bubbles.css
index 669a99f80..509cb62d0 100644
--- a/app/assets/stylesheets/bubbles.css
+++ b/app/assets/stylesheets/bubbles.css
@@ -20,7 +20,7 @@
     }
   }
 
-  .bubble {
+  .something-to-rename {
     --bubble-background: radial-gradient(circle at center, color(from var(--bubble-color) srgb r g b / 0.25), color(from var(--bubble-color) srgb r g b / 0.05));
     --bubble-border-width: 0.2rem;
     --hover-size: 0;
@@ -110,15 +110,15 @@
       }
 
       @media (hover: hover) {
-        .bubbles .bubble:not(.popped):hover & {
+        .bubbles .something-to-rename:not(.popped):hover & {
           transform: translate(0, -1rem);
         }
 
-        .bubbles .bubble:not(.popped):hover & + & {
+        .bubbles .something-to-rename:not(.popped):hover & + & {
           transform: translate(1rem, -1rem);
         }
 
-        .bubbles .bubble:not(.popped):hover & + & + & {
+        .bubbles .something-to-rename:not(.popped):hover & + & + & {
           transform: translate(1.5rem, -0.5rem);;
         }
       }
@@ -176,7 +176,7 @@
       }
 
       @media (hover: hover) {
-        .bubbles .bubble:not(.popped):hover & {
+        .bubbles .something-to-rename:not(.popped):hover & {
           transform: translate(-0.5rem, -2rem);
         }
       }
@@ -195,22 +195,22 @@
       }
 
       @media (hover: hover) {
-        .bubbles .bubble:not(.popped):hover & {
+        .bubbles .something-to-rename:not(.popped):hover & {
           transform: rotate(calc(var(--rotation) + var(--bubble-shift) * 1)) translate(0rem, 0.5rem);
         }
       }
     }
 
     @media (hover: hover) {
-      .bubbles .bubble:not(.popped):hover & {
+      .bubbles .something-to-rename:not(.popped):hover & {
         transform: translate(1rem, 1rem);
       }
 
-      .bubbles .bubble:not(.popped):hover & + & {
+      .bubbles .something-to-rename:not(.popped):hover & + & {
         transform: translate(0, -1rem);
       }
 
-      .bubbles .bubble:not(.popped):hover & + & + & {
+      .bubbles .something-to-rename:not(.popped):hover & + & + & {
         transform: translate(-1rem, -1rem);
       }
     }
@@ -227,7 +227,7 @@
     transition: 0.2s ease;
 
     @media (hover: hover) {
-      .bubbles .bubble:not(.popped):hover & {
+      .bubbles .something-to-rename:not(.popped):hover & {
         transform: rotate(calc(var(--bubble-rotate) + var(--bubble-shift))) scale(0.9);
       }
     }
@@ -273,7 +273,7 @@
       margin-inline: var(--tray-size);
     }
 
-    .bubble {
+    .something-to-rename {
       order: 0;
     }
 
@@ -379,22 +379,22 @@
       }
     }
 
-    textarea {
-      --input-color: var(--bubble-color);
-      --input-border-radius: 0;
+    /*textarea {*/
+    /*  --input-color: var(--bubble-color);*/
+    /*  --input-border-radius: 0;*/
 
-      font-size: 9cqi;
-      font-weight: 800;
-      line-height: 1.2;
+    /*  font-size: 9cqi;*/
+    /*  font-weight: 800;*/
+    /*  line-height: 1.2;*/
 
-      &::selection {
-        background-color: var(--bubble-color);
-        color: var(--color-ink-reversed);
-      }
-    }
+    /*  &::selection {*/
+    /*    background-color: var(--bubble-color);*/
+    /*    color: var(--color-ink-reversed);*/
+    /*  }*/
+    /*}*/
 
     @media (hover: hover) {
-      .bubble:has(.bubble__image img:not([src=""])):hover & {
+      .something-to-rename:has(.bubble__image img:not([src=""])):hover & {
         color: var(--color-ink-reversed);
         text-shadow: 0 0 0.2em var(--bubble-color), 0 0 0.2em var(--bubble-color), 0 0 0.2em var(--bubble-color);
         position: relative;
@@ -422,7 +422,7 @@
       --bubble-border-color: color-mix(in srgb, var(--bubble-color) 30%, var(--color-bg));
     }
 
-    .bubble & {
+    .something-to-rename & {
       --bubble-size: 100%;
     }
 
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index a91eafae7..294f6cd0b 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -29,7 +29,7 @@
       padding: calc(var(--block-space) * 1.5) var(--block-space);
       margin: var(--block-space) auto calc(var(--block-space) * 1.5);
 
-      .card__title {
+      .something-to-rename__title {
         margin-block-start: 0.1em;
         min-block-size: 0;
       }
@@ -52,7 +52,7 @@
         margin-block-start: -0.2em;
       }
 
-      .card__tags {
+      .something-to-rename__tags {
         font-size: var(--text-small);
       }
     }
@@ -78,8 +78,8 @@
     --border-size: 0;
 
     aspect-ratio: 2/0.95;
-    background-color: color-mix(in srgb, var(--bubble-color) 4%, var(--color-bg));
-    color: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink));
+    background-color: color-mix(in srgb, var(--card-color) 4%, var(--color-bg));
+    color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
     max-inline-size: 75ch;
     z-index: 1;
 
@@ -111,11 +111,11 @@
     inset: var(--actions-block-inset) calc(var(--actions-inline-inset) * -1) auto auto;
   }
 
-  .card__actions-container {
+  .something-to-rename__actions-container {
     --border-radius: 1em;
-  
+
     background-color: var(--color-bg);
-    color: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink));
+    color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
     margin-block: calc(var(--block-space) * -1.66) calc(var(--block-space) * 1.66);
     padding: calc(var(--block-space) * 0.66) calc(var(--inline-space) * 1.5);
     position: relative;
@@ -126,18 +126,18 @@
     }
 
     .btn:not(.popup__item, .btn--plain) {
-      --btn-background: var(--bubble-color);
+      --btn-background: var(--card-color);
       --btn-color: var(--color-ink-reversed);
     }
 
     .btn--plain {
-      --btn-color: var(--bubble-color);
+      --btn-color: var(--card-color);
 
       text-decoration: underline;
     }
 
-    .bubble__pop-message {
-      color: var(--bubble-color);
+    .something-to-rename__closure-message {
+      color: var(--card-color);
     }
   }
 
@@ -152,7 +152,7 @@
     }
 
     .switch__input:checked + .switch__btn {
-      background-color: var(--bubble-color) !important;
+      background-color: var(--card-color) !important;
     }
 
     strong {
@@ -203,14 +203,14 @@
     padding-block: var(--block-space);
   }
 
-  .card__bucket {
-    background-color: var(--bubble-color);
+  .card__collection {
+    background-color: var(--card-color);
     font-weight: 800;
     letter-spacing: 0.5ch;
     padding: var(--block-space-half) var(--inline-space-double);
   }
 
-  .card-bucket__filter {
+  .card-collection__filter {
     > button {
       --hover-size: 0;
     }
@@ -244,7 +244,7 @@
     --padding-inline: calc(var(--block-space-double) + var(--block-space));
     --padding-block: var(--block-space-double) calc(var(--block-space-double) + var(--block-space-half));
 
-    background-color: color-mix(in srgb, var(--bubble-color) 33%, var(--color-bg));
+    background-color: color-mix(in srgb, var(--card-color) 33%, var(--color-bg));
     border-radius: 0.2em;
     display: inline-flex;
     margin-block: calc(var(--block-space) * -1) calc(var(--block-space) * -0.33);
@@ -374,7 +374,7 @@
     }
   }
 
-  .card__link {
+  .something-to-rename__link {
     --hover-size: 0;
 
     content: "";
@@ -389,7 +389,7 @@
   }
 
   .card__meta {
-    --border-color: var(--bubble-color);
+    --border-color: var(--card-color);
     --border-size: 1px;
     --row-gap: 0.25em;
 
@@ -405,7 +405,7 @@
   }
 
   .card__move-button {
-    --btn-background: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink));
+    --btn-background: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
 
     margin-block-start: calc(var(--block-space) * 1.2);
     margin-inline-end: calc(var(--inline-space) * -4);
@@ -416,16 +416,16 @@
     flex: 1 1 25%;
   }
 
-  .card__tag {
-    color: var(--bubble-color);
+  .something-to-rename__tag {
+    color: var(--card-color);
     font-weight: 700;
   }
 
-  .card__tags {
-    color: var(--bubble-color);
+  .something-to-rename__tags {
+    color: var(--card-color);
   }
 
-  .card__title {
+  .something-to-rename__title {
     --hover-size: 0;
     --input-border-radius: 0;
 
@@ -498,10 +498,10 @@
     }
   }
 
-  .card__popped {
+  .card__closed {
     align-items: center;
     aspect-ratio: 7/4;
-    border: var(--block-space-half) solid var(--bubble-color);
+    border: var(--block-space-half) solid var(--card-color);
     position: absolute;
     inset: auto var(--block-space) var(--block-space-double) auto;
     justify-content: space-between;
@@ -510,18 +510,18 @@
     z-index: -1;
   }
 
-  .card__popped-by {
+  .card__closed-by {
     border-block-end: 1px dashed currentcolor;
   }
 
-  .card__popped-title {
+  .card__closed-title {
     color: var(--color-ink-reversed);
     font-size: var(--text-rel-large);
     font-weight: 900;
     text-shadow:
-     -2px -2px 0 var(--bubble-color),
-      2px -2px 0 var(--bubble-color),
-     -2px 2px 0 var(--bubble-color),
-      2px 2px 0 var(--bubble-color);
+     -2px -2px 0 var(--card-color),
+      2px -2px 0 var(--card-color),
+     -2px 2px 0 var(--card-color),
+      2px 2px 0 var(--card-color);
   }
 }
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/closureup.css
similarity index 100%
rename from app/assets/stylesheets/popup.css
rename to app/assets/stylesheets/closureup.css
diff --git a/app/assets/stylesheets/buckets.css b/app/assets/stylesheets/collections.css
similarity index 85%
rename from app/assets/stylesheets/buckets.css
rename to app/assets/stylesheets/collections.css
index dc7eee01e..4d0ad7245 100644
--- a/app/assets/stylesheets/buckets.css
+++ b/app/assets/stylesheets/collections.css
@@ -1,5 +1,5 @@
 @layer components {
-  .bucket {
+  .collection {
     inline-size: min(35ch, 40%);
     line-height: 1.2;
 
@@ -10,7 +10,7 @@
     }
   }
 
-  .buckets {
+  .collections {
     --gap: 2cqi;
     --hover-size: 0;
     --column-gap: var(--gap);
@@ -20,12 +20,12 @@
     padding: var(--gap);
   }
 
-  .bucket__button {
+  .collection__button {
     position: absolute;
     inset: calc((var(--btn-size) * -1) - 2cqi) 1cqi auto auto;
   }
 
-  .bucket__bubbles {
+  .collection__cards {
     --border-radius: 1.5em;
 
     margin-block: 0;
@@ -33,7 +33,7 @@
     padding: 1cqi;
   }
 
-  .bubbles__container {
+  .cards__container {
     aspect-ratio: 18 / 9;
     container-type: inline-size;
   }
diff --git a/app/assets/stylesheets/color-picker.css b/app/assets/stylesheets/color-picker.css
index 15d835477..7b6ff640f 100644
--- a/app/assets/stylesheets/color-picker.css
+++ b/app/assets/stylesheets/color-picker.css
@@ -1,5 +1,5 @@
 .color-picker {
-  --panel-border-color: var(--bubble-color);
+  --panel-border-color: var(--card-color);
   --panel-border-radius: 2em;
   --panel-border-size: 2px;
   --panel-padding: 0.5em 0.7em;
diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index f7f5ce3bb..9a04d5ee2 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -86,7 +86,7 @@
   }
 
   .event--related {
-    --hover-color: var(--bubble-color);
+    --hover-color: var(--card-color);
     --hover-size: 0.15rem;
 
     box-shadow: 0 0 0 var(--hover-size) var(--hover-color);
@@ -138,7 +138,7 @@
 
   .event__icon {
     aspect-ratio: 1;
-    background-color: var(--bubble-color);
+    background-color: var(--card-color);
     block-size: 1.7em;
     border-radius: 1.7em;
     inline-size: 1.7em;
diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css
index 7937952f3..10e273bb5 100644
--- a/app/assets/stylesheets/icons.css
+++ b/app/assets/stylesheets/icons.css
@@ -30,8 +30,8 @@
   .icon--bolt { --svg: url("bolt.svg "); }
   .icon--bookmark-outline { --svg: url("bookmark-outline.svg "); }
   .icon--bookmark { --svg: url("bookmark.svg "); }
-  .icon--bubble-add { --svg: url("bubble-add.svg "); }
-  .icon--bubbles { --svg: url("bubbles.svg "); }
+  .icon--card-add { --svg: url("card-add.svg "); }
+  .icon--cards { --svg: url("cards.svg "); }
   .icon--calendar-add { --svg: url("calendar-add.svg "); }
   .icon--calendar { --svg: url("calendar.svg "); }
   .icon--camera { --svg: url("camera.svg "); }
@@ -65,7 +65,7 @@
   .icon--picture-double { --svg: url("picture-double.svg "); }
   .icon--picture-remove { --svg: url("picture-remove.svg "); }
   .icon--pinned { --svg: url("pinned.svg "); }
-  .icon--pop { --svg: url("pop.svg "); }
+  .icon--closure { --svg: url("closure.svg "); }
   .icon--qr-code { --svg: url("qr-code.svg "); }
   .icon--reaction { --svg: url("reaction.svg "); }
   .icon--refresh { --svg: url("refresh.svg "); }
diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index d5563d5dd..292f7c691 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -14,8 +14,8 @@
     }
   }
 
-  .pin__bucket {
-    background-color: var(--bubble-color);
+  .pin__collection {
+    background-color: var(--card-color);
     font-weight: 800;
     letter-spacing: 0.3ch;
     padding: 0.3em 0.6em 0.3em 1.5em;
@@ -45,7 +45,7 @@
   }
 
   .pin__tags {
-    color: var(--bubble-color);
+    color: var(--card-color);
   }
 
   .pin__title {
diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css
index b6591a2a7..4f93ce4b8 100644
--- a/app/assets/stylesheets/workflows.css
+++ b/app/assets/stylesheets/workflows.css
@@ -11,35 +11,35 @@
 
     @media (hover: hover) {
       &:hover {
-        background-color: color(from var(--bubble-color) srgb r g b / 0.15);
+        background-color: color(from var(--card-color) srgb r g b / 0.15);
       }
     }
 
-    .bubbles-list & {
+    .cards-list & {
       display: none;
     }
   }
 
   .workflow-stage--current {
-    --btn-background: var(--bubble-color);
+    --btn-background: var(--card-color);
 
     color: var(--color-ink-reversed);
 
     @media (hover: hover) {
       &:hover {
-        background-color: color(from var(--bubble-color) srgb r g b / 0.65);
+        background-color: color(from var(--card-color) srgb r g b / 0.65);
       }
     }
 
     .ticket & {
       --btn-background: var(--color-ink);
 
-      background: var(--bubble-color);
+      background: var(--card-color);
       border-radius: 0.2em;
       color: var(--color-ink-reversed);
     }
 
-    .bubbles-list & {
+    .cards-list & {
       display: flex;
       background: transparent;
       border-radius: 0.2em;
diff --git a/app/controllers/bubbles/assignments_controller.rb b/app/controllers/bubbles/assignments_controller.rb
deleted file mode 100644
index 7fd9186aa..000000000
--- a/app/controllers/bubbles/assignments_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Bubbles::AssignmentsController < ApplicationController
-  include BubbleScoped
-
-  def new
-  end
-
-  def create
-    @bubble.toggle_assignment @bucket.users.active.find(params[:assignee_id])
-  end
-end
diff --git a/app/controllers/bubbles/boosts_controller.rb b/app/controllers/bubbles/boosts_controller.rb
deleted file mode 100644
index 38970c40f..000000000
--- a/app/controllers/bubbles/boosts_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class Bubbles::BoostsController < ApplicationController
-  include BubbleScoped
-
-  def create
-    count = if params[:boost_count].to_i == @bubble.boosts_count
-      @bubble.boosts_count + 1
-    else
-      params[:boost_count].to_i
-    end
-    @bubble.boost!(count)
-  end
-end
diff --git a/app/controllers/bubbles/engagements_controller.rb b/app/controllers/bubbles/engagements_controller.rb
deleted file mode 100644
index 5599b7381..000000000
--- a/app/controllers/bubbles/engagements_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Bubbles::EngagementsController < ApplicationController
-  include BubbleScoped
-
-  def create
-    @bubble.engage
-    redirect_to @bubble
-  end
-
-  def destroy
-    @bubble.reconsider
-    redirect_to @bubble
-  end
-end
diff --git a/app/controllers/bubbles/images_controller.rb b/app/controllers/bubbles/images_controller.rb
deleted file mode 100644
index b7dc7da97..000000000
--- a/app/controllers/bubbles/images_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Bubbles::ImagesController < ApplicationController
-  include BubbleScoped
-
-  def destroy
-    @bubble.image.purge_later
-    redirect_to @bubble
-  end
-end
diff --git a/app/controllers/bubbles/pops_controller.rb b/app/controllers/bubbles/pops_controller.rb
deleted file mode 100644
index 5421428ca..000000000
--- a/app/controllers/bubbles/pops_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Bubbles::PopsController < ApplicationController
-  include BubbleScoped
-
-  def create
-    @bubble.pop!(user: Current.user, reason: params[:reason])
-    redirect_to @bubble
-  end
-
-  def destroy
-    @bubble.unpop
-    redirect_to @bubble
-  end
-end
diff --git a/app/controllers/bubbles/publishes_controller.rb b/app/controllers/bubbles/publishes_controller.rb
deleted file mode 100644
index bcc75eb27..000000000
--- a/app/controllers/bubbles/publishes_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Bubbles::PublishesController < ApplicationController
-  include BubbleScoped
-
-  def create
-    @bubble.publish
-    redirect_to @bubble
-  end
-end
diff --git a/app/controllers/bubbles/readings_controller.rb b/app/controllers/bubbles/readings_controller.rb
deleted file mode 100644
index 9f99c456d..000000000
--- a/app/controllers/bubbles/readings_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Bubbles::ReadingsController < ApplicationController
-  include BubbleScoped
-
-  def create
-    mark_bubble_notifications_read
-    @notifications = Current.user.notifications.unread.ordered.limit(20)
-  end
-
-  private
-    def mark_bubble_notifications_read
-      Current.user.notifications.unread.where(bubble: @bubble).read_all
-    end
-end
diff --git a/app/controllers/bubbles/recovers_controller.rb b/app/controllers/bubbles/recovers_controller.rb
deleted file mode 100644
index c94fd6ccf..000000000
--- a/app/controllers/bubbles/recovers_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Bubbles::RecoversController < ApplicationController
-  include BubbleScoped
-
-  def create
-    redirect_to @bubble.recover_abandoned_creation
-  end
-end
diff --git a/app/controllers/bubbles/stagings_controller.rb b/app/controllers/bubbles/stagings_controller.rb
deleted file mode 100644
index 28f7af26e..000000000
--- a/app/controllers/bubbles/stagings_controller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Bubbles::StagingsController < ApplicationController
-  include BubbleScoped
-
-  def create
-    if params[:stage_id].present?
-      @bubble.toggle_stage Current.account.stages.find(params[:stage_id])
-    else
-      @bubble.update!(stage: nil)
-    end
-  end
-end
diff --git a/app/controllers/bubbles/watches_controller.rb b/app/controllers/bubbles/watches_controller.rb
deleted file mode 100644
index 3b21acfa4..000000000
--- a/app/controllers/bubbles/watches_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Bubbles::WatchesController < ApplicationController
-  include BubbleScoped
-
-  def create
-    @bubble.watch_by Current.user
-    redirect_to bubble_watch_path(@bubble)
-  end
-
-  def destroy
-    @bubble.unwatch_by Current.user
-    redirect_to bubble_watch_path(@bubble)
-  end
-end
diff --git a/app/controllers/bubbles_controller.rb b/app/controllers/bubbles_controller.rb
deleted file mode 100644
index 3033ca473..000000000
--- a/app/controllers/bubbles_controller.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-class BubblesController < ApplicationController
-  include BucketScoped
-
-  skip_before_action :set_bucket, only: :index
-
-  before_action :set_filter, only: :index
-  before_action :set_bubble, only: %i[ show edit update destroy ]
-  before_action :handle_display_count, only: :index
-
-  DISPLAY_COUNT_OPTIONS = [ 6, 12, 18, 24 ].freeze
-  DEFAULT_DISPLAY_COUNT = 6
-  RECENTLY_POPPED_LIMIT = 100
-
-  def index
-    @considering_bubbles = @filter.bubbles.considering.load_async
-    @doing_bubbles = @filter.bubbles.doing.load_async
-    @popped_bubbles = @filter.with(indexed_by: "popped").bubbles.recently_popped_first.limit(RECENTLY_POPPED_LIMIT).load_async
-  end
-
-  def create
-    redirect_to @bucket.bubbles.create!
-  end
-
-  def show
-  end
-
-  def edit
-  end
-
-  def destroy
-    @bubble.destroy!
-    redirect_to bubbles_path(bucket_ids: [ @bubble.bucket ]), notice: deleted_notice
-  end
-
-  def update
-    @bubble.update! bubble_params
-    redirect_to @bubble
-  end
-
-  private
-    DEFAULT_PARAMS = { indexed_by: "newest" }
-
-    def set_filter
-      @filter = Current.user.filters.from_params params.reverse_merge(**DEFAULT_PARAMS).permit(*Filter::PERMITTED_PARAMS)
-    end
-
-    def set_bubble
-      @bubble = @bucket.bubbles.find params[:id]
-    end
-
-    def bubble_params
-      params.expect(bubble: [ :status, :title, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
-    end
-
-    def deleted_notice
-      "Bubble deleted" unless @bubble.creating?
-    end
-
-    def handle_display_count
-      if params[:set_display_count].present?
-        cookies[:display_count] = params[:set_display_count]
-        redirect_to bubbles_path(
-          params.permit(*Filter::PERMITTED_PARAMS, :bucket_ids).except(:set_display_count)
-        )
-      end
-    end
-
-    def display_count
-      (cookies[:display_count] || DEFAULT_DISPLAY_COUNT).to_i
-    end
-end
diff --git a/app/controllers/buckets/involvements_controller.rb b/app/controllers/buckets/involvements_controller.rb
deleted file mode 100644
index dbfcbb6d7..000000000
--- a/app/controllers/buckets/involvements_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Buckets::InvolvementsController < ApplicationController
-  include BucketScoped
-
-  def update
-    @bucket.access_for(Current.user).update!(involvement: params[:involvement])
-  end
-end
diff --git a/app/controllers/buckets/workflows_controller.rb b/app/controllers/buckets/workflows_controller.rb
deleted file mode 100644
index fb31b08d0..000000000
--- a/app/controllers/buckets/workflows_controller.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class Buckets::WorkflowsController < ApplicationController
-  include BucketScoped
-
-  before_action :set_workflow
-
-  def update
-    @bucket.update! workflow: @workflow
-
-    redirect_to bubbles_path(bucket_ids: [ @bucket ])
-  end
-
-  private
-    def set_workflow
-      @workflow = Current.account.workflows.find(params.expect(bucket: [ :workflow_id ]).require(:workflow_id))
-    end
-end
diff --git a/app/controllers/buckets_controller.rb b/app/controllers/buckets_controller.rb
deleted file mode 100644
index f4f5a2ff4..000000000
--- a/app/controllers/buckets_controller.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-class BucketsController < ApplicationController
-  before_action :set_bucket, except: %i[ new create ]
-
-  def new
-    @bucket = Current.account.buckets.build
-  end
-
-  def create
-    @bucket = Current.account.buckets.create! bucket_params
-    redirect_to bubbles_path(bucket_ids: [ @bucket ])
-  end
-
-  def edit
-    selected_user_ids = @bucket.users.pluck :id
-    @selected_users, @unselected_users = User.active.alphabetically.partition { |user| selected_user_ids.include? user.id }
-  end
-
-  def update
-    @bucket.update! bucket_params
-    @bucket.accesses.revise granted: grantees, revoked: revokees
-
-    redirect_to bubbles_path(bucket_ids: [ @bucket ])
-  end
-
-  def destroy
-    @bucket.destroy
-    redirect_to root_path
-  end
-
-  private
-    def set_bucket
-      @bucket = Current.user.buckets.find params[:id]
-    end
-
-    def bucket_params
-      params.expect(bucket: [ :name, :all_access ]).with_defaults(all_access: true)
-    end
-
-    def grantees
-      Current.account.users.active.where id: grantee_ids
-    end
-
-    def revokees
-      @bucket.users.where.not id: grantee_ids
-    end
-
-    def grantee_ids
-      params.fetch :user_ids, []
-    end
-end
diff --git a/app/controllers/cards/assignments_controller.rb b/app/controllers/cards/assignments_controller.rb
new file mode 100644
index 000000000..63dce613c
--- /dev/null
+++ b/app/controllers/cards/assignments_controller.rb
@@ -0,0 +1,10 @@
+class Cards::AssignmentsController < ApplicationController
+  include CardScoped
+
+  def new
+  end
+
+  def create
+    @card.toggle_assignment @collection.users.active.find(params[:assignee_id])
+  end
+end
diff --git a/app/controllers/cards/boosts_controller.rb b/app/controllers/cards/boosts_controller.rb
new file mode 100644
index 000000000..bebe888fc
--- /dev/null
+++ b/app/controllers/cards/boosts_controller.rb
@@ -0,0 +1,12 @@
+class Cards::BoostsController < ApplicationController
+  include CardScoped
+
+  def create
+    count = if params[:boost_count].to_i == @card.boosts_count
+      @card.boosts_count + 1
+    else
+      params[:boost_count].to_i
+    end
+    @card.boost!(count)
+  end
+end
diff --git a/app/controllers/cards/closures_controller.rb b/app/controllers/cards/closures_controller.rb
new file mode 100644
index 000000000..a62955228
--- /dev/null
+++ b/app/controllers/cards/closures_controller.rb
@@ -0,0 +1,13 @@
+class Cards::ClosuresController < ApplicationController
+  include CardScoped
+
+  def create
+    @card.closure!(user: Current.user, reason: params[:reason])
+    redirect_to @card
+  end
+
+  def destroy
+    @card.unpop
+    redirect_to @card
+  end
+end
diff --git a/app/controllers/cards/engagements_controller.rb b/app/controllers/cards/engagements_controller.rb
new file mode 100644
index 000000000..72025d16a
--- /dev/null
+++ b/app/controllers/cards/engagements_controller.rb
@@ -0,0 +1,13 @@
+class Cards::EngagementsController < ApplicationController
+  include CardScoped
+
+  def create
+    @card.engage
+    redirect_to @card
+  end
+
+  def destroy
+    @card.reconsider
+    redirect_to @card
+  end
+end
diff --git a/app/controllers/cards/images_controller.rb b/app/controllers/cards/images_controller.rb
new file mode 100644
index 000000000..fad419c52
--- /dev/null
+++ b/app/controllers/cards/images_controller.rb
@@ -0,0 +1,8 @@
+class Cards::ImagesController < ApplicationController
+  include CardScoped
+
+  def destroy
+    @card.image.purge_later
+    redirect_to @card
+  end
+end
diff --git a/app/controllers/bubbles/pins_controller.rb b/app/controllers/cards/pins_controller.rb
similarity index 60%
rename from app/controllers/bubbles/pins_controller.rb
rename to app/controllers/cards/pins_controller.rb
index d75d2b10d..1f6c1aaa8 100644
--- a/app/controllers/bubbles/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -1,21 +1,21 @@
-class Bubbles::PinsController < ApplicationController
-  include BubbleScoped
+class Cards::PinsController < ApplicationController
+  include CardScoped
 
   def show
   end
 
   def create
-    pin = @bubble.pin_by Current.user
+    pin = @card.pin_by Current.user
 
     broadcast_my_new pin
-    redirect_to bubble_pin_path(@bubble)
+    redirect_to card_pin_path(@card)
   end
 
   def destroy
-    pin = @bubble.unpin_by Current.user
+    pin = @card.unpin_by Current.user
 
     broadcast_my_removed pin
-    redirect_to bubble_pin_path(@bubble)
+    redirect_to card_pin_path(@card)
   end
 
   private
diff --git a/app/controllers/cards/publishes_controller.rb b/app/controllers/cards/publishes_controller.rb
new file mode 100644
index 000000000..f7ac6590c
--- /dev/null
+++ b/app/controllers/cards/publishes_controller.rb
@@ -0,0 +1,8 @@
+class Cards::PublishesController < ApplicationController
+  include CardScoped
+
+  def create
+    @card.publish
+    redirect_to @card
+  end
+end
diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb
new file mode 100644
index 000000000..669d959d8
--- /dev/null
+++ b/app/controllers/cards/readings_controller.rb
@@ -0,0 +1,13 @@
+class Cards::ReadingsController < ApplicationController
+  include CardScoped
+
+  def create
+    mark_card_notifications_read
+    @notifications = Current.user.notifications.unread.ordered.limit(20)
+  end
+
+  private
+    def mark_card_notifications_read
+      Current.user.notifications.unread.where(card: @card).read_all
+    end
+end
diff --git a/app/controllers/cards/recovers_controller.rb b/app/controllers/cards/recovers_controller.rb
new file mode 100644
index 000000000..b4614bc2a
--- /dev/null
+++ b/app/controllers/cards/recovers_controller.rb
@@ -0,0 +1,7 @@
+class Cards::RecoversController < ApplicationController
+  include CardScoped
+
+  def create
+    redirect_to @card.recover_abandoned_creation
+  end
+end
diff --git a/app/controllers/cards/stagings_controller.rb b/app/controllers/cards/stagings_controller.rb
new file mode 100644
index 000000000..af524fa52
--- /dev/null
+++ b/app/controllers/cards/stagings_controller.rb
@@ -0,0 +1,11 @@
+class Cards::StagingsController < ApplicationController
+  include CardScoped
+
+  def create
+    if params[:stage_id].present?
+      @card.toggle_stage Current.account.stages.find(params[:stage_id])
+    else
+      @card.update!(stage: nil)
+    end
+  end
+end
diff --git a/app/controllers/bubbles/taggings_controller.rb b/app/controllers/cards/taggings_controller.rb
similarity index 59%
rename from app/controllers/bubbles/taggings_controller.rb
rename to app/controllers/cards/taggings_controller.rb
index 156705a98..f75681c9d 100644
--- a/app/controllers/bubbles/taggings_controller.rb
+++ b/app/controllers/cards/taggings_controller.rb
@@ -1,12 +1,12 @@
-class Bubbles::TaggingsController < ApplicationController
-  include BubbleScoped
+class Cards::TaggingsController < ApplicationController
+  include CardScoped
 
   def new
     @tags = Current.account.tags.alphabetically
   end
 
   def create
-    @bubble.toggle_tag_with sanitized_tag_title_param
+    @card.toggle_tag_with sanitized_tag_title_param
   end
 
   private
diff --git a/app/controllers/cards/watches_controller.rb b/app/controllers/cards/watches_controller.rb
new file mode 100644
index 000000000..bd956a2d5
--- /dev/null
+++ b/app/controllers/cards/watches_controller.rb
@@ -0,0 +1,13 @@
+class Cards::WatchesController < ApplicationController
+  include CardScoped
+
+  def create
+    @card.watch_by Current.user
+    redirect_to card_watch_path(@card)
+  end
+
+  def destroy
+    @card.unwatch_by Current.user
+    redirect_to card_watch_path(@card)
+  end
+end
diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb
new file mode 100644
index 000000000..1485ad33f
--- /dev/null
+++ b/app/controllers/cards_controller.rb
@@ -0,0 +1,71 @@
+class CardsController < ApplicationController
+  include CollectionScoped
+
+  skip_before_action :set_collection, only: :index
+
+  before_action :set_filter, only: :index
+  before_action :set_card, only: %i[ show edit update destroy ]
+  before_action :handle_display_count, only: :index
+
+  DISPLAY_COUNT_OPTIONS = [ 6, 12, 18, 24 ].freeze
+  DEFAULT_DISPLAY_COUNT = 6
+  RECENTLY_CLOSED_LIMIT = 100
+
+  def index
+    @considering_cards = @filter.cards.considering.load_async
+    @doing_cards = @filter.cards.doing.load_async
+    @closed_cards = @filter.with(indexed_by: "closed").cards.recently_closed_first.limit(RECENTLY_CLOSED_LIMIT).load_async
+  end
+
+  def create
+    redirect_to @collection.cards.create!
+  end
+
+  def show
+  end
+
+  def edit
+  end
+
+  def destroy
+    @card.destroy!
+    redirect_to cards_path(collection_ids: [ @card.collection ]), notice: deleted_notice
+  end
+
+  def update
+    @card.update! card_params
+    redirect_to @card
+  end
+
+  private
+    DEFAULT_PARAMS = { indexed_by: "newest" }
+
+    def set_filter
+      @filter = Current.user.filters.from_params params.reverse_merge(**DEFAULT_PARAMS).permit(*Filter::PERMITTED_PARAMS)
+    end
+
+    def set_card
+      @card = @collection.cards.find params[:id]
+    end
+
+    def card_params
+      params.expect(card: [ :status, :title, :color, :due_on, :image, :draft_comment, tag_ids: [] ])
+    end
+
+    def deleted_notice
+      "Card deleted" unless @card.creating?
+    end
+
+    def handle_display_count
+      if params[:set_display_count].present?
+        cookies[:display_count] = params[:set_display_count]
+        redirect_to cards_path(
+          params.permit(*Filter::PERMITTED_PARAMS, :collection_ids).except(:set_display_count)
+        )
+      end
+    end
+
+    def display_count
+      (cookies[:display_count] || DEFAULT_DISPLAY_COUNT).to_i
+    end
+end
diff --git a/app/controllers/collections/involvements_controller.rb b/app/controllers/collections/involvements_controller.rb
new file mode 100644
index 000000000..69f7f2fbc
--- /dev/null
+++ b/app/controllers/collections/involvements_controller.rb
@@ -0,0 +1,7 @@
+class Collections::InvolvementsController < ApplicationController
+  include CollectionScoped
+
+  def update
+    @collection.access_for(Current.user).update!(involvement: params[:involvement])
+  end
+end
diff --git a/app/controllers/collections/workflows_controller.rb b/app/controllers/collections/workflows_controller.rb
new file mode 100644
index 000000000..963feb595
--- /dev/null
+++ b/app/controllers/collections/workflows_controller.rb
@@ -0,0 +1,16 @@
+class Collections::WorkflowsController < ApplicationController
+  include CollectionScoped
+
+  before_action :set_workflow
+
+  def update
+    @collection.update! workflow: @workflow
+
+    redirect_to cards_path(collection_ids: [ @collection ])
+  end
+
+  private
+    def set_workflow
+      @workflow = Current.account.workflows.find(params.expect(collection: [ :workflow_id ]).require(:workflow_id))
+    end
+end
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
new file mode 100644
index 000000000..3eb8cb507
--- /dev/null
+++ b/app/controllers/collections_controller.rb
@@ -0,0 +1,50 @@
+class CollectionsController < ApplicationController
+  before_action :set_collection, except: %i[ new create ]
+
+  def new
+    @collection = Current.account.collections.build
+  end
+
+  def create
+    @collection = Current.account.collections.create! collection_params
+    redirect_to cards_path(collection_ids: [ @collection ])
+  end
+
+  def edit
+    selected_user_ids = @collection.users.pluck :id
+    @selected_users, @unselected_users = User.active.alphabetically.partition { |user| selected_user_ids.include? user.id }
+  end
+
+  def update
+    @collection.update! collection_params
+    @collection.accesses.revise granted: grantees, revoked: revokees
+
+    redirect_to cards_path(collection_ids: [ @collection ])
+  end
+
+  def destroy
+    @collection.destroy
+    redirect_to root_path
+  end
+
+  private
+    def set_collection
+      @collection = Current.user.collections.find params[:id]
+    end
+
+    def collection_params
+      params.expect(collection: [ :name, :all_access ]).with_defaults(all_access: true)
+    end
+
+    def grantees
+      Current.account.users.active.where id: grantee_ids
+    end
+
+    def revokees
+      @collection.users.where.not id: grantee_ids
+    end
+
+    def grantee_ids
+      params.fetch :user_ids, []
+    end
+end
diff --git a/app/controllers/comments/reactions_controller.rb b/app/controllers/comments/reactions_controller.rb
index 36f51f6f6..17da85753 100644
--- a/app/controllers/comments/reactions_controller.rb
+++ b/app/controllers/comments/reactions_controller.rb
@@ -12,7 +12,7 @@ class Comments::ReactionsController < ApplicationController
     @reaction = @comment.reactions.create!(reaction_params)
 
     broadcast_create
-    redirect_to bucket_bubble_comment_reactions_url(@comment.bubble.bucket, @comment.bubble, @comment)
+    redirect_to collection_card_comment_reactions_url(@comment.card.collection, @comment.card, @comment)
   end
 
   def destroy
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 4708af0e1..6d9540662 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,10 +1,10 @@
 class CommentsController < ApplicationController
-  include BubbleScoped
+  include CardScoped
   before_action :set_comment, only: [ :show, :edit, :update, :destroy ]
   before_action :require_own_comment, only: [ :edit, :update, :destroy ]
 
   def create
-    @bubble.capture new_comment
+    @card.capture new_comment
   end
 
   def show
@@ -19,7 +19,7 @@ class CommentsController < ApplicationController
 
   def destroy
     @comment.destroy
-    redirect_to @bubble
+    redirect_to @card
   end
 
   private
@@ -33,7 +33,7 @@ class CommentsController < ApplicationController
 
     def set_comment
       @comment = Comment.joins(:message)
-                        .where(messages: { bubble_id: @bubble.id })
+                        .where(messages: { card_id: @card.id })
                         .find(params[:id])
     end
 
diff --git a/app/controllers/concerns/bubble_scoped.rb b/app/controllers/concerns/bubble_scoped.rb
deleted file mode 100644
index a3783d9c5..000000000
--- a/app/controllers/concerns/bubble_scoped.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module BubbleScoped
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_bubble, :set_bucket
-  end
-
-  private
-    def set_bubble
-      @bubble = Current.user.accessible_bubbles.find(params[:bubble_id])
-    end
-
-    def set_bucket
-      @bucket = Current.user.buckets.find(@bubble.bucket_id)
-    end
-end
diff --git a/app/controllers/concerns/bucket_filterable.rb b/app/controllers/concerns/bucket_filterable.rb
deleted file mode 100644
index 0205a456b..000000000
--- a/app/controllers/concerns/bucket_filterable.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module BucketFilterable
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_bucket_filter
-  end
-
-  private
-    def set_bucket_filter
-      params[:bucket_ids] ||= cookies[:bucket_filter]&.split(",") unless params[:clear_filter]
-    end
-
-    def bucket_filter
-      params[:bucket_ids].presence || Current.user.bucket_ids
-    end
-
-    def update_bucket_filter
-      if params[:clear_filter]
-        cookies.delete(:bucket_filter)
-      elsif params[:bucket_ids].present?
-        cookies[:bucket_filter] = params[:bucket_ids].join(",")
-      end
-    end
-end
diff --git a/app/controllers/concerns/bucket_scoped.rb b/app/controllers/concerns/bucket_scoped.rb
deleted file mode 100644
index c0dd1176f..000000000
--- a/app/controllers/concerns/bucket_scoped.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module BucketScoped
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_bucket
-  end
-
-  private
-    def set_bucket
-      @bucket = Current.user.buckets.find(params[:bucket_id])
-    end
-end
diff --git a/app/controllers/concerns/card_scoped.rb b/app/controllers/concerns/card_scoped.rb
new file mode 100644
index 000000000..e85291b57
--- /dev/null
+++ b/app/controllers/concerns/card_scoped.rb
@@ -0,0 +1,16 @@
+module CardScoped
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_card, :set_collection
+  end
+
+  private
+    def set_card
+      @card = Current.user.accessible_cards.find(params[:card_id])
+    end
+
+    def set_collection
+      @collection = Current.user.collections.find(@card.collection_id)
+    end
+end
diff --git a/app/controllers/concerns/collection_filterable.rb b/app/controllers/concerns/collection_filterable.rb
new file mode 100644
index 000000000..4bd5ff9f1
--- /dev/null
+++ b/app/controllers/concerns/collection_filterable.rb
@@ -0,0 +1,24 @@
+module CollectionFilterable
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_collection_filter
+  end
+
+  private
+    def set_collection_filter
+      params[:collection_ids] ||= cookies[:collection_filter]&.split(",") unless params[:clear_filter]
+    end
+
+    def collection_filter
+      params[:collection_ids].presence || Current.user.collection_ids
+    end
+
+    def update_collection_filter
+      if params[:clear_filter]
+        cookies.delete(:collection_filter)
+      elsif params[:collection_ids].present?
+        cookies[:collection_filter] = params[:collection_ids].join(",")
+      end
+    end
+end
diff --git a/app/controllers/concerns/collection_scoped.rb b/app/controllers/concerns/collection_scoped.rb
new file mode 100644
index 000000000..2ddde9531
--- /dev/null
+++ b/app/controllers/concerns/collection_scoped.rb
@@ -0,0 +1,12 @@
+module CollectionScoped
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_collection
+  end
+
+  private
+    def set_collection
+      @collection = Current.user.collections.find(params[:collection_id])
+    end
+end
diff --git a/app/controllers/concerns/events_timeline.rb b/app/controllers/concerns/events_timeline.rb
index 7b4e98e2e..d71928b4d 100644
--- a/app/controllers/concerns/events_timeline.rb
+++ b/app/controllers/concerns/events_timeline.rb
@@ -1,7 +1,7 @@
 module EventsTimeline
   extend ActiveSupport::Concern
 
-  include BucketFilterable
+  include CollectionFilterable
 
   included do
     before_action :set_activity_day
@@ -23,7 +23,7 @@ module EventsTimeline
         group_by { |event| [ event.created_at.hour, helpers.event_column(event) ] }.
         map { |hour_col, events|
           [ hour_col,
-            events.uniq { |e| e.action == "boosted" ? [ e.creator_id, e.bubble_id ] : e.id }
+            events.uniq { |e| e.action == "boosted" ? [ e.creator_id, e.card_id ] : e.id }
           ]
         }
     end
@@ -33,12 +33,12 @@ module EventsTimeline
     end
 
     def user_events
-      Event.where(bubble: user_bubbles, creator: Current.account.users)
+      Event.where(card: user_cards, creator: Current.account.users)
     end
 
-    def user_bubbles
-      Current.user.accessible_bubbles
+    def user_cards
+      Current.user.accessible_cards
             .published_or_drafted_by(Current.user)
-            .where(bucket_id: bucket_filter)
+            .where(collection_id: collection_filter)
     end
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index ba6df4e27..a3c8a9157 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -2,9 +2,9 @@ class EventsController < ApplicationController
   include EventsTimeline
 
   def index
-    update_bucket_filter
+    update_collection_filter
 
-    @buckets = Current.user.buckets.alphabetically
+    @collections = Current.user.collections.alphabetically
     @filters = Current.user.filters.all
 
     @events = events_for_activity_day
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index c0523fa0d..6c840952a 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -3,7 +3,7 @@ class FiltersController < ApplicationController
 
   def create
     @filter = Current.user.filters.remember filter_params
-    redirect_to bubbles_path(@filter.as_params)
+    redirect_to cards_path(@filter.as_params)
   end
 
   def destroy
@@ -24,7 +24,7 @@ class FiltersController < ApplicationController
       if request.referer == root_url
         redirect_to root_path
       else
-        redirect_to bubbles_path(@filter.as_params)
+        redirect_to cards_path(@filter.as_params)
       end
     end
 end
diff --git a/app/controllers/my/pins_controller.rb b/app/controllers/my/pins_controller.rb
index c7f222d33..f361b6af7 100644
--- a/app/controllers/my/pins_controller.rb
+++ b/app/controllers/my/pins_controller.rb
@@ -1,5 +1,5 @@
 class My::PinsController < ApplicationController
   def index
-    @pins = Current.user.pins.includes(:bubble).ordered.limit(20)
+    @pins = Current.user.pins.includes(:card).ordered.limit(20)
   end
 end
diff --git a/app/controllers/notifications/settings_controller.rb b/app/controllers/notifications/settings_controller.rb
index ebffcbf58..a94345746 100644
--- a/app/controllers/notifications/settings_controller.rb
+++ b/app/controllers/notifications/settings_controller.rb
@@ -1,7 +1,7 @@
 module Notifications
   class SettingsController < ApplicationController
     def show
-      @buckets = Current.user.buckets.alphabetically
+      @collections = Current.user.collections.alphabetically
     end
   end
 end
diff --git a/app/controllers/terminals_controller.rb b/app/controllers/terminals_controller.rb
index b4fe28411..d05a339bc 100644
--- a/app/controllers/terminals_controller.rb
+++ b/app/controllers/terminals_controller.rb
@@ -1,6 +1,6 @@
 class TerminalsController < ApplicationController
   def show
-    @events = Event.where(bubble: user_bubbles, creator: Current.user).chronologically.reverse_order.limit(20)
+    @events = Event.where(card: user_cards, creator: Current.user).chronologically.reverse_order.limit(20)
   end
 
   def edit
@@ -8,7 +8,7 @@ class TerminalsController < ApplicationController
   end
 
   private
-    def user_bubbles
-      Current.user.accessible_bubbles
+    def user_cards
+      Current.user.accessible_cards
     end
 end
diff --git a/app/helpers/accesses_helper.rb b/app/helpers/accesses_helper.rb
index 58c23e72a..a139ac3d4 100644
--- a/app/helpers/accesses_helper.rb
+++ b/app/helpers/accesses_helper.rb
@@ -1,29 +1,29 @@
 module AccessesHelper
-  def access_menu_tag(bucket, &)
-    tag.menu class: [ "flex flex-column gap margin-none pad txt-medium", { "toggler--toggled": bucket.all_access? } ], data: {
+  def access_menu_tag(collection, &)
+    tag.menu class: [ "flex flex-column gap margin-none pad txt-medium", { "toggler--toggled": collection.all_access? } ], data: {
       controller: "filter toggle-class",
       filter_active_class: "filter--active", filter_selected_class: "selected",
       toggle_class_toggle_class: "toggler--toggled" }, &
   end
 
   def access_toggles_for(users, selected:)
-    render partial: "buckets/access_toggle",
+    render partial: "collections/access_toggle",
       collection: users, as: :user,
       locals: { selected: selected },
       cached: ->(user) { [ user, selected ] }
   end
 
-  def access_involvement_advance_button(bucket, user)
-    access = bucket.access_for(user)
+  def access_involvement_advance_button(collection, user)
+    access = collection.access_for(user)
 
-    turbo_frame_tag dom_id(bucket, :involvement_button) do
-      button_to bucket_involvement_path(bucket), method: :put,
-          aria: { labelledby: dom_id(bucket, :involvement_label) },
+    turbo_frame_tag dom_id(collection, :involvement_button) do
+      button_to collection_involvement_path(collection), method: :put,
+          aria: { labelledby: dom_id(collection, :involvement_label) },
           class: [ "btn", { "btn--reversed": access.involvement == "watching" || access.involvement == "everything" } ],
           params: { involvement: next_involvement(access.involvement) },
-          title: involvement_access_label(bucket, access.involvement) do
+          title: involvement_access_label(collection, access.involvement) do
         icon_tag("notification-bell-#{access.involvement.dasherize}") +
-          tag.span(involvement_access_label(bucket, access.involvement), class: "for-screen-reader", id: dom_id(bucket, :involvement_label))
+          tag.span(involvement_access_label(collection, access.involvement), class: "for-screen-reader", id: dom_id(collection, :involvement_label))
       end
     end
   end
@@ -34,14 +34,14 @@ module AccessesHelper
       order[(order.index(involvement.to_s) + 1) % order.size]
     end
 
-    def involvement_access_label(bucket, involvement)
+    def involvement_access_label(collection, involvement)
       case involvement
       when "access_only"
-        "Notifications are off for #{bucket.name}"
+        "Notifications are off for #{collection.name}"
       when "everything"
-        "Notifying me about everything in #{bucket.name}"
+        "Notifying me about everything in #{collection.name}"
       when "watching"
-        "Notifying me only about @mentions and new items in #{bucket.name}"
+        "Notifying me only about @mentions and new items in #{collection.name}"
       end
     end
 end
diff --git a/app/helpers/bubbles_helper.rb b/app/helpers/bubbles_helper.rb
deleted file mode 100644
index 22f319362..000000000
--- a/app/helpers/bubbles_helper.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module BubblesHelper
-  BUBBLE_ROTATION = %w[ 75 60 45 35 25 5 ]
-
-  def bubble_title(bubble)
-    bubble.title.presence || "Untitled"
-  end
-
-  def bubble_rotation(bubble)
-    value = BUBBLE_ROTATION[Zlib.crc32(bubble.to_param) % BUBBLE_ROTATION.size]
-
-    "--bubble-rotate: #{value}deg;"
-  end
-
-  def display_count_options
-    BubblesController::DISPLAY_COUNT_OPTIONS.map do |count|
-      {
-        value: count,
-        label: count,
-        selected: @display_count == count,
-        id: "display-count-#{count}"
-      }
-    end
-  end
-end
diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
new file mode 100644
index 000000000..c340f2827
--- /dev/null
+++ b/app/helpers/cards_helper.rb
@@ -0,0 +1,24 @@
+module CardsHelper
+  CARD_ROTATION = %w[ 75 60 45 35 25 5 ]
+
+  def card_title(card)
+    card.title.presence || "Untitled"
+  end
+
+  def card_rotation(card)
+    value = CARD_ROTATION[Zlib.crc32(card.to_param) % CARD_ROTATION.size]
+
+    "--card-rotate: #{value}deg;"
+  end
+
+  def display_count_options
+    CardsController::DISPLAY_COUNT_OPTIONS.map do |count|
+      {
+        value: count,
+        label: count,
+        selected: @display_count == count,
+        id: "display-count-#{count}"
+      }
+    end
+  end
+end
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 4bb8be39f..77847b53b 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -4,8 +4,8 @@ module CommentsHelper
       data: { creator_id: comment.creator_id, created_by_current_user_target: "creation" }, &
   end
 
-  def new_comment_placeholder(bubble)
-    if bubble.creator == Current.user && bubble.messages.comments.empty?
+  def new_comment_placeholder(card)
+    if card.creator == Current.user && card.messages.comments.empty?
       "Next, add some notes, context, pictures, or video about this…"
     else
       "Type your comment…"
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 613c7fe36..e8afb6f4e 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -12,7 +12,7 @@ module EventsHelper
 
   def event_column(event)
     case event.action
-    when "popped"
+    when "closed"
       3
     when "published"
       1
@@ -45,15 +45,15 @@ module EventsHelper
     start_time = day.beginning_of_day
     end_time = day.end_of_day
 
-    accessible_events = Event.joins(bubble: :bucket)
-      .merge(Current.user.buckets)
+    accessible_events = Event.joins(card: :collection)
+      .merge(Current.user.collections)
       .where(created_at: start_time..end_time)
-      .where(bubbles: { bucket_id: params[:bucket_ids].presence || Current.user.bucket_ids })
+      .where(cards: { collection_id: params[:collection_ids].presence || Current.user.collection_ids })
 
     headers = {
       "Added" => accessible_events.where(action: "published").count,
       "Updated" => nil,
-      "Closed" => accessible_events.where(action: "popped").count
+      "Closed" => accessible_events.where(action: "closed").count
     }
 
     headers.map do |header, count|
@@ -66,32 +66,32 @@ module EventsHelper
     case event.action
     when "assigned"
       if event.assignees.include?(Current.user)
-        "#{ event.creator == Current.user ? "You" : event.creator.name } will handle <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+        "#{ event.creator == Current.user ? "You" : event.creator.name } will handle <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
       else
-        "#{ event.creator == Current.user ? "You" : event.creator.name } assigned #{ event.assignees.pluck(:name).to_sentence } to <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+        "#{ event.creator == Current.user ? "You" : event.creator.name } assigned #{ event.assignees.pluck(:name).to_sentence } to <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
       end
     when "unassigned"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.pluck(:name).to_sentence } from <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.pluck(:name).to_sentence } from <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
     when "boosted"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } boosted <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } boosted <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
     when "commented"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } commented on <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
     when "published"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } added <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
-    when "popped"
-      "#{ event.creator == Current.user ? "You" : event.creator.name } closed <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+      "#{ event.creator == Current.user ? "You" : event.creator.name } added <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
+    when "closed"
+      "#{ event.creator == Current.user ? "You" : event.creator.name } closed <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
     when "staged"
-      "#{event.creator == Current.user ? "You" : event.creator.name} changed the stage to #{event.stage_name} on <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} changed the stage to #{event.stage_name} on <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
     when "unstaged"
-      "#{event.creator == Current.user ? "You" : event.creator.name} removed <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span> from the #{event.stage_name} stage".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} removed <span style='color: var(--card-color)'>#{ card_title(event.card) }</span> from the #{event.stage_name} stage".html_safe
     when "due_date_added"
-      "#{event.creator == Current.user ? "You" : event.creator.name} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
     when "due_date_changed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} changed the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>".html_safe
     when "due_date_removed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} removed the date on <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span>"
+      "#{event.creator == Current.user ? "You" : event.creator.name} removed the date on <span style='color: var(--card-color)'>#{ card_title(event.card) }</span>"
     when "title_changed"
-      "#{event.creator == Current.user ? "You" : event.creator.name} renamed  on <span style='color: var(--bubble-color)'>#{ bubble_title(event.bubble) }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
+      "#{event.creator == Current.user ? "You" : event.creator.name} renamed  on <span style='color: var(--card-color)'>#{ card_title(event.card) }</span> (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe
     end
   end
 
diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 1693e77a1..c2c1d0dc5 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -1,16 +1,16 @@
 module FiltersHelper
   def filter_title(filter)
-    if filter.buckets.none?
+    if filter.collections.none?
       "All collections"
-    elsif filter.buckets.one?
-      filter.buckets.first.name
+    elsif filter.collections.one?
+      filter.collections.first.name
     else
-      filter.buckets.map(&:name).to_sentence
+      filter.collections.map(&:name).to_sentence
     end
   end
 
   def filter_chip_tag(text, params)
-    link_to bubbles_path(params), class: "btn txt-small btn--remove fill-selected" do
+    link_to cards_path(params), class: "btn txt-small btn--remove fill-selected" do
       concat tag.span(text)
       concat icon_tag("close")
     end
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
index d76a46867..a8a7544ac 100644
--- a/app/helpers/messages_helper.rb
+++ b/app/helpers/messages_helper.rb
@@ -1,8 +1,8 @@
 module MessagesHelper
-  def messages_tag(bubble, &)
-    turbo_frame_tag dom_id(bubble, :messages),
+  def messages_tag(card, &)
+    turbo_frame_tag dom_id(card, :messages),
       class: "comments gap center",
-      style: "--bubble-color: <%= bubble.color %>",
+      style: "--card-color: <%= card.color %>",
       role: "group", aria: { label: "Messages" },
       data: {
         controller: "created-by-current-user",
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index fd2b101db..3c5e0d680 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,6 +1,6 @@
 module NotificationsHelper
   def notification_title(notification)
-    title = bubble_title(notification.bubble)
+    title = card_title(notification.card)
 
     if notification.resource.is_a? Comment
       "RE: " + title
@@ -15,7 +15,7 @@ module NotificationsHelper
     name = notification.creator.name
 
     case notification_event_action(notification)
-    when "popped" then "Popped by #{name}"
+    when "closed" then "Closed by #{name}"
     when "published" then "Added by #{name}"
     else name
     end
@@ -59,6 +59,6 @@ module NotificationsHelper
     end
 
     def notification_is_for_initial_assignement?(notification)
-      notification.event.action == "published" && notification.bubble.assigned_to?(notification.user)
+      notification.event.action == "published" && notification.card.assigned_to?(notification.user)
     end
 end
diff --git a/app/helpers/translations_helper.rb b/app/helpers/translations_helper.rb
index 5f6ae4223..f50a397e2 100644
--- a/app/helpers/translations_helper.rb
+++ b/app/helpers/translations_helper.rb
@@ -3,7 +3,7 @@ module TranslationsHelper
     user_name: { "🇺🇸": "Enter your name", "🇪🇸": "Introduce tu nombre", "🇫🇷": "Entrez votre nom", "🇮🇳": "अपना नाम दर्ज करें", "🇩🇪": "Geben Sie Ihren Namen ein", "🇧🇷": "Insira seu nome" },
     email_address:  { "🇺🇸": "Enter your email address", "🇪🇸": "Introduce tu correo electrónico", "🇫🇷": "Entrez votre adresse courriel", "🇮🇳": "अपना ईमेल पता दर्ज करें", "🇩🇪": "Geben Sie Ihre E-Mail-Adresse ein", "🇧🇷": "Insira seu endereço de email" },
     password: { "🇺🇸": "Enter your password", "🇪🇸": "Introduce tu contraseña", "🇫🇷": "Saisissez votre mot de passe", "🇮🇳": "अपना पासवर्ड दर्ज करें", "🇩🇪": "Geben Sie Ihr Passwort ein", "🇧🇷": "Insira sua senha" },
-    bucket_name: { "🇺🇸": "Give it a name", "🇪🇸": "Dale un nombre", "🇫🇷": "Donnez lui un nom", "🇮🇳": "इसे एक नाम दें", "🇩🇪": "Gib ihm einen Namen", "🇧🇷": "Dê-lhe um nome" }
+    collection_name: { "🇺🇸": "Give it a name", "🇪🇸": "Dale un nombre", "🇫🇷": "Donnez lui un nom", "🇮🇳": "इसे एक नाम दें", "🇩🇪": "Gib ihm einen Namen", "🇧🇷": "Dê-lhe um nome" }
   }
 
   def translations_for(translation_key)
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index f78241aa9..32fd5e68a 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -1,7 +1,7 @@
 module WorkflowsHelper
-  def button_to_set_stage(bubble, stage)
-    button_to bubble_stagings_path(bubble, stage_id: stage),
-        method: :post, class: [ "btn full-width justify-start workflow-stage txt-uppercase", { "workflow-stage--current": stage == bubble.stage } ],
+  def button_to_set_stage(card, stage)
+    button_to card_stagings_path(card, stage_id: stage),
+        method: :post, class: [ "btn full-width justify-start workflow-stage txt-uppercase", { "workflow-stage--current": stage == card.stage } ],
         form_class: "flex align-center gap-half",
         data: { turbo_frame: "_top" } do
       tag.span class: "overflow-ellipsis" do
diff --git a/app/javascript/controllers/bubble_size_controller.js b/app/javascript/controllers/card_size_controller.js
similarity index 69%
rename from app/javascript/controllers/bubble_size_controller.js
rename to app/javascript/controllers/card_size_controller.js
index 912e19d66..b673e910d 100644
--- a/app/javascript/controllers/bubble_size_controller.js
+++ b/app/javascript/controllers/card_size_controller.js
@@ -3,7 +3,7 @@ import { Controller } from "@hotwired/stimulus"
 const SIZES = [ "one", "two", "three", "four", "five" ]
 
 export default class extends Controller {
-  static targets = [ "bubble" ]
+  static targets = [ "card" ]
 
   connect() {
     this.resize()
@@ -12,19 +12,19 @@ export default class extends Controller {
   resize() {
     const [ min, max ] = this.#getScoreRange()
 
-    this.bubbleTargets.forEach(bubble => {
-      const score = this.#currentBubbleScore(bubble)
+    this.cardTargets.forEach(card => {
+      const score = this.#currentBubbleScore(card)
       const idx = Math.round((score - min) / (max - min) * (SIZES.length - 1))
 
-      bubble.style.setProperty("--bubble-size", `var(--bubble-size-${SIZES[idx]})`)
+      card.style.setProperty("--card-size", `var(--card-size-${SIZES[idx]})`)
     })
   }
 
   #getScoreRange() {
     var min = 0, max = 1;
 
-    this.bubbleTargets.forEach(bubble => {
-      const score = this.#currentBubbleScore(bubble)
+    this.cardTargets.forEach(card => {
+      const score = this.#currentBubbleScore(card)
 
       min = Math.min(min, score)
       max = Math.max(max, score)
diff --git a/app/javascript/controllers/popover_controller.js b/app/javascript/controllers/closureover_controller.js
similarity index 100%
rename from app/javascript/controllers/popover_controller.js
rename to app/javascript/controllers/closureover_controller.js
diff --git a/app/javascript/controllers/local_save_controller.js b/app/javascript/controllers/local_save_controller.js
index 5d9b89a72..c0c5892aa 100644
--- a/app/javascript/controllers/local_save_controller.js
+++ b/app/javascript/controllers/local_save_controller.js
@@ -47,7 +47,7 @@ export default class extends Controller {
   #triggerChangeEvent(newValue) {
     if (this.inputTarget.tagName === "HOUSE-MD") {
       this.inputTarget.dispatchEvent(new CustomEvent('house-md:change', {
-        bubbles: true,
+        cards: true,
         detail: {
           previousContent: '',
           newContent: newValue
diff --git a/app/javascript/controllers/paste_controller.js b/app/javascript/controllers/paste_controller.js
index 79db7d7db..41fc77d2c 100644
--- a/app/javascript/controllers/paste_controller.js
+++ b/app/javascript/controllers/paste_controller.js
@@ -12,7 +12,7 @@ export default class extends Controller {
 
     for (const file of files) {
       const uploadEvent = new CustomEvent("house-md:before-upload", { 
-        bubbles: true, 
+        cards: true, 
         detail: { file },
         cancelable: true 
       })
diff --git a/app/jobs/bubble/auto_pop_all_due_job.rb b/app/jobs/card/auto_closure_all_due_job.rb
similarity index 57%
rename from app/jobs/bubble/auto_pop_all_due_job.rb
rename to app/jobs/card/auto_closure_all_due_job.rb
index 845c0889e..0bf063c2b 100644
--- a/app/jobs/bubble/auto_pop_all_due_job.rb
+++ b/app/jobs/card/auto_closure_all_due_job.rb
@@ -1,9 +1,9 @@
-class Bubble::AutoPopAllDueJob < ApplicationJob
+class Card::AutoPopAllDueJob < ApplicationJob
   queue_as :default
 
   def perform
     ApplicationRecord.with_each_tenant do |tenant|
-      Bubble.auto_pop_all_due
+      Card.auto_closure_all_due
     end
   end
 end
diff --git a/app/jobs/bubble/auto_reconsider_all_stagnated_job.rb b/app/jobs/card/auto_reconsider_all_stagnated_job.rb
similarity index 50%
rename from app/jobs/bubble/auto_reconsider_all_stagnated_job.rb
rename to app/jobs/card/auto_reconsider_all_stagnated_job.rb
index 1b08f4371..83f87a648 100644
--- a/app/jobs/bubble/auto_reconsider_all_stagnated_job.rb
+++ b/app/jobs/card/auto_reconsider_all_stagnated_job.rb
@@ -1,9 +1,9 @@
-class Bubble::AutoReconsiderAllStagnatedJob < ApplicationJob
+class Card::AutoReconsiderAllStagnatedJob < ApplicationJob
   queue_as :default
 
   def perform
     ApplicationRecord.with_each_tenant do |tenant|
-      Bubble.auto_reconsider_all_stagnated
+      Card.auto_reconsider_all_stagnated
     end
   end
 end
diff --git a/app/jobs/remove_abandoned_creations_job.rb b/app/jobs/remove_abandoned_creations_job.rb
index 9381927aa..1444313a2 100644
--- a/app/jobs/remove_abandoned_creations_job.rb
+++ b/app/jobs/remove_abandoned_creations_job.rb
@@ -3,7 +3,7 @@ class RemoveAbandonedCreationsJob < ApplicationJob
 
   def perform
     ApplicationRecord.with_each_tenant do |tenant|
-      Bubble.remove_abandoned_creations
+      Card.remove_abandoned_creations
     end
   end
 end
diff --git a/app/models/access.rb b/app/models/access.rb
index 1ca40d9e2..509067f0c 100644
--- a/app/models/access.rb
+++ b/app/models/access.rb
@@ -1,5 +1,5 @@
 class Access < ApplicationRecord
-  belongs_to :bucket
+  belongs_to :collection
   belongs_to :user
 
   enum :involvement, %i[ access_only watching everything ].index_by(&:itself)
diff --git a/app/models/account.rb b/app/models/account.rb
index a2b3c7e34..10ba9f773 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,8 +1,8 @@
 class Account < ApplicationRecord
-  include PopReasons, Joinable
+  include ClosureReasons, Joinable
 
-  has_many :buckets, dependent: :destroy
-  has_many :bubbles, through: :buckets
+  has_many :collections, dependent: :destroy
+  has_many :cards, through: :collections
 
   has_many :users, dependent: :destroy do
     def system
diff --git a/app/models/account/pop_reasons.rb b/app/models/account/closure_reasons.rb
similarity index 58%
rename from app/models/account/pop_reasons.rb
rename to app/models/account/closure_reasons.rb
index 63ce1584e..e5bdf25a1 100644
--- a/app/models/account/pop_reasons.rb
+++ b/app/models/account/closure_reasons.rb
@@ -1,4 +1,4 @@
-module Account::PopReasons
+module Account::ClosureReasons
   extend ActiveSupport::Concern
 
   DEFAULT_LABELS = [
@@ -11,19 +11,19 @@ module Account::PopReasons
   FALLBACK_LABEL = "Done"
 
   included do
-    has_many :pop_reasons, dependent: :destroy, class_name: "Pop::Reason" do
+    has_many :closure_reasons, dependent: :destroy, class_name: "Closure::Reason" do
       def labels
         pluck(:label).presence || [ FALLBACK_LABEL ]
       end
     end
 
-    after_create :create_default_pop_reasons
+    after_create :create_default_closure_reasons
   end
 
   private
-    def create_default_pop_reasons
+    def create_default_closure_reasons
       DEFAULT_LABELS.each do |label|
-        pop_reasons.create! label: label
+        closure_reasons.create! label: label
       end
     end
 end
diff --git a/app/models/assignment.rb b/app/models/assignment.rb
index 7233030b3..312bc3bf7 100644
--- a/app/models/assignment.rb
+++ b/app/models/assignment.rb
@@ -1,5 +1,5 @@
 class Assignment < ApplicationRecord
-  belongs_to :bubble, touch: true
+  belongs_to :card, touch: true
 
   belongs_to :assignee, class_name: "User"
   belongs_to :assigner, class_name: "User"
diff --git a/app/models/bubble/engagement.rb b/app/models/bubble/engagement.rb
deleted file mode 100644
index 0458f9ec2..000000000
--- a/app/models/bubble/engagement.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Bubble::Engagement < ApplicationRecord
-  belongs_to :bubble, class_name: "::Bubble", touch: true
-end
diff --git a/app/models/bubble/poppable.rb b/app/models/bubble/poppable.rb
deleted file mode 100644
index 098bda924..000000000
--- a/app/models/bubble/poppable.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-module Bubble::Poppable
-  extend ActiveSupport::Concern
-
-  AUTO_POP_AFTER = 30.days
-
-  included do
-    has_one :pop, dependent: :destroy
-
-    scope :popped, -> { joins(:pop) }
-    scope :active, -> { where.missing(:pop) }
-
-    scope :recently_popped_first, -> { popped.order("pops.created_at": :desc) }
-    scope :due_to_be_popped, -> { considering.where(last_active_at: ..AUTO_POP_AFTER.ago) }
-  end
-
-  class_methods do
-    def auto_pop_all_due
-      due_to_be_popped.find_each do |bubble|
-        bubble.pop!(user: bubble.bucket.account.users.system, reason: "Closed")
-      end
-    end
-  end
-
-  def auto_pop_at
-    last_active_at + AUTO_POP_AFTER if last_active_at
-  end
-
-  def popped?
-    pop.present?
-  end
-
-  def active?
-    !popped?
-  end
-
-  def popped_by
-    pop&.user
-  end
-
-  def popped_at
-    pop&.created_at
-  end
-
-  def pop!(user: Current.user, reason: Account::PopReasons::FALLBACK_LABEL)
-    unless popped?
-      transaction do
-        create_pop! user: user, reason: reason
-        track_event :popped, creator: user
-      end
-    end
-  end
-
-  def unpop
-    pop&.destroy
-  end
-end
diff --git a/app/models/bucket.rb b/app/models/bucket.rb
deleted file mode 100644
index ce6ec4154..000000000
--- a/app/models/bucket.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class Bucket < ApplicationRecord
-  include Accessible, Broadcastable, Filterable
-
-  belongs_to :account
-  belongs_to :creator, class_name: "User", default: -> { Current.user }
-  belongs_to :workflow, optional: true
-
-  has_many :bubbles, dependent: :destroy
-  has_many :tags, -> { distinct }, through: :bubbles
-
-  validates_presence_of :name
-
-  after_save :update_bubbles_workflow, if: :saved_change_to_workflow_id?
-
-  scope :alphabetically, -> { order("lower(name)") }
-
-  private
-    def update_bubbles_workflow
-      bubbles.update_all(stage_id: workflow&.stages&.first&.id)
-    end
-end
diff --git a/app/models/bucket/broadcastable.rb b/app/models/bucket/broadcastable.rb
deleted file mode 100644
index 5406c23ef..000000000
--- a/app/models/bucket/broadcastable.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Bucket::Broadcastable
-  extend ActiveSupport::Concern
-
-  included do
-    broadcasts_refreshes
-    broadcasts_refreshes_to ->(bucket) { [ bucket.account, :buckets ] }
-  end
-end
diff --git a/app/models/bubble.rb b/app/models/card.rb
similarity index 81%
rename from app/models/bubble.rb
rename to app/models/card.rb
index cda9f2cc0..50f2f541b 100644
--- a/app/models/bubble.rb
+++ b/app/models/card.rb
@@ -1,8 +1,8 @@
-class Bubble < ApplicationRecord
+class Card < ApplicationRecord
   include Assignable, Boostable, Colored, Commentable, Engageable, Eventable,
-    Messages, Notifiable, Pinnable, Poppable, Scorable, Searchable, Staged, Statuses, Taggable, Watchable
+    Messages, Notifiable, Pinnable, Closeable, Scorable, Searchable, Staged, Statuses, Taggable, Watchable
 
-  belongs_to :bucket, touch: true
+  belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
   has_many :notifications, dependent: :destroy
@@ -15,7 +15,7 @@ class Bubble < ApplicationRecord
 
   scope :reverse_chronologically, -> { order created_at: :desc, id: :desc }
   scope :chronologically, -> { order created_at: :asc, id: :asc }
-  scope :in_bucket, ->(bucket) { where bucket: bucket }
+  scope :in_collection, ->(collection) { where collection: collection }
 
   scope :indexed_by, ->(index) do
     case index
@@ -25,12 +25,12 @@ class Bubble < ApplicationRecord
     when "newest"         then reverse_chronologically
     when "oldest"         then chronologically
     when "stalled"        then ordered_by_staleness
-    when "popped"         then popped
+    when "closed"         then closed
     end
   end
 
   def cache_key
-    [ super, bucket&.name ].compact.join("/")
+    [ super, collection&.name ].compact.join("/")
   end
 
   private
@@ -56,7 +56,7 @@ class Bubble < ApplicationRecord
     end
 
     def assign_initial_stage
-      if workflow_stage = bucket.workflow&.stages&.first
+      if workflow_stage = collection.workflow&.stages&.first
         self.stage = workflow_stage
         save! touch: false
         track_event :staged, stage_id: workflow_stage.id, stage_name: workflow_stage.name
diff --git a/app/models/bubble/assignable.rb b/app/models/card/assignable.rb
similarity index 97%
rename from app/models/bubble/assignable.rb
rename to app/models/card/assignable.rb
index c0dd36ff4..7ef0eb134 100644
--- a/app/models/bubble/assignable.rb
+++ b/app/models/card/assignable.rb
@@ -1,4 +1,4 @@
-module Bubble::Assignable
+module Card::Assignable
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/models/bubble/boostable.rb b/app/models/card/boostable.rb
similarity index 92%
rename from app/models/bubble/boostable.rb
rename to app/models/card/boostable.rb
index 94a530e8e..9e7c404c8 100644
--- a/app/models/bubble/boostable.rb
+++ b/app/models/card/boostable.rb
@@ -1,4 +1,4 @@
-module Bubble::Boostable
+module Card::Boostable
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
new file mode 100644
index 000000000..e82df5a60
--- /dev/null
+++ b/app/models/card/closeable.rb
@@ -0,0 +1,56 @@
+module Card::Closeable
+  extend ActiveSupport::Concern
+
+  AUTO_CLOSURE_AFTER = 30.days
+
+  included do
+    has_one :closure, dependent: :destroy
+
+    scope :closed, -> { joins(:closure) }
+    scope :active, -> { where.missing(:closure) }
+
+    scope :recently_closed_first, -> { closed.order("closures.created_at": :desc) }
+    scope :due_to_be_closed, -> { considering.where(last_active_at: ..AUTO_CLOSURE_AFTER.ago) }
+  end
+
+  class_methods do
+    def auto_closure_all_due
+      due_to_be_closed.find_each do |card|
+        card.closure!(user: card.collection.account.users.system, reason: "Closed")
+      end
+    end
+  end
+
+  def auto_closure_at
+    last_active_at + AUTO_CLOSURE_AFTER if last_active_at
+  end
+
+  def closed?
+    closure.present?
+  end
+
+  def active?
+    !closed?
+  end
+
+  def closed_by
+    closure&.user
+  end
+
+  def closed_at
+    closure&.created_at
+  end
+
+  def closure!(user: Current.user, reason: Account::ClosureReasons::FALLBACK_LABEL)
+    unless closed?
+      transaction do
+        create_closure! user: user, reason: reason
+        track_event :closed, creator: user
+      end
+    end
+  end
+
+  def unpop
+    closure&.destroy
+  end
+end
diff --git a/app/models/bubble/colored.rb b/app/models/card/colored.rb
similarity index 87%
rename from app/models/bubble/colored.rb
rename to app/models/card/colored.rb
index 33939840b..7d4ae9c54 100644
--- a/app/models/bubble/colored.rb
+++ b/app/models/card/colored.rb
@@ -1,4 +1,4 @@
-module Bubble::Colored
+module Card::Colored
   extend ActiveSupport::Concern
 
   COLORS = %w[ #b7462b #ff63a8 #eb7a32 #6ac967 #2c6da8 #663251  ]
diff --git a/app/models/bubble/commentable.rb b/app/models/card/commentable.rb
similarity index 93%
rename from app/models/bubble/commentable.rb
rename to app/models/card/commentable.rb
index ab1c72a74..d0308069f 100644
--- a/app/models/bubble/commentable.rb
+++ b/app/models/card/commentable.rb
@@ -1,4 +1,4 @@
-module Bubble::Commentable
+module Card::Commentable
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/models/bubble/engageable.rb b/app/models/card/engageable.rb
similarity index 82%
rename from app/models/bubble/engageable.rb
rename to app/models/card/engageable.rb
index 5a11a5b06..c16cd986a 100644
--- a/app/models/bubble/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -1,10 +1,10 @@
-module Bubble::Engageable
+module Card::Engageable
   extend ActiveSupport::Concern
 
   STAGNATED_AFTER = 30.days
 
   included do
-    has_one :engagement, dependent: :destroy, class_name: "Bubble::Engagement"
+    has_one :engagement, dependent: :destroy, class_name: "Card::Engagement"
 
     scope :doing, -> { published.active.joins(:engagement) }
     scope :considering, -> { published.active.where.missing(:engagement) }
@@ -14,8 +14,8 @@ module Bubble::Engageable
 
   class_methods do
     def auto_reconsider_all_stagnated
-      stagnated.find_each do |bubble|
-        bubble.reconsider
+      stagnated.find_each do |card|
+        card.reconsider
       end
     end
   end
diff --git a/app/models/card/engagement.rb b/app/models/card/engagement.rb
new file mode 100644
index 000000000..6cdcdf45e
--- /dev/null
+++ b/app/models/card/engagement.rb
@@ -0,0 +1,3 @@
+class Card::Engagement < ApplicationRecord
+  belongs_to :card, class_name: "::Card", touch: true
+end
diff --git a/app/models/bubble/eventable.rb b/app/models/card/eventable.rb
similarity index 86%
rename from app/models/bubble/eventable.rb
rename to app/models/card/eventable.rb
index c1297cc4f..038a6d51a 100644
--- a/app/models/bubble/eventable.rb
+++ b/app/models/card/eventable.rb
@@ -1,4 +1,4 @@
-module Bubble::Eventable
+module Card::Eventable
   extend ActiveSupport::Concern
 
   included do
@@ -13,7 +13,7 @@ module Bubble::Eventable
   private
     def track_event(action, creator: Current.user, **particulars)
       if published?
-        event = find_or_capture_event_summary.events.create! action: action, creator: creator, bubble: self, particulars: particulars
+        event = find_or_capture_event_summary.events.create! action: action, creator: creator, card: self, particulars: particulars
         event.generate_notifications_later
       end
     end
diff --git a/app/models/bubble/messages.rb b/app/models/card/messages.rb
similarity index 97%
rename from app/models/bubble/messages.rb
rename to app/models/card/messages.rb
index 9f89466dc..01446905c 100644
--- a/app/models/bubble/messages.rb
+++ b/app/models/card/messages.rb
@@ -1,4 +1,4 @@
-module Bubble::Messages
+module Card::Messages
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/models/bubble/pinnable.rb b/app/models/card/pinnable.rb
similarity index 92%
rename from app/models/bubble/pinnable.rb
rename to app/models/card/pinnable.rb
index 044125eae..0cdaf4000 100644
--- a/app/models/bubble/pinnable.rb
+++ b/app/models/card/pinnable.rb
@@ -1,4 +1,4 @@
-module Bubble::Pinnable
+module Card::Pinnable
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/models/bubble/scorable.rb b/app/models/card/scorable.rb
similarity index 92%
rename from app/models/bubble/scorable.rb
rename to app/models/card/scorable.rb
index fd188eb98..3bad86a74 100644
--- a/app/models/bubble/scorable.rb
+++ b/app/models/card/scorable.rb
@@ -1,4 +1,4 @@
-module Bubble::Scorable
+module Card::Scorable
   extend ActiveSupport::Concern
 
   REFERENCE_DATE = Time.utc(2025, 1, 1)
@@ -37,7 +37,7 @@ module Bubble::Scorable
     def event_weight(event)
       case
       when event.boosted? then 1
-      when event.comment&.first_by_author_on_bubble? then 20
+      when event.comment&.first_by_author_on_card? then 20
       when event.comment&.follows_comment_by_another_author? then 15
       when event.commented? then 10
       else 0
@@ -46,7 +46,7 @@ module Bubble::Scorable
 
     def event_score_reference(score, activity_at)
       # The reference score is used to make the activity score comparable
-      # across different bubbles, since it represents the bubble's activity
+      # across different cards, since it represents the card's activity
       # level at a consistent point in time.
       #
       # We store this as log2 to tame the huge/tiny numbers we'd otherwise get
diff --git a/app/models/bubble/searchable.rb b/app/models/card/searchable.rb
similarity index 75%
rename from app/models/bubble/searchable.rb
rename to app/models/card/searchable.rb
index 150890efe..3627a555b 100644
--- a/app/models/bubble/searchable.rb
+++ b/app/models/card/searchable.rb
@@ -1,17 +1,17 @@
-module Bubble::Searchable
+module Card::Searchable
   extend ActiveSupport::Concern
 
   included do
     include ::Searchable
 
-    searchable_by :title, using: :bubbles_search_index
+    searchable_by :title, using: :cards_search_index
 
     scope :mentioning, ->(query) do
       if query = sanitize_query_syntax(query)
-        bubbles = Bubble.search(query).select(:id).to_sql
+        cards = Card.search(query).select(:id).to_sql
         comments = Comment.search(query).select(:id).to_sql
 
-        left_joins(:messages).where("bubbles.id in (#{bubbles}) or messages.messageable_id in (#{comments})").distinct
+        left_joins(:messages).where("cards.id in (#{cards}) or messages.messageable_id in (#{comments})").distinct
       else
         none
       end
diff --git a/app/models/bubble/staged.rb b/app/models/card/staged.rb
similarity index 95%
rename from app/models/bubble/staged.rb
rename to app/models/card/staged.rb
index 2b16734b9..b669aeddd 100644
--- a/app/models/bubble/staged.rb
+++ b/app/models/card/staged.rb
@@ -1,4 +1,4 @@
-module Bubble::Staged
+module Card::Staged
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/models/bubble/statuses.rb b/app/models/card/statuses.rb
similarity index 66%
rename from app/models/bubble/statuses.rb
rename to app/models/card/statuses.rb
index f34dab13b..636d9127d 100644
--- a/app/models/bubble/statuses.rb
+++ b/app/models/card/statuses.rb
@@ -1,4 +1,4 @@
-module Bubble::Statuses
+module Card::Statuses
   extend ActiveSupport::Concern
 
   included do
@@ -9,7 +9,7 @@ module Bubble::Statuses
 
   class_methods do
     def remove_abandoned_creations
-      Bubble.creating.where(updated_at: ..1.day.ago).destroy_all
+      Card.creating.where(updated_at: ..1.day.ago).destroy_all
     end
   end
 
@@ -18,8 +18,8 @@ module Bubble::Statuses
   end
 
   def recover_abandoned_creation
-    abandoned_creations.last.tap do |bubble|
-      Bubble.creating.where(creator: creator).excluding(bubble).destroy_all
+    abandoned_creations.last.tap do |card|
+      Card.creating.where(creator: creator).excluding(card).destroy_all
     end
   end
 
@@ -32,6 +32,6 @@ module Bubble::Statuses
 
   private
     def abandoned_creations
-      Bubble.creating.where(creator: creator).where("created_at != updated_at").excluding(self)
+      Card.creating.where(creator: creator).where("created_at != updated_at").excluding(self)
     end
 end
diff --git a/app/models/bubble/taggable.rb b/app/models/card/taggable.rb
similarity index 83%
rename from app/models/bubble/taggable.rb
rename to app/models/card/taggable.rb
index 7fa4dee07..a419a4cae 100644
--- a/app/models/bubble/taggable.rb
+++ b/app/models/card/taggable.rb
@@ -1,4 +1,4 @@
-module Bubble::Taggable
+module Card::Taggable
   extend ActiveSupport::Concern
 
   included do
@@ -9,7 +9,7 @@ module Bubble::Taggable
   end
 
   def toggle_tag_with(title)
-    tag = bucket.account.tags.find_or_create_by!(title: title)
+    tag = collection.account.tags.find_or_create_by!(title: title)
 
     transaction do
       if tagged_with?(tag)
diff --git a/app/models/bubble/watchable.rb b/app/models/card/watchable.rb
similarity index 88%
rename from app/models/bubble/watchable.rb
rename to app/models/card/watchable.rb
index bc4a82ccf..f511ddc7e 100644
--- a/app/models/bubble/watchable.rb
+++ b/app/models/card/watchable.rb
@@ -1,4 +1,4 @@
-module Bubble::Watchable
+module Card::Watchable
   extend ActiveSupport::Concern
 
   included do
@@ -22,7 +22,7 @@ module Bubble::Watchable
 
   def watchers_and_subscribers(include_only_watching: false)
     involvements = include_only_watching ? [ :watching, :everything ] : :everything
-    subscribers = bucket.users.where(accesses: { involvement: involvements })
+    subscribers = collection.users.where(accesses: { involvement: involvements })
 
     User.where(id: subscribers.pluck(:id) +
       watches.watching.pluck(:user_id) - watches.not_watching.pluck(:user_id))
diff --git a/app/models/closure.rb b/app/models/closure.rb
new file mode 100644
index 000000000..ec0a812fc
--- /dev/null
+++ b/app/models/closure.rb
@@ -0,0 +1,4 @@
+class Closure < ApplicationRecord
+  belongs_to :card, touch: true
+  belongs_to :user, optional: true
+end
diff --git a/app/models/closure/reason.rb b/app/models/closure/reason.rb
new file mode 100644
index 000000000..aa1f0161b
--- /dev/null
+++ b/app/models/closure/reason.rb
@@ -0,0 +1,3 @@
+class Closure::Reason < ApplicationRecord
+  belongs_to :account
+end
diff --git a/app/models/collection.rb b/app/models/collection.rb
new file mode 100644
index 000000000..3820af5a1
--- /dev/null
+++ b/app/models/collection.rb
@@ -0,0 +1,21 @@
+class Collection < ApplicationRecord
+  include Accessible, Broadcastable, Filterable
+
+  belongs_to :account
+  belongs_to :creator, class_name: "User", default: -> { Current.user }
+  belongs_to :workflow, optional: true
+
+  has_many :cards, dependent: :destroy
+  has_many :tags, -> { distinct }, through: :cards
+
+  validates_presence_of :name
+
+  after_save :update_cards_workflow, if: :saved_change_to_workflow_id?
+
+  scope :alphabetically, -> { order("lower(name)") }
+
+  private
+    def update_cards_workflow
+      cards.update_all(stage_id: workflow&.stages&.first&.id)
+    end
+end
diff --git a/app/models/bucket/accessible.rb b/app/models/collection/accessible.rb
similarity index 85%
rename from app/models/bucket/accessible.rb
rename to app/models/collection/accessible.rb
index 3c72e9983..81ed9b5b1 100644
--- a/app/models/bucket/accessible.rb
+++ b/app/models/collection/accessible.rb
@@ -1,4 +1,4 @@
-module Bucket::Accessible
+module Collection::Accessible
   extend ActiveSupport::Concern
 
   included do
@@ -11,7 +11,7 @@ module Bucket::Accessible
       end
 
       def grant_to(users)
-        Access.insert_all Array(users).collect { |user| { bucket_id: proxy_association.owner.id, user_id: user.id } }
+        Access.insert_all Array(users).collect { |user| { collection_id: proxy_association.owner.id, user_id: user.id } }
       end
 
       def revoke_from(users)
diff --git a/app/models/collection/broadcastable.rb b/app/models/collection/broadcastable.rb
new file mode 100644
index 000000000..5e36898d6
--- /dev/null
+++ b/app/models/collection/broadcastable.rb
@@ -0,0 +1,8 @@
+module Collection::Broadcastable
+  extend ActiveSupport::Concern
+
+  included do
+    broadcasts_refreshes
+    broadcasts_refreshes_to ->(collection) { [ collection.account, :collections ] }
+  end
+end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 03b45c6c3..8eb60d0f4 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -10,12 +10,12 @@ class Comment < ApplicationRecord
 
   before_destroy :cleanup_events
 
-  def first_by_author_on_bubble?
-    bubble_comments.many? && bubble_comments_prior.where(creator_id: creator_id).none?
+  def first_by_author_on_card?
+    card_comments.many? && card_comments_prior.where(creator_id: creator_id).none?
   end
 
   def follows_comment_by_another_author?
-    bubble_comments.many? && bubble_comments_prior.last&.creator != creator
+    card_comments.many? && card_comments_prior.last&.creator != creator
   end
 
   private
@@ -30,11 +30,11 @@ class Comment < ApplicationRecord
     Event.where(particulars: { comment_id: id }).destroy_all
   end
 
-  def bubble_comments_prior
-    bubble_comments.where(created_at: ...created_at)
+  def card_comments_prior
+    card_comments.where(created_at: ...created_at)
   end
 
-  def bubble_comments
-    Comment.joins(:message).where(messages: { bubble: bubble })
+  def card_comments
+    Comment.joins(:message).where(messages: { card: card })
   end
 end
diff --git a/app/models/concerns/filter/params.rb b/app/models/concerns/filter/params.rb
index 6c1ff2a8e..7c500942a 100644
--- a/app/models/concerns/filter/params.rb
+++ b/app/models/concerns/filter/params.rb
@@ -2,7 +2,7 @@ module Filter::Params
   extend ActiveSupport::Concern
 
   PERMITTED_PARAMS = %i[
-    indexed_by assignment_status bucket_ids creator_ids
+    indexed_by assignment_status collection_ids creator_ids
     assignee_ids stage_ids tag_ids terms display_count
   ].freeze
 
@@ -10,7 +10,7 @@ module Filter::Params
     self.class.normalize_params(
       indexed_by: indexed_by,
       assignment_status: assignment_status,
-      bucket_ids: buckets.ids,
+      collection_ids: collections.ids,
       creator_ids: creators.ids,
       assignee_ids: assignees.ids,
       stage_ids: stages.ids,
diff --git a/app/models/concerns/messageable.rb b/app/models/concerns/messageable.rb
index 723be91d2..219ee1197 100644
--- a/app/models/concerns/messageable.rb
+++ b/app/models/concerns/messageable.rb
@@ -5,6 +5,6 @@ module Messageable
 
   included do
     has_one :message, as: :messageable, touch: true, dependent: :destroy
-    has_one :bubble, through: :message
+    has_one :card, through: :message
   end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 9df46a2fb..e64a8f896 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -3,7 +3,7 @@ class Event < ApplicationRecord
 
   belongs_to :creator, class_name: "User"
   belongs_to :summary, touch: true, class_name: "EventSummary"
-  belongs_to :bubble
+  belongs_to :card
 
   has_one :account, through: :creator
   has_one :message, through: :summary
@@ -14,7 +14,7 @@ class Event < ApplicationRecord
   scope :boosts, -> { where action: :boosted }
   scope :comments, -> { where action: :commented }
 
-  after_create -> { bubble.touch_last_active_at }
+  after_create -> { card.touch_last_active_at }
 
   def boosted?
     action == "boosted"
diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
index 221e78d2e..b74a5a10c 100644
--- a/app/models/event_summary.rb
+++ b/app/models/event_summary.rb
@@ -25,8 +25,8 @@ class EventSummary < ApplicationRecord
         "Unassigned from #{event.assignees.pluck(:name).to_sentence}."
       when "staged"
         "#{event.creator.name} moved this to '#{event.stage_name}'."
-      when "popped"
-        "Popped by #{ event.creator.name }"
+      when "closed"
+        "Closed by #{ event.creator.name }"
       when "unstaged"
         "#{event.creator.name} removed this from '#{event.stage_name}'."
       when "due_date_added"
diff --git a/app/models/filter.rb b/app/models/filter.rb
index aa9d0a794..62f89015c 100644
--- a/app/models/filter.rb
+++ b/app/models/filter.rb
@@ -16,14 +16,14 @@ class Filter < ApplicationRecord
     end
   end
 
-  def bubbles
-    @bubbles ||= begin
-      result = creator.accessible_bubbles.indexed_by(indexed_by)
-      result = result.active unless indexed_by.popped?
+  def cards
+    @cards ||= begin
+      result = creator.accessible_cards.indexed_by(indexed_by)
+      result = result.active unless indexed_by.closed?
       result = result.unassigned if assignment_status.unassigned?
       result = result.assigned_to(assignees.ids) if assignees.present?
       result = result.where(creator_id: creators.ids) if creators.present?
-      result = result.in_bucket(buckets.ids) if buckets.present?
+      result = result.in_collection(collections.ids) if collections.present?
       result = result.in_stage(stages.ids) if stages.present?
       result = result.tagged_with(tags.ids) if tags.present?
       result = terms.reduce(result) do |result, term|
@@ -38,19 +38,19 @@ class Filter < ApplicationRecord
     self.class.normalize_params(as_params).blank?
   end
 
-  def single_bucket
-    buckets.first if buckets.one?
+  def single_collection
+    collections.first if collections.one?
   end
 
   def single_workflow
-    buckets.first.workflow if buckets.pluck(:workflow_id).uniq.one?
+    collections.first.workflow if collections.pluck(:workflow_id).uniq.one?
   end
 
   def cacheable?
-    buckets.exists?
+    collections.exists?
   end
 
   def cache_key
-    ActiveSupport::Cache.expand_cache_key buckets.cache_key_with_version, super
+    ActiveSupport::Cache.expand_cache_key collections.cache_key_with_version, super
   end
 end
diff --git a/app/models/filter/params.rb b/app/models/filter/params.rb
index c09edb074..dd519ec84 100644
--- a/app/models/filter/params.rb
+++ b/app/models/filter/params.rb
@@ -6,7 +6,7 @@ module Filter::Params
     :indexed_by,
     assignee_ids: [],
     creator_ids: [],
-    bucket_ids: [],
+    collection_ids: [],
     stage_ids: [],
     tag_ids: [],
     terms: []
@@ -38,7 +38,7 @@ module Filter::Params
       params[:assignment_status] = assignment_status
       params[:terms]             = terms
       params[:tag_ids]           = tags.ids
-      params[:bucket_ids]        = buckets.ids
+      params[:collection_ids]        = collections.ids
       params[:stage_ids]         = stages.ids
       params[:assignee_ids]      = assignees.ids
       params[:creator_ids]       = creators.ids
diff --git a/app/models/filter/resources.rb b/app/models/filter/resources.rb
index a7df5ab69..2a695e43d 100644
--- a/app/models/filter/resources.rb
+++ b/app/models/filter/resources.rb
@@ -3,7 +3,7 @@ module Filter::Resources
 
   included do
     has_and_belongs_to_many :tags
-    has_and_belongs_to_many :buckets
+    has_and_belongs_to_many :collections
     has_and_belongs_to_many :stages, class_name: "Workflow::Stage", join_table: "filters_stages"
     has_and_belongs_to_many :assignees, class_name: "User", join_table: "assignees_filters", association_foreign_key: "assignee_id"
     has_and_belongs_to_many :creators, class_name: "User", join_table: "creators_filters", association_foreign_key: "creator_id"
@@ -17,7 +17,7 @@ module Filter::Resources
     destroy!
   end
 
-  def buckets
-    creator.buckets.where id: super.ids
+  def collections
+    creator.collections.where id: super.ids
   end
 end
diff --git a/app/models/filter/summarized.rb b/app/models/filter/summarized.rb
index 559b3bc6b..c08607f32 100644
--- a/app/models/filter/summarized.rb
+++ b/app/models/filter/summarized.rb
@@ -1,6 +1,6 @@
 module Filter::Summarized
   def summary
-    [ index_summary, tag_summary, assignee_summary, creator_summary, stage_summary, terms_summary ].compact.to_sentence + " #{bucket_summary}"
+    [ index_summary, tag_summary, assignee_summary, creator_summary, stage_summary, terms_summary ].compact.to_sentence + " #{collection_summary}"
   end
 
   private
@@ -28,9 +28,9 @@ module Filter::Summarized
       end
     end
 
-    def bucket_summary
-      if buckets.any?
-        "in #{buckets.pluck(:name).to_choice_sentence}"
+    def collection_summary
+      if collections.any?
+        "in #{collections.pluck(:name).to_choice_sentence}"
       end
     end
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 24e658ed3..bb5dea5a9 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,5 +1,5 @@
 class Message < ApplicationRecord
-  belongs_to :bubble, touch: true
+  belongs_to :card, touch: true
 
   delegated_type :messageable, types: Messageable::TYPES, inverse_of: :message, dependent: :destroy
 
@@ -10,10 +10,10 @@ class Message < ApplicationRecord
 
   private
     def created
-      bubble.comment_created(comment) if comment?
+      card.comment_created(comment) if comment?
     end
 
     def destroyed
-      bubble.comment_destroyed if comment?
+      card.comment_destroyed if comment?
     end
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 05d38c940..3980c3d8d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,7 +1,7 @@
 class Notification < ApplicationRecord
   belongs_to :user
   belongs_to :event
-  belongs_to :bubble
+  belongs_to :card
   belongs_to :resource, polymorphic: true
 
   scope :unread, -> { where(read_at: nil) }
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 9c89d6bdf..19626be5f 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -12,7 +12,7 @@ class Notifier
   def generate
     if should_notify?
       recipients.map do |recipient|
-        Notification.create! user: recipient, event: event, bubble: bubble, resource: resource
+        Notification.create! user: recipient, event: event, card: card, resource: resource
       end
     end
   end
@@ -27,14 +27,14 @@ class Notifier
     end
 
     def recipients
-      bubble.watchers_and_subscribers.without(creator)
+      card.watchers_and_subscribers.without(creator)
     end
 
     def resource
-      bubble
+      card
     end
 
-    def bubble
-      event.summary.message.bubble
+    def card
+      event.summary.message.card
     end
 end
diff --git a/app/models/notifier/assigned.rb b/app/models/notifier/assigned.rb
index 3027ab56c..843376435 100644
--- a/app/models/notifier/assigned.rb
+++ b/app/models/notifier/assigned.rb
@@ -1,6 +1,6 @@
 class Notifier::Assigned < Notifier
   private
     def recipients
-      event.assignees.excluding(bubble.bucket.access_only_users)
+      event.assignees.excluding(card.collection.access_only_users)
     end
 end
diff --git a/app/models/notifier/closed.rb b/app/models/notifier/closed.rb
new file mode 100644
index 000000000..f090b0308
--- /dev/null
+++ b/app/models/notifier/closed.rb
@@ -0,0 +1,2 @@
+class Notifier::Closed < Notifier
+end
diff --git a/app/models/notifier/popped.rb b/app/models/notifier/popped.rb
deleted file mode 100644
index f83e721ce..000000000
--- a/app/models/notifier/popped.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Notifier::Popped < Notifier
-end
diff --git a/app/models/notifier/published.rb b/app/models/notifier/published.rb
index 3aadc3c93..ce3917e8f 100644
--- a/app/models/notifier/published.rb
+++ b/app/models/notifier/published.rb
@@ -1,6 +1,6 @@
 class Notifier::Published < Notifier
   private
     def recipients
-      bubble.watchers_and_subscribers(include_only_watching: true).without(creator)
+      card.watchers_and_subscribers(include_only_watching: true).without(creator)
     end
 end
diff --git a/app/models/pin.rb b/app/models/pin.rb
index 86913023c..425a504bf 100644
--- a/app/models/pin.rb
+++ b/app/models/pin.rb
@@ -1,5 +1,5 @@
 class Pin < ApplicationRecord
-  belongs_to :bubble
+  belongs_to :card
   belongs_to :user
 
   scope :ordered, -> { order(created_at: :desc) }
diff --git a/app/models/pop.rb b/app/models/pop.rb
deleted file mode 100644
index 45ccb2411..000000000
--- a/app/models/pop.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class Pop < ApplicationRecord
-  belongs_to :bubble, touch: true
-  belongs_to :user, optional: true
-end
diff --git a/app/models/pop/reason.rb b/app/models/pop/reason.rb
deleted file mode 100644
index 753862a95..000000000
--- a/app/models/pop/reason.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Pop::Reason < ApplicationRecord
-  belongs_to :account
-end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 376e21bc0..128a9aaac 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -4,7 +4,7 @@ class Tag < ApplicationRecord
   belongs_to :account, default: -> { Current.account }, touch: true
 
   has_many :taggings, dependent: :destroy
-  has_many :bubbles, through: :taggings
+  has_many :cards, through: :taggings
 
   validates :title, format: { without: /\A#/ }
   normalizes :title, with: -> { it.downcase }
diff --git a/app/models/tagging.rb b/app/models/tagging.rb
index 242dd4825..73daa0879 100644
--- a/app/models/tagging.rb
+++ b/app/models/tagging.rb
@@ -1,4 +1,4 @@
 class Tagging < ApplicationRecord
   belongs_to :tag
-  belongs_to :bubble, touch: true
+  belongs_to :card, touch: true
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 623111447..f1b6a0d1f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,9 +11,9 @@ class User < ApplicationRecord
   has_many :notifications, dependent: :destroy
 
   has_many :filters, foreign_key: :creator_id, inverse_of: :creator, dependent: :destroy
-  has_many :pops, dependent: :nullify
+  has_many :closures, dependent: :nullify
   has_many :pins, dependent: :destroy
-  has_many :pinned_bubbles, through: :pins, source: :bubble
+  has_many :pinned_cards, through: :pins, source: :card
 
   normalizes :email_address, with: ->(value) { value.strip.downcase }
 
diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb
index 5615f9976..f6c902c50 100644
--- a/app/models/user/accessor.rb
+++ b/app/models/user/accessor.rb
@@ -3,14 +3,14 @@ module User::Accessor
 
   included do
     has_many :accesses, dependent: :destroy
-    has_many :buckets, through: :accesses
-    has_many :accessible_bubbles, through: :buckets, source: :bubbles
+    has_many :collections, through: :accesses
+    has_many :accessible_cards, through: :collections, source: :cards
 
-    after_create_commit :grant_access_to_buckets
+    after_create_commit :grant_access_to_collections
   end
 
   private
-    def grant_access_to_buckets
-      Access.insert_all account.buckets.all_access.pluck(:id).collect { |bucket_id| { bucket_id: bucket_id, user_id: id } }
+    def grant_access_to_collections
+      Access.insert_all account.collections.all_access.pluck(:id).collect { |collection_id| { collection_id: collection_id, user_id: id } }
     end
 end
diff --git a/app/models/user/assignee.rb b/app/models/user/assignee.rb
index 730158164..a30394d2c 100644
--- a/app/models/user/assignee.rb
+++ b/app/models/user/assignee.rb
@@ -4,6 +4,6 @@ module User::Assignee
   included do
     has_many :assignments, foreign_key: :assignee_id, dependent: :destroy
     has_many :assignings, foreign_key: :assigner_id, class_name: "Assignment"
-    has_many :assigned_bubbles, through: :assignments, source: :bubble
+    has_many :assigned_cards, through: :assignments, source: :card
   end
 end
diff --git a/app/models/watch.rb b/app/models/watch.rb
index b10de9ef4..a49302c8f 100644
--- a/app/models/watch.rb
+++ b/app/models/watch.rb
@@ -1,6 +1,6 @@
 class Watch < ApplicationRecord
   belongs_to :user
-  belongs_to :bubble
+  belongs_to :card
 
   scope :watching, -> { where(watching: true) }
   scope :not_watching, -> { where(watching: false) }
diff --git a/app/presenters/bucket_filter_presenter.rb b/app/presenters/bucket_filter_presenter.rb
deleted file mode 100644
index 8b4938903..000000000
--- a/app/presenters/bucket_filter_presenter.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class BucketFilterPresenter
-  def initialize(buckets, params, cookies)
-    @buckets = buckets
-    @params = params
-    @cookies = cookies
-  end
-
-  def filter_text
-    if selected_bucket_ids.present?
-      "Showing activity for #{selected_bucket_names_bold}".html_safe
-    else
-      "Showing everything"
-    end
-  end
-
-  private
-    def selected_bucket_ids
-      @params[:bucket_ids].presence || @cookies[:bucket_filter]&.split(",")
-    end
-
-    def selected_bucket_names
-      @buckets.where(id: selected_bucket_ids).pluck(:name).to_sentence
-    end
-
-    def selected_bucket_names_bold
-      names = @buckets.where(id: selected_bucket_ids).pluck(:name)
-      names.map { |name| "<strong>#{name}</strong>" }.to_sentence
-    end
-end
diff --git a/app/presenters/collection_filter_presenter.rb b/app/presenters/collection_filter_presenter.rb
new file mode 100644
index 000000000..730e38e83
--- /dev/null
+++ b/app/presenters/collection_filter_presenter.rb
@@ -0,0 +1,29 @@
+class CollectionFilterPresenter
+  def initialize(collections, params, cookies)
+    @collections = collections
+    @params = params
+    @cookies = cookies
+  end
+
+  def filter_text
+    if selected_collection_ids.present?
+      "Showing activity for #{selected_collection_names_bold}".html_safe
+    else
+      "Showing everything"
+    end
+  end
+
+  private
+    def selected_collection_ids
+      @params[:collection_ids].presence || @cookies[:collection_filter]&.split(",")
+    end
+
+    def selected_collection_names
+      @collections.where(id: selected_collection_ids).pluck(:name).to_sentence
+    end
+
+    def selected_collection_names_bold
+      names = @collections.where(id: selected_collection_ids).pluck(:name)
+      names.map { |name| "<strong>#{name}</strong>" }.to_sentence
+    end
+end
diff --git a/app/views/bubbles/_comments.html.erb b/app/views/bubbles/_comments.html.erb
deleted file mode 100644
index 6a60cdaeb..000000000
--- a/app/views/bubbles/_comments.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if bubble.messages.comments.any? %>
-  <div class="bubble__detail bubble__comments">
-    <span aria-hidden="true"><%= bubble.messages.comments.count %></span>
-    <span class="for-screen-reader"><%= pluralize(bubble.messages.comments.count, "comment") %></span>
-  </div>
-<% end %>
diff --git a/app/views/bubbles/_date.html.erb b/app/views/bubbles/_date.html.erb
deleted file mode 100644
index bbcc9d4c1..000000000
--- a/app/views/bubbles/_date.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if bubble.due_on.present? %>
-  <%= form_with model: bubble, url: bucket_bubble_path(bubble.bucket, bubble), data: { controller: "form" } do |form| %>
-    <label class="bubble__detail bubble__date">
-      <span class="for-screen-reader">Change the due date</span>
-      <span class="bubble__date-text"><%= html_escape bubble.due_on.strftime("%b <br> %d").html_safe %></span>
-      <%= form.date_field :due_on, class: "input input--hidden", data: { action: "change->form#submit click->form#showPicker" } %>
-    </label>
-  <% end %>
-<% end %>
diff --git a/app/views/bubbles/_publish.html.erb b/app/views/bubbles/_publish.html.erb
deleted file mode 100644
index 044142556..000000000
--- a/app/views/bubbles/_publish.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= button_to bubble_publish_path(bubble), class: "btn txt-small btn--link", style: "--btn-background: #{bubble.color}" do %>
-  <span>Post to project</span>
-<% end %>
diff --git a/app/views/bubbles/assignments/create.turbo_stream.erb b/app/views/bubbles/assignments/create.turbo_stream.erb
deleted file mode 100644
index 67f41c898..000000000
--- a/app/views/bubbles/assignments/create.turbo_stream.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= turbo_stream.replace([ @bubble, :assignees ], partial: "bubbles/cards/perma/assignees", locals: { bubble: @bubble }) %>
diff --git a/app/views/bubbles/boosts/_boosts.html.erb b/app/views/bubbles/boosts/_boosts.html.erb
deleted file mode 100644
index ca12a1ed5..000000000
--- a/app/views/bubbles/boosts/_boosts.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= form_with url: bubble_boosts_path(bubble), class: "pad-inline flex align-center gap" do %>
-  <span class="overflow-ellipsis">
-    <strong><%= number_field_tag :boost_count, bubble.boosts_count, min: 1, class: "boost__input input", autocomplete: "off" %></strong>
-    <span><%= bubble.boosts_count == 1 ? "boost" : "boosts" %></span>
-  </span>
-  <%= tag.button class: "btn", type: :submit, style: "font-size: 0.4em" do %>
-    <%= icon_tag "add" %>
-    <span class="for-screen-reader">Boost</span>
-  <% end %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/bubbles/boosts/create.turbo_stream.erb b/app/views/bubbles/boosts/create.turbo_stream.erb
deleted file mode 100644
index 63d73d4a9..000000000
--- a/app/views/bubbles/boosts/create.turbo_stream.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= turbo_stream.update dom_id(@bubble, :boosts) do %>
-  <%= render "bubbles/boosts/boosts", bubble: @bubble %>
-<% end %>
-
-<%= turbo_stream.replace dom_id(@bubble, :messages) do %>
-  <%= render "bubbles/messages", bubble: @bubble %>
-<% end %>
diff --git a/app/views/bubbles/cards/_mini.html.erb b/app/views/bubbles/cards/_mini.html.erb
deleted file mode 100644
index 161154023..000000000
--- a/app/views/bubbles/cards/_mini.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="card card--mini shadow border flex gap position-relative txt-align-start full-width border-radius" style="view-transition-name: <%= dom_id(bubble, :ticket) %>;">
-  <%= avatar_image_tag bubble.creator, class: "avatar" %>
-
-  <div class="card__body flex flex-column gap-half full-width flex-item-grow min-width max-width">
-    <h3 class="card__title">
-      <%= bubble_title(bubble) %>
-    </h3>
-
-    <div class="txt-small overflow-ellipsis txt-uppercase"><%= "Added to #{bubble.bucket.name} by #{bubble.creator.name}" %>
-      <%= local_datetime_tag(bubble.created_at, style: :daysago) %>
-    </div>
-
-    <div class="card__stuff flex align-center gap">
-      <%= render "bubbles/cards/mini/assignees", bubble: bubble %>
-      <div class="overflow-ellipsis"><%= render "bubbles/cards/mini/tags", bubble: bubble %></div>
-    </div>
-  </div>
-
-  <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "card__link" do %>
-    <span class="for-screen-reader"><%= bubble_title(bubble) %></span>
-  <% end %>
-</div>
diff --git a/app/views/bubbles/cards/_perma.html.erb b/app/views/bubbles/cards/_perma.html.erb
deleted file mode 100644
index 281ce1ff8..000000000
--- a/app/views/bubbles/cards/_perma.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<% cache bubble do %>
-  <article class="card shadow border flex flex-column position-relative txt-align-start border-radius"
-      style="--bubble-color: <%= bubble.color %>; view-transition-name: <%= dom_id(bubble, :ticket) %>;"
-      id="<%= dom_id(bubble, :ticket) %>">
-    <header class="card__header flex align-center gap min-width">
-      <%= link_to bubble.bucket.name, bubbles_path(bucket_ids: [bubble.bucket]),
-            class: "card__bucket txt-uppercase overflow-ellipsis txt-reversed" %>
-
-      <%= render "bubbles/cards/perma/tags", bubble: bubble %>
-    </header>
-
-    <div class="card__body flex gap full-width flex-item-grow">
-      <div class="card__body-header">
-        <h1 class="card__title">
-          <% if bubble.published? %>
-            <%= turbo_frame_tag bubble, :edit do %>
-              <%= link_to bubble_title(bubble), edit_bucket_bubble_path(bubble.bucket, bubble), class: "card__title-link overflow-line-clamp" %>
-            <% end %>
-          <% else %>
-            <%= form_with model: bubble, url: bucket_bubble_path(bubble.bucket, bubble), id: "bubble_form", data: { controller: "auto-save" } do |form| %>
-              <%= form.text_area :title, placeholder: "Name it…",
-                    class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if bubble.creating? }",
-                    autofocus: bubble.title.blank?,
-                    data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
-            <% end %>
-          <% end %>
-        </h1>
-      </div>
-
-      <% if bubble.doing? %>
-        <%= turbo_frame_tag dom_id(@bubble, :stages) do %>
-          <%= render "bubbles/stagings/stages", bubble: bubble %>
-        <% end %>
-      <% end %>
-    </div>
-
-    <footer class="card__footer full-width flex align-start gap">
-      <%= render "bubbles/cards/perma/people", bubble: bubble %>
-      <%= render "bubbles/cards/perma/meta", bubble: bubble %>
-    </footer>
-
-    <%= render "bubbles/cards/common/background", bubble: bubble %>
-  </article>
-<% end %>
diff --git a/app/views/bubbles/cards/_preview.html.erb b/app/views/bubbles/cards/_preview.html.erb
deleted file mode 100644
index b524c948c..000000000
--- a/app/views/bubbles/cards/_preview.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<% cache [ bubble ] do %>
-  <article class="card shadow border flex flex-column position-relative txt-align-start full-width border-radius"
-    style="--bubble-color: <%= bubble.color %>; view-transition-name: <%= dom_id(bubble, :ticket) %>;"
-    id="<%= dom_id(bubble, :ticket) %>">
-    <header class="card__header flex align-center gap min-width">
-      <span class="card__bucket txt-uppercase overflow-ellipsis txt-reversed"><%= bubble.bucket.name %></span>
-      <%= render "bubbles/cards/preview/tags", bubble: bubble %>
-    </header>
-
-    <div class="card__body flex gap full-width flex-item-grow">
-      <div class="card__body-header">
-        <h1 class="card__title">
-          <span class="card__title-link overflow-line-clamp"><%= bubble_title(bubble) %></span>
-        </h1>
-      </div>
-
-      <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "card__link" do %>
-        <span class="for-screen-reader"><%= bubble_title(bubble) %></span>
-      <% end %>
-
-      <%= render "bubbles/stagings/stages", bubble: bubble if bubble.doing? %>
-    </div>
-
-    <footer class="card__footer full-width flex align-start gap">
-      <%= render "bubbles/cards/preview/people", bubble: bubble %>
-      <%= render "bubbles/cards/preview/meta", bubble: bubble %>
-    </footer>
-
-    <%= render "bubbles/cards/common/background", bubble: bubble %>
-  </article>
-<% end %>
diff --git a/app/views/bubbles/cards/common/_background.html.erb b/app/views/bubbles/cards/common/_background.html.erb
deleted file mode 100644
index 26286cd86..000000000
--- a/app/views/bubbles/cards/common/_background.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="card__background">
-  <%= image_tag bubble.image.presence || "", size: 120, data: { upload_preview_target: "image" } %>
-</div>
-
-<% if bubble.popped? %>
-  <div class="card__popped flex flex-column">
-    <span class="card__popped-title txt-uppercase"><%= bubble.pop.reason %></span>
-    <strong><%= bubble.popped_at.strftime("%b %d, %Y") %></strong>
-    <span>by <span class="card__popped-by"><%= bubble.popped_by.name %></span></span>
-  </div>
-<% end %>
diff --git a/app/views/bubbles/cards/mini/_tags.html.erb b/app/views/bubbles/cards/mini/_tags.html.erb
deleted file mode 100644
index b68e98529..000000000
--- a/app/views/bubbles/cards/mini/_tags.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render "bubbles/cards/preview/tags", bubble: bubble %>
diff --git a/app/views/bubbles/cards/perma/_assignees.html.erb b/app/views/bubbles/cards/perma/_assignees.html.erb
deleted file mode 100644
index 8733e969e..000000000
--- a/app/views/bubbles/cards/perma/_assignees.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "bubbles/cards/common/assignees", bubble: bubble do %>
-  <%= turbo_frame_tag bubble, :assignment, src: new_bubble_assignment_path(bubble) %>
-<% end %>
diff --git a/app/views/bubbles/cards/perma/_boosts.html.erb b/app/views/bubbles/cards/perma/_boosts.html.erb
deleted file mode 100644
index 10c18c79e..000000000
--- a/app/views/bubbles/cards/perma/_boosts.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= turbo_frame_tag dom_id(bubble, :boosts) do %>
-  <%= render "bubbles/boosts/boosts", bubble: bubble %>
-<% end %>
diff --git a/app/views/bubbles/cards/perma/_meta.html.erb b/app/views/bubbles/cards/perma/_meta.html.erb
deleted file mode 100644
index 7f6fa5da7..000000000
--- a/app/views/bubbles/cards/perma/_meta.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "bubbles/cards/common/meta", bubble: bubble do %>
-  <%= render "bubbles/cards/perma/boosts", bubble: bubble %>
-<% end %>
diff --git a/app/views/bubbles/cards/perma/_people.html.erb b/app/views/bubbles/cards/perma/_people.html.erb
deleted file mode 100644
index 3943414a2..000000000
--- a/app/views/bubbles/cards/perma/_people.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "bubbles/cards/common/people", bubble: bubble do%>
-  <%= render "bubbles/cards/perma/assignees", bubble: bubble %>
-<% end %>
diff --git a/app/views/bubbles/cards/preview/_assignees.html.erb b/app/views/bubbles/cards/preview/_assignees.html.erb
deleted file mode 100644
index ae3301ea1..000000000
--- a/app/views/bubbles/cards/preview/_assignees.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render "bubbles/cards/common/assignees", bubble: bubble  %>
diff --git a/app/views/bubbles/cards/preview/_boosts.html.erb b/app/views/bubbles/cards/preview/_boosts.html.erb
deleted file mode 100644
index f3acb27e5..000000000
--- a/app/views/bubbles/cards/preview/_boosts.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= turbo_frame_tag dom_id(bubble, :boosts) do %>
-  <%= tag.div class: "pad-inline flex align-center gap" do %>
-    <span class="overflow-ellipsis">
-      <strong><%= bubble.boosts_count %></strong>
-      <span><%= bubble.boosts_count == 1 ? "boost" : "boosts" %></span>
-    </span>
-  <% end %>
-<% end %>
diff --git a/app/views/bubbles/cards/preview/_meta.html.erb b/app/views/bubbles/cards/preview/_meta.html.erb
deleted file mode 100644
index 4ffd12ccb..000000000
--- a/app/views/bubbles/cards/preview/_meta.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "bubbles/cards/common/meta", bubble: bubble do %>
-  <%= render "bubbles/cards/preview/boosts", bubble: bubble %>
-<% end %>
diff --git a/app/views/bubbles/cards/preview/_people.html.erb b/app/views/bubbles/cards/preview/_people.html.erb
deleted file mode 100644
index b2affe593..000000000
--- a/app/views/bubbles/cards/preview/_people.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "bubbles/cards/common/people", bubble: bubble do%>
-  <%= render "bubbles/cards/preview/assignees", bubble: bubble %>
-<% end %>
diff --git a/app/views/bubbles/cards/preview/_tags.html.erb b/app/views/bubbles/cards/preview/_tags.html.erb
deleted file mode 100644
index 66de991bc..000000000
--- a/app/views/bubbles/cards/preview/_tags.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="card__tags flex align-center flex-item-grow min-width">
-  <div class="overflow-ellipsis">
-    <% if bubble.tags.any?  %>
-      <span># </span>
-      <% bubble.tags.each_with_index do |tag, index| %>
-          <span class="card__tag btn btn--plain min-width txt-uppercase fill-transparent overflow-ellipsis">
-            <%= tag.title %>
-          </span>
-      <% end %>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/bubbles/index.html.erb b/app/views/bubbles/index.html.erb
deleted file mode 100644
index 026f80100..000000000
--- a/app/views/bubbles/index.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% @page_title = @filter.summary %>
-
-<%= render "filters/broadcasts", filter: @filter %>
-
-<% content_for :header do %>
-  <%= render "bubbles/index/header", filter: @filter %>
-<% end %>
-
-<div class="cards--columns">
-  <%= render "bubbles/index/bubbles/considering", bubbles: @considering_bubbles %>
-  <%= render "bubbles/index/bubbles/doing", bubbles: @doing_bubbles, filter: @filter %>
-</div>
-
-<%= render "bubbles/index/bubbles/popped", bubbles: @popped_bubbles, filter: @filter %>
diff --git a/app/views/bubbles/index/_buckets_filter.html.erb b/app/views/bubbles/index/_buckets_filter.html.erb
deleted file mode 100644
index 33792b4eb..000000000
--- a/app/views/bubbles/index/_buckets_filter.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
-      data: { controller: "form" } do |form| %>
-  <% filter.as_params.except(:bucket_ids).each do |key, value| %>
-    <%= filter_hidden_field_tag key, value %>
-  <% end %>
-
-  <%= link_to bubbles_path(filter.as_params.except(:bucket_ids)), class: "btn popup__item" do %>
-    <span class="overflow-ellipsis">All collections</span>
-  <% end %>
-
-  <% Current.user.buckets.order(:name).each do |bucket| %>
-    <div class="btn popup__item">
-      <%= form.check_box "bucket_ids[]", {
-            checked: filter.buckets.include?(bucket),
-            data: { action: "change->form#submit" },
-            include_hidden: false,
-      }, bucket.id %>
-
-      <%= form.label "bucket_ids[]", bucket.name, for: dom_id(bucket, :filter), class: "overflow-ellipsis" %>
-      <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/app/views/bubbles/stagings/_stages.html.erb b/app/views/bubbles/stagings/_stages.html.erb
deleted file mode 100644
index 49a0c1dc3..000000000
--- a/app/views/bubbles/stagings/_stages.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% workflow = bubble.bucket.workflow %>
-
-<% if workflow  %>
-  <div id="<%= dom_id(bubble, "stages") %>" class="card__stages flex flex-column max-width min-width pad-block">
-    <% workflow.stages.each do |stage| %>
-      <%= button_to_set_stage bubble, stage %>
-    <% end %>
-  </div>
-<% end %>
diff --git a/app/views/bubbles/stagings/create.turbo_stream.erb b/app/views/bubbles/stagings/create.turbo_stream.erb
deleted file mode 100644
index 62e755146..000000000
--- a/app/views/bubbles/stagings/create.turbo_stream.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= turbo_stream.replace dom_id(@bubble, "stages") do %>
-  <%= render partial: "bubbles/stagings/stages", locals: { bubble: @bubble } %>
-<% end %>
diff --git a/app/views/bubbles/taggings/create.turbo_stream.erb b/app/views/bubbles/taggings/create.turbo_stream.erb
deleted file mode 100644
index b261c7f0b..000000000
--- a/app/views/bubbles/taggings/create.turbo_stream.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= turbo_stream.replace([ @bubble, :tags ], partial: "bubbles/cards/perma/tags", locals: { bubble: @bubble }) %>
diff --git a/app/views/bubbles/watches/show.html.erb b/app/views/bubbles/watches/show.html.erb
deleted file mode 100644
index bd68ab801..000000000
--- a/app/views/bubbles/watches/show.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= turbo_frame_tag dom_id(@bubble, :watch) do %>
-  <% if @bubble.watched_by? Current.user %>
-      <%= button_to bubble_watch_path(@bubble), method: :delete, class: "btn btn--reversed" do %>
-        <%= icon_tag "bell" %>
-        <span class="for-screen-reader">Stop watching</span>
-      <% end %>
-  <% else %>
-      <%= button_to bubble_watch_path(@bubble), class: "btn" do %>
-        <%= icon_tag "bell-off" %>
-        <span class="for-screen-reader">Watch this</span>
-      <% end %>
-  <% end %>
-<% end %>
diff --git a/app/views/buckets/_bucket.html.erb b/app/views/buckets/_bucket.html.erb
deleted file mode 100644
index 82149d71e..000000000
--- a/app/views/buckets/_bucket.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<li class="bucket flex flex-column txt-align-center max-width">
-  <%= link_to bubbles_path(bucket_ids: [ bucket ]),
-        class: "border border-radius margin-block-end-half bubbles__container flex justify-center align-center position-relative",
-        aria: { hidden: true }, tabindex: -1 do %>
-    <div class="bubbles bucket__bubbles flex flex-wrap gap justify-center align-end" style="view-transition-name: bubbles_<%= bucket.id %>">
-      <% bucket.bubbles.active.published_or_drafted_by(Current.user).ordered_by_activity.limit(10).each do |bubble| %>
-        <div class="<%= class_names("bubble", drafted: bubble.drafted?) %>" style="--bubble-color: <%= bubble.color %>; <%= bubble_rotation(bubble) %>"
-          data-bubble-size-target="bubble"
-          data-activity-score="<%= bubble.activity_score %>"
-          data-activity-score-at="<%= bubble.activity_score_at.to_i %>">
-          <span class="bubble__shape"></span>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-
-  <div class="flex align-center justify-center flex-column flex-wrap center gap-half position-relative full-width">
-    <%= link_to bubbles_path(bucket_ids: [ bucket ]), class: "txt-ink flex flex-column" do %>
-      <strong class="txt-large"><%= bucket.name %></strong>
-    <% end %>
-
-    <%= link_to edit_bucket_path(bucket), class: "btn txt-small bucket__button" do %>
-      <%= icon_tag "settings" %>
-      <span class="for-screen-reader">Settings for <%= bucket.name %></span>
-    <% end %>
-  </div>
-</li>
diff --git a/app/views/buckets/involvements/update.html.erb b/app/views/buckets/involvements/update.html.erb
deleted file mode 100644
index 76bd04031..000000000
--- a/app/views/buckets/involvements/update.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= access_involvement_advance_button(@bucket, Current.user) %>
diff --git a/app/views/bubbles/_pop_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb
similarity index 58%
rename from app/views/bubbles/_pop_toggle.html.erb
rename to app/views/cards/_closure_toggle.html.erb
index 3335efdac..4f08560eb 100644
--- a/app/views/bubbles/_pop_toggle.html.erb
+++ b/app/views/cards/_closure_toggle.html.erb
@@ -1,7 +1,7 @@
-<div class="card__actions-container center border-radius flex-inline align-center justify-center gap" style="--bubble-color: <%= @bubble.color %>">
-  <% if bubble.popped? %>
-    <span class="card__pop-message">Completed by <%= bubble.popped_by.name %> on <%= local_datetime_tag(bubble.popped_at, style: :shortdate) %>.</span>
-    <%= button_to bubble_pop_path(bubble), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>
+<div class="something-to-rename__actions-container center border-radius flex-inline align-center justify-center gap" style="--card-color: <%= @card.color %>">
+  <% if card.closed? %>
+    <span class="something-to-rename__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
+    <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>
       <span>Un-do</span>
     <% end %>
   <% else %>
@@ -15,19 +15,19 @@
           data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
         <strong class="popup__title margin-block-start-half pad-inline-half">Close as…</strong>
 
-        <% Current.account.pop_reasons.labels.each do |label| %>
-          <%= button_to bubble_pop_path(bubble, reason: label), class: "btn popup__item full-width", form_class: "full-width" do %>
+        <% Current.account.closure_reasons.labels.each do |label| %>
+          <%= button_to card_closure_path(card, reason: label), class: "btn popup__item full-width", form_class: "full-width" do %>
             <span class="overflow-ellipsis"><%= label %></span>
           <% end %>
         <% end %>
       </dialog>
     </div>
 
-    <span class="card__pop-message">
-      <% if bubble.doing? %>
-        Returns to <em>Considering</em> if no activity <%= local_datetime_tag(bubble.auto_reconsider_at, style: :indays) -%>.
+    <span class="something-to-rename__closure-message">
+      <% if card.doing? %>
+        Returns to <em>Considering</em> if no activity <%= local_datetime_tag(card.auto_reconsider_at, style: :indays) -%>.
       <% else %>
-        Auto-closes if no activity <%= local_datetime_tag(bubble.auto_pop_at, style: :indays) -%>.
+        Auto-closes if no activity <%= local_datetime_tag(card.auto_closure_at, style: :indays) -%>.
       <% end %>
     </span>
   <% end %>
diff --git a/app/views/bubbles/_color.html.erb b/app/views/cards/_color.html.erb
similarity index 86%
rename from app/views/bubbles/_color.html.erb
rename to app/views/cards/_color.html.erb
index cf022790f..339d30e53 100644
--- a/app/views/bubbles/_color.html.erb
+++ b/app/views/cards/_color.html.erb
@@ -5,8 +5,8 @@
   </button>
 
   <dialog class="color-picker panel fill-white shadow gap-half" data-dialog-target="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <%= form_with model: bubble, url: bucket_bubble_path(bubble.bucket, bubble), class: "flex gap-half", data: { controller: "form", action: "change->form#submit" } do |form| %>
-      <% Bubble::COLORS.each do |color| %>
+    <%= form_with model: card, url: collection_card_path(card.collection, card), class: "flex gap-half", data: { controller: "form", action: "change->form#submit" } do |form| %>
+      <% Card::COLORS.each do |color| %>
         <span class="color-picker__color">
           <label class="btn btn--circle" style="--btn-background: <%= color %>" title="<%= color %>">
             <%= form.radio_button :color, color %>
diff --git a/app/views/cards/_comments.html.erb b/app/views/cards/_comments.html.erb
new file mode 100644
index 000000000..793f0c592
--- /dev/null
+++ b/app/views/cards/_comments.html.erb
@@ -0,0 +1,6 @@
+<% if card.messages.comments.any? %>
+  <div class="something-to-rename__detail card__comments">
+    <span aria-hidden="true"><%= card.messages.comments.count %></span>
+    <span class="for-screen-reader"><%= pluralize(card.messages.comments.count, "comment") %></span>
+  </div>
+<% end %>
diff --git a/app/views/cards/_date.html.erb b/app/views/cards/_date.html.erb
new file mode 100644
index 000000000..a1aa5e283
--- /dev/null
+++ b/app/views/cards/_date.html.erb
@@ -0,0 +1,9 @@
+<% if card.due_on.present? %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), data: { controller: "form" } do |form| %>
+    <label class="something-to-rename__detail something-to-rename__date">
+      <span class="for-screen-reader">Change the due date</span>
+      <span class="card__date-text"><%= html_escape card.due_on.strftime("%b <br> %d").html_safe %></span>
+      <%= form.date_field :due_on, class: "input input--hidden", data: { action: "change->form#submit click->form#showPicker" } %>
+    </label>
+  <% end %>
+<% end %>
diff --git a/app/views/bubbles/_display_count_selector.html.erb b/app/views/cards/_display_count_selector.html.erb
similarity index 100%
rename from app/views/bubbles/_display_count_selector.html.erb
rename to app/views/cards/_display_count_selector.html.erb
diff --git a/app/views/bubbles/_filters.html.erb b/app/views/cards/_filters.html.erb
similarity index 100%
rename from app/views/bubbles/_filters.html.erb
rename to app/views/cards/_filters.html.erb
diff --git a/app/views/bubbles/_image.html.erb b/app/views/cards/_image.html.erb
similarity index 69%
rename from app/views/bubbles/_image.html.erb
rename to app/views/cards/_image.html.erb
index e038c041f..b7b037be1 100644
--- a/app/views/bubbles/_image.html.erb
+++ b/app/views/cards/_image.html.erb
@@ -1,10 +1,10 @@
-<% if bubble.image.attached? %>
-  <%= button_to bubble_image_path(bubble), method: :delete, class: "btn" do %>
+<% if card.image.attached? %>
+  <%= button_to card_image_path(card), method: :delete, class: "btn" do %>
     <%= icon_tag "picture-remove" %>
     <span class="for-screen-reader">Clear background image</span>
   <% end %>
 <% else %>
-  <%= form_with model: bubble, url: bucket_bubble_path(bubble.bucket, bubble), data: { controller: "form" } do |form| %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), data: { controller: "form" } do |form| %>
     <label class="btn">
       <%= icon_tag "picture-add" %>
       <span class="for-screen-reader">Add background image</span>
diff --git a/app/views/bubbles/_messages.html.erb b/app/views/cards/_messages.html.erb
similarity index 50%
rename from app/views/bubbles/_messages.html.erb
rename to app/views/cards/_messages.html.erb
index 9ad77ac10..5b7ed1ef5 100644
--- a/app/views/bubbles/_messages.html.erb
+++ b/app/views/cards/_messages.html.erb
@@ -1,16 +1,16 @@
-<%= messages_tag(bubble) do %>
-  <%= render partial: "messages/message", collection: bubble.messages, cached: true %>
-  <%= render "comments/new", bubble: bubble, cached: true %>
+<%= messages_tag(card) do %>
+  <%= render partial: "messages/message", collection: card.messages, cached: true %>
+  <%= render "comments/new", card: card, cached: true %>
 
   <div class="comments__subscribers flex flex-column margin-block txt-align-start full-width">
     <strong class="txt-uppercase">Subscribers</strong>
 
     <p class="margin-none-block-start margin-block-end-half">
-      <%= pluralize(@bubble.watchers.count, "person") %> will be notified when someone comments on this.
+      <%= pluralize(@card.watchers.count, "person") %> will be notified when someone comments on this.
     </p>
 
     <div class="flex align-center flex-wrap gap-half max-width txt-normal">
-      <% prepend_current_user_to(@bubble.watchers.alphabetically).each do |watcher| %>
+      <% prepend_current_user_to(@card.watchers.alphabetically).each do |watcher| %>
         <%= avatar_tag watcher %>
       <% end %>
     </div>
diff --git a/app/views/cards/_publish.html.erb b/app/views/cards/_publish.html.erb
new file mode 100644
index 000000000..1f2199ece
--- /dev/null
+++ b/app/views/cards/_publish.html.erb
@@ -0,0 +1,3 @@
+<%= button_to card_publish_path(card), class: "btn txt-small btn--link", style: "--btn-background: #{card.color}" do %>
+  <span>Post to project</span>
+<% end %>
diff --git a/app/views/cards/assignments/create.turbo_stream.erb b/app/views/cards/assignments/create.turbo_stream.erb
new file mode 100644
index 000000000..db92a0e18
--- /dev/null
+++ b/app/views/cards/assignments/create.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.replace([ @card, :assignees ], partial: "cards/cards/perma/assignees", locals: { card: @card }) %>
diff --git a/app/views/bubbles/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
similarity index 59%
rename from app/views/bubbles/assignments/new.html.erb
rename to app/views/cards/assignments/new.html.erb
index 286573068..7c8f2109b 100644
--- a/app/views/bubbles/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -1,12 +1,12 @@
-<%= turbo_frame_tag @bubble, :assignment do %>
+<%= turbo_frame_tag @card, :assignment do %>
   <dialog class="popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog">
     <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
 
     <div class="flex flex-column full-width popup__list">
-      <% @bubble.bucket.users.active.alphabetically.each do |user| %>
-          <%= button_to bubble_assignments_path(@bubble, params: { assignee_id: user.id }), method: :post, class: "btn popup__item full-width" do %>
+      <% @card.collection.users.active.alphabetically.each do |user| %>
+          <%= button_to card_assignments_path(@card, params: { assignee_id: user.id }), method: :post, class: "btn popup__item full-width" do %>
             <span class="overflow-ellipsis"><%= user.name %></span>
-            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.assignees.include?(user) %>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @card.assignees.include?(user) %>
           <% end %>
       <% end %>
     </div>
diff --git a/app/views/cards/boosts/_boosts.html.erb b/app/views/cards/boosts/_boosts.html.erb
new file mode 100644
index 000000000..7c496fee7
--- /dev/null
+++ b/app/views/cards/boosts/_boosts.html.erb
@@ -0,0 +1,10 @@
+<%= form_with url: card_boosts_path(card), class: "pad-inline flex align-center gap" do %>
+  <span class="overflow-ellipsis">
+    <strong><%= number_field_tag :boost_count, card.boosts_count, min: 1, class: "boost__input input", autocomplete: "off" %></strong>
+    <span><%= card.boosts_count == 1 ? "boost" : "boosts" %></span>
+  </span>
+  <%= tag.button class: "btn", type: :submit, style: "font-size: 0.4em" do %>
+    <%= icon_tag "add" %>
+    <span class="for-screen-reader">Boost</span>
+  <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/cards/boosts/create.turbo_stream.erb b/app/views/cards/boosts/create.turbo_stream.erb
new file mode 100644
index 000000000..41ad2443e
--- /dev/null
+++ b/app/views/cards/boosts/create.turbo_stream.erb
@@ -0,0 +1,7 @@
+<%= turbo_stream.update dom_id(@card, :boosts) do %>
+  <%= render "cards/boosts/boosts", card: @card %>
+<% end %>
+
+<%= turbo_stream.replace dom_id(@card, :messages) do %>
+  <%= render "cards/messages", card: @card %>
+<% end %>
diff --git a/app/views/cards/cards/_mini.html.erb b/app/views/cards/cards/_mini.html.erb
new file mode 100644
index 000000000..01eeffd2c
--- /dev/null
+++ b/app/views/cards/cards/_mini.html.erb
@@ -0,0 +1,22 @@
+<div class="card card--mini shadow border flex gap position-relative txt-align-start full-width border-radius" style="view-transition-name: <%= dom_id(card, :ticket) %>;">
+  <%= avatar_image_tag card.creator, class: "avatar" %>
+
+  <div class="card__body flex flex-column gap-half full-width flex-item-grow min-width max-width">
+    <h3 class="something-to-rename__title">
+      <%= card_title(card) %>
+    </h3>
+
+    <div class="txt-small overflow-ellipsis txt-uppercase"><%= "Added to #{card.collection.name} by #{card.creator.name}" %>
+      <%= local_datetime_tag(card.created_at, style: :daysago) %>
+    </div>
+
+    <div class="card__stuff flex align-center gap">
+      <%= render "cards/cards/mini/assignees", card: card %>
+      <div class="overflow-ellipsis"><%= render "cards/cards/mini/tags", card: card %></div>
+    </div>
+  </div>
+
+  <%= link_to collection_card_path(card.collection, card), class: "card__link" do %>
+    <span class="for-screen-reader"><%= card_title(card) %></span>
+  <% end %>
+</div>
diff --git a/app/views/cards/cards/_perma.html.erb b/app/views/cards/cards/_perma.html.erb
new file mode 100644
index 000000000..faf4c0451
--- /dev/null
+++ b/app/views/cards/cards/_perma.html.erb
@@ -0,0 +1,44 @@
+<% cache card do %>
+  <article class="card shadow border flex flex-column position-relative txt-align-start border-radius"
+      style="--card-color: <%= card.color %>; view-transition-name: <%= dom_id(card, :ticket) %>;"
+      id="<%= dom_id(card, :ticket) %>">
+    <header class="card__header flex align-center gap min-width">
+      <%= link_to card.collection.name, cards_path(collection_ids: [card.collection]),
+            class: "card__collection txt-uppercase overflow-ellipsis txt-reversed" %>
+
+      <%= render "cards/cards/perma/tags", card: card %>
+    </header>
+
+    <div class="card__body flex gap full-width flex-item-grow">
+      <div class="card__body-header">
+        <h1 class="something-to-rename__title">
+          <% if card.published? %>
+            <%= turbo_frame_tag card, :edit do %>
+              <%= link_to card_title(card), edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
+            <% end %>
+          <% else %>
+            <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", data: { controller: "auto-save" } do |form| %>
+              <%= form.text_area :title, placeholder: "Name it…",
+                    class: "input input--textarea full-width borderless txt-align-start #{ "fill-highlight" if card.creating? }",
+                    autofocus: card.title.blank?,
+                    data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
+            <% end %>
+          <% end %>
+        </h1>
+      </div>
+
+      <% if card.doing? %>
+        <%= turbo_frame_tag dom_id(@card, :stages) do %>
+          <%= render "cards/stagings/stages", card: card %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <footer class="card__footer full-width flex align-start gap">
+      <%= render "cards/cards/perma/people", card: card %>
+      <%= render "cards/cards/perma/meta", card: card %>
+    </footer>
+
+    <%= render "cards/cards/common/background", card: card %>
+  </article>
+<% end %>
diff --git a/app/views/cards/cards/_preview.html.erb b/app/views/cards/cards/_preview.html.erb
new file mode 100644
index 000000000..1eab911ff
--- /dev/null
+++ b/app/views/cards/cards/_preview.html.erb
@@ -0,0 +1,31 @@
+<% cache [ card ] do %>
+  <article class="card shadow border flex flex-column position-relative txt-align-start full-width border-radius"
+    style="--card-color: <%= card.color %>; view-transition-name: <%= dom_id(card, :ticket) %>;"
+    id="<%= dom_id(card, :ticket) %>">
+    <header class="card__header flex align-center gap min-width">
+      <span class="card__collection txt-uppercase overflow-ellipsis txt-reversed"><%= card.collection.name %></span>
+      <%= render "cards/cards/preview/tags", card: card %>
+    </header>
+
+    <div class="card__body flex gap full-width flex-item-grow">
+      <div class="card__body-header">
+        <h1 class="something-to-rename__title">
+          <span class="card__title-link overflow-line-clamp"><%= card_title(card) %></span>
+        </h1>
+      </div>
+
+      <%= link_to collection_card_path(card.collection, card), class: "card__link" do %>
+        <span class="for-screen-reader"><%= card_title(card) %></span>
+      <% end %>
+
+      <%= render "cards/stagings/stages", card: card if card.doing? %>
+    </div>
+
+    <footer class="card__footer full-width flex align-start gap">
+      <%= render "cards/cards/preview/people", card: card %>
+      <%= render "cards/cards/preview/meta", card: card %>
+    </footer>
+
+    <%= render "cards/cards/common/background", card: card %>
+  </article>
+<% end %>
diff --git a/app/views/bubbles/cards/common/_assignees.html.erb b/app/views/cards/cards/common/_assignees.html.erb
similarity index 55%
rename from app/views/bubbles/cards/common/_assignees.html.erb
rename to app/views/cards/cards/common/_assignees.html.erb
index 5286fe816..78d9e605b 100644
--- a/app/views/bubbles/cards/common/_assignees.html.erb
+++ b/app/views/cards/cards/common/_assignees.html.erb
@@ -1,10 +1,10 @@
-<div class="flex" id="<%= dom_id(bubble, :assignees) %>">
-  <% bubble.assignees.each do |assignee| %>
+<div class="flex" id="<%= dom_id(card, :assignees) %>">
+  <% card.assignees.each do |assignee| %>
     <%= avatar_tag assignee, class: "avatar" %>
   <% end %>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="btn card__hide-on-index <%= bubble.creating? || bubble.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+    <button class="btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
       <%= icon_tag "add" %>
       <span class="for-screen-reader">Assign</span>
     </button>
diff --git a/app/views/cards/cards/common/_background.html.erb b/app/views/cards/cards/common/_background.html.erb
new file mode 100644
index 000000000..cb4335108
--- /dev/null
+++ b/app/views/cards/cards/common/_background.html.erb
@@ -0,0 +1,11 @@
+<div class="card__background">
+  <%= image_tag card.image.presence || "", size: 120, data: { upload_preview_target: "image" } %>
+</div>
+
+<% if card.closed? %>
+  <div class="card__closed flex flex-column">
+    <span class="card__closed-title txt-uppercase"><%= card.closure.reason %></span>
+    <strong><%= card.closed_at.strftime("%b %d, %Y") %></strong>
+    <span>by <span class="card__closed-by"><%= card.closed_by.name %></span></span>
+  </div>
+<% end %>
diff --git a/app/views/bubbles/cards/common/_meta.html.erb b/app/views/cards/cards/common/_meta.html.erb
similarity index 59%
rename from app/views/bubbles/cards/common/_meta.html.erb
rename to app/views/cards/cards/common/_meta.html.erb
index 3efe7970d..b17e27e46 100644
--- a/app/views/bubbles/cards/common/_meta.html.erb
+++ b/app/views/cards/cards/common/_meta.html.erb
@@ -1,18 +1,18 @@
 <div class="card__meta flex txt-tight-lines txt-uppercase">
   <div class="flex flex-column gap txt-align-end">
-    <span class="pad-inline overflow-ellipsis"><%= bubble.creating? ? "Added" : "Updated" %>
-      <%= local_datetime_tag(bubble.updated_at, style: :daysago) %>
+    <span class="pad-inline overflow-ellipsis"><%= card.creating? ? "Added" : "Updated" %>
+      <%= local_datetime_tag(card.updated_at, style: :daysago) %>
     </span>
 
     <hr class="full-width separator--horizontal unpad margin-none">
 
-    <% if bubble.creating? %>
+    <% if card.creating? %>
       <span class="pad-inline overflow-ellipsis">Expires
-        <%= local_datetime_tag(bubble.auto_pop_at, style: :indays) %>
+        <%= local_datetime_tag(card.auto_closure_at, style: :indays) %>
       </span>
     <% else %>
       <span class="pad-inline overflow-ellipsis">Added
-        <%= local_datetime_tag(bubble.created_at, style: :daysago) %>
+        <%= local_datetime_tag(card.created_at, style: :daysago) %>
       </span>
     <% end %>
   </div>
@@ -21,7 +21,7 @@
 
   <div class="flex flex-column gap txt-align-start">
     <span class="pad-inline overflow-ellipsis">
-      <strong><%= bubble.comments_count %></strong> <%= bubble.comments_count == 1 ? "comment" : "comments" %>
+      <strong><%= card.comments_count %></strong> <%= card.comments_count == 1 ? "comment" : "comments" %>
     </span>
 
     <hr class="full-width separator--horizontal unpad margin-none">
diff --git a/app/views/bubbles/cards/common/_people.html.erb b/app/views/cards/cards/common/_people.html.erb
similarity index 84%
rename from app/views/bubbles/cards/common/_people.html.erb
rename to app/views/cards/cards/common/_people.html.erb
index ea4645be5..dacf301ce 100644
--- a/app/views/bubbles/cards/common/_people.html.erb
+++ b/app/views/cards/cards/common/_people.html.erb
@@ -1,7 +1,7 @@
 <div class="card__people flex gap margin-inline-start">
   <div class="flex flex-column align-center">
     <span class="txt-uppercase">Reported</span>
-    <%= avatar_tag bubble.creator, class: "avatar" %>
+    <%= avatar_tag card.creator, class: "avatar" %>
   </div>
 
   <div class="card__assignees flex flex-column align-center">
diff --git a/app/views/bubbles/cards/mini/_assignees.html.erb b/app/views/cards/cards/mini/_assignees.html.erb
similarity index 58%
rename from app/views/bubbles/cards/mini/_assignees.html.erb
rename to app/views/cards/cards/mini/_assignees.html.erb
index 750894f53..e007f4bc7 100644
--- a/app/views/bubbles/cards/mini/_assignees.html.erb
+++ b/app/views/cards/cards/mini/_assignees.html.erb
@@ -1,11 +1,11 @@
-<%= turbo_frame_tag bubble, :assignees do %>
+<%= turbo_frame_tag card, :assignees do %>
   <div class="flex">
-    <% bubble.assignees.each do |assignee| %>
+    <% card.assignees.each do |assignee| %>
       <%= avatar_tag assignee, class: "avatar" %>
     <% end %>
 
     <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-      <button class="btn card__hide-on-index <%= bubble.creating? || bubble.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+      <button class="btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
         <%= icon_tag "add" %>
         <span class="for-screen-reader">Assign</span>
       </button>
diff --git a/app/views/cards/cards/mini/_tags.html.erb b/app/views/cards/cards/mini/_tags.html.erb
new file mode 100644
index 000000000..5d85c261b
--- /dev/null
+++ b/app/views/cards/cards/mini/_tags.html.erb
@@ -0,0 +1 @@
+<%= render "cards/cards/preview/tags", card: card %>
diff --git a/app/views/cards/cards/perma/_assignees.html.erb b/app/views/cards/cards/perma/_assignees.html.erb
new file mode 100644
index 000000000..8872d66d3
--- /dev/null
+++ b/app/views/cards/cards/perma/_assignees.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/cards/common/assignees", card: card do %>
+  <%= turbo_frame_tag card, :assignment, src: new_card_assignment_path(card) %>
+<% end %>
diff --git a/app/views/cards/cards/perma/_boosts.html.erb b/app/views/cards/cards/perma/_boosts.html.erb
new file mode 100644
index 000000000..1e70de0bb
--- /dev/null
+++ b/app/views/cards/cards/perma/_boosts.html.erb
@@ -0,0 +1,3 @@
+<%= turbo_frame_tag dom_id(card, :boosts) do %>
+  <%= render "cards/boosts/boosts", card: card %>
+<% end %>
diff --git a/app/views/cards/cards/perma/_meta.html.erb b/app/views/cards/cards/perma/_meta.html.erb
new file mode 100644
index 000000000..ffd524d83
--- /dev/null
+++ b/app/views/cards/cards/perma/_meta.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/cards/common/meta", card: card do %>
+  <%= render "cards/cards/perma/boosts", card: card %>
+<% end %>
diff --git a/app/views/cards/cards/perma/_people.html.erb b/app/views/cards/cards/perma/_people.html.erb
new file mode 100644
index 000000000..c35da116b
--- /dev/null
+++ b/app/views/cards/cards/perma/_people.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/cards/common/people", card: card do%>
+  <%= render "cards/cards/perma/assignees", card: card %>
+<% end %>
diff --git a/app/views/bubbles/cards/perma/_tags.html.erb b/app/views/cards/cards/perma/_tags.html.erb
similarity index 50%
rename from app/views/bubbles/cards/perma/_tags.html.erb
rename to app/views/cards/cards/perma/_tags.html.erb
index 1f51d64db..b2dc3fea7 100644
--- a/app/views/bubbles/cards/perma/_tags.html.erb
+++ b/app/views/cards/cards/perma/_tags.html.erb
@@ -1,22 +1,22 @@
-<div id="<%= dom_id(bubble, :tags) %>" class="card__tags flex align-center flex-item-grow min-width">
+<div id="<%= dom_id(card, :tags) %>" class="something-to-rename__tags flex align-center flex-item-grow min-width">
   <div class="overflow-ellipsis">
-    <% if bubble.tags.any? || bubble.creating? %>
+    <% if card.tags.any? || card.creating? %>
       <span># </span>
-      <% bubble.tags.each_with_index do |tag, index| %>
-        <%= link_to bubbles_path(bucket_ids: [ bubble.bucket ], tag_ids: [ tag.id ]),
+      <% card.tags.each_with_index do |tag, index| %>
+        <%= link_to cards_path(collection_ids: [ card.collection ], tag_ids: [ tag.id ]),
               class: "card__tag btn btn--plain min-width txt-uppercase fill-transparent" do %>
           <span class="overflow-ellipsis"><%= tag.title %></span>
-        <% end %><%= ", " unless index == bubble.tags.size - 1 %>
+        <% end %><%= ", " unless index == card.tags.size - 1 %>
       <% end %>
     <% end %>
   </div>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="tag-picker__button btn card__hide-on-index <%= bubble.creating? || bubble.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
+    <button class="tag-picker__button btn card__hide-on-index <%= card.creating? || card.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
       <%= icon_tag "tag" %>
       <span class="for-screen-reader">Add a tag</span>
     </button>
 
-    <%= turbo_frame_tag bubble, :tagging, src: new_bubble_tagging_path(bubble) %>
+    <%= turbo_frame_tag card, :tagging, src: new_card_tagging_path(card) %>
   </div>
 </div>
diff --git a/app/views/cards/cards/preview/_assignees.html.erb b/app/views/cards/cards/preview/_assignees.html.erb
new file mode 100644
index 000000000..5f4ced1ff
--- /dev/null
+++ b/app/views/cards/cards/preview/_assignees.html.erb
@@ -0,0 +1 @@
+<%= render "cards/cards/common/assignees", card: card  %>
diff --git a/app/views/cards/cards/preview/_boosts.html.erb b/app/views/cards/cards/preview/_boosts.html.erb
new file mode 100644
index 000000000..6bdee6e61
--- /dev/null
+++ b/app/views/cards/cards/preview/_boosts.html.erb
@@ -0,0 +1,8 @@
+<%= turbo_frame_tag dom_id(card, :boosts) do %>
+  <%= tag.div class: "pad-inline flex align-center gap" do %>
+    <span class="overflow-ellipsis">
+      <strong><%= card.boosts_count %></strong>
+      <span><%= card.boosts_count == 1 ? "boost" : "boosts" %></span>
+    </span>
+  <% end %>
+<% end %>
diff --git a/app/views/cards/cards/preview/_meta.html.erb b/app/views/cards/cards/preview/_meta.html.erb
new file mode 100644
index 000000000..c2b2d1fdf
--- /dev/null
+++ b/app/views/cards/cards/preview/_meta.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/cards/common/meta", card: card do %>
+  <%= render "cards/cards/preview/boosts", card: card %>
+<% end %>
diff --git a/app/views/cards/cards/preview/_people.html.erb b/app/views/cards/cards/preview/_people.html.erb
new file mode 100644
index 000000000..3647b9089
--- /dev/null
+++ b/app/views/cards/cards/preview/_people.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/cards/common/people", card: card do%>
+  <%= render "cards/cards/preview/assignees", card: card %>
+<% end %>
diff --git a/app/views/bubbles/cards/preview/_stages.html.erb b/app/views/cards/cards/preview/_stages.html.erb
similarity index 77%
rename from app/views/bubbles/cards/preview/_stages.html.erb
rename to app/views/cards/cards/preview/_stages.html.erb
index 89e1af661..d320f5711 100644
--- a/app/views/bubbles/cards/preview/_stages.html.erb
+++ b/app/views/cards/cards/preview/_stages.html.erb
@@ -1,9 +1,9 @@
-<% workflow = bubble.bucket.workflow %>
+<% workflow = card.collection.workflow %>
 
 <% if workflow %>
   <div class="card__stages flex flex-column max-width min-width pad-block">
     <% workflow.stages.each do |stage| %>
-      <%= tag.span stage.name, class: ["overflow-ellipsis btn full-width justify-start workflow-stage txt-uppercase", { "workflow-stage--current": stage == bubble.stage }] %>
+      <%= tag.span stage.name, class: ["overflow-ellipsis btn full-width justify-start workflow-stage txt-uppercase", { "workflow-stage--current": stage == card.stage }] %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/cards/cards/preview/_tags.html.erb b/app/views/cards/cards/preview/_tags.html.erb
new file mode 100644
index 000000000..b65a804ee
--- /dev/null
+++ b/app/views/cards/cards/preview/_tags.html.erb
@@ -0,0 +1,12 @@
+<div class="something-to-rename__tags flex align-center flex-item-grow min-width">
+  <div class="overflow-ellipsis">
+    <% if card.tags.any?  %>
+      <span># </span>
+      <% card.tags.each_with_index do |tag, index| %>
+          <span class="something-to-rename__tag btn btn--plain min-width txt-uppercase fill-transparent overflow-ellipsis">
+            <%= tag.title %>
+          </span>
+      <% end %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/bubbles/edit.html.erb b/app/views/cards/edit.html.erb
similarity index 68%
rename from app/views/bubbles/edit.html.erb
rename to app/views/cards/edit.html.erb
index d6bd9a8e4..db9ae674d 100644
--- a/app/views/bubbles/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -1,5 +1,5 @@
-<%= turbo_frame_tag @bubble, :edit do %>
-  <%= form_with model: @bubble, url: bucket_bubble_path(@bubble.bucket, @bubble), class: "flex flex-column gap full-width", data: { controller: "form" } do |form| %>
+<%= turbo_frame_tag @card, :edit do %>
+  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "flex flex-column gap full-width", data: { controller: "form" } do |form| %>
     <%= form.label :title, class: "flex flex-column align-center" do %>
       <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card__title-field",
           required: true, autofocus: true, placeholder: "Name it…",
@@ -8,6 +8,6 @@
           style: "color: var(--spat-color); --input-border-radius: 0" %>
     <% end %>
     <%= form.button "Save", type: :submit, hidden: true %>
-    <%= link_to "Close editor and discard changes", bucket_bubble_path(@bubble.bucket, @bubble), data: { form_target: "cancel" }, hidden: true %>
+    <%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>
diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb
new file mode 100644
index 000000000..2b0b035b0
--- /dev/null
+++ b/app/views/cards/index.html.erb
@@ -0,0 +1,14 @@
+<% @page_title = @filter.summary %>
+
+<%= render "filters/broadcasts", filter: @filter %>
+
+<% content_for :header do %>
+  <%= render "cards/index/header", filter: @filter %>
+<% end %>
+
+<div class="cards--columns">
+  <%= render "cards/index/cards/considering", cards: @considering_cards %>
+  <%= render "cards/index/cards/doing", cards: @doing_cards, filter: @filter %>
+</div>
+
+<%= render "cards/index/cards/closed", cards: @closed_cards, filter: @filter %>
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
new file mode 100644
index 000000000..b81481ad7
--- /dev/null
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -0,0 +1,23 @@
+<%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
+      data: { controller: "form" } do |form| %>
+  <% filter.as_params.except(:collection_ids).each do |key, value| %>
+    <%= filter_hidden_field_tag key, value %>
+  <% end %>
+
+  <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item" do %>
+    <span class="overflow-ellipsis">All collections</span>
+  <% end %>
+
+  <% Current.user.collections.order(:name).each do |collection| %>
+    <div class="btn popup__item">
+      <%= form.check_box "collection_ids[]", {
+            checked: filter.collections.include?(collection),
+            data: { action: "change->form#submit" },
+            include_hidden: false,
+      }, collection.id %>
+
+      <%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
+      <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/bubbles/index/_header.html.erb b/app/views/cards/index/_header.html.erb
similarity index 59%
rename from app/views/bubbles/index/_header.html.erb
rename to app/views/cards/index/_header.html.erb
index 3275e94a2..ca0db0cc6 100644
--- a/app/views/bubbles/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -5,7 +5,7 @@
   <div class="btn btn--placeholder flex-item-justify-start"></div>
 
   <header class="flex flex-inline flex-column center flex-shrink">
-    <div class="card-bucket__filter flex-inline center position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
+    <div class="card-collection__filter flex-inline center position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
       <button class="txt-align-center input input--select borderless center txt-medium" data-action="click->dialog#open:stop">
         <h1 class="txt-large overflow-ellipsis margin-none">
           <%= filter_title filter %>
@@ -15,26 +15,26 @@
       <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
         <strong class="popup__title margin-block-start-half pad-inline-half">In Collection</strong>
 
-        <%= render "bubbles/index/buckets_filter", filter: filter %>
+        <%= render "cards/index/collections_filter", filter: filter %>
       </dialog>
     </div>
 
-    <%= render "bubbles/index/sorting_options", filter: filter %>
+    <%= render "cards/index/sorting_options", filter: filter %>
   </header>
 
-  <% if bucket = filter.single_bucket %>
+  <% if collection = filter.single_collection %>
     <div class="flex-item-justify-end">
-      <%= access_involvement_advance_button bucket, Current.user %>
+      <%= access_involvement_advance_button collection, Current.user %>
     </div>
 
-    <%= link_to edit_bucket_path(bucket), class: "btn" do %>
+    <%= link_to edit_collection_path(collection), class: "btn" do %>
       <%= icon_tag "settings" %>
-      <span class="for-screen-reader">Settings for <%= bucket.name %></span>
+      <span class="for-screen-reader">Settings for <%= collection.name %></span>
     <% end %>
 
-    <%= button_to bucket_bubbles_path(bucket), method: :post, class: "btn" do %>
+    <%= button_to collection_cards_path(collection), method: :post, class: "btn" do %>
       <%= icon_tag "add" %>
-      <span class="for-screen-reader">Create a new bubble</span>
+      <span class="for-screen-reader">Create a new card</span>
     <% end %>
   <% else %>
     <div class="btn btn--placeholder flex-item-justify-end"></div>
diff --git a/app/views/bubbles/index/_sorting_options.html.erb b/app/views/cards/index/_sorting_options.html.erb
similarity index 90%
rename from app/views/bubbles/index/_sorting_options.html.erb
rename to app/views/cards/index/_sorting_options.html.erb
index 3aea87823..9f88b4902 100644
--- a/app/views/bubbles/index/_sorting_options.html.erb
+++ b/app/views/cards/index/_sorting_options.html.erb
@@ -1,5 +1,5 @@
 <div class="card-sorting__filter flex-inline">
-  <%= form_with url: bubbles_path, method: :get do |form| %>
+  <%= form_with url: cards_path, method: :get do |form| %>
     <% filter.as_params.except(:indexed_by).each do |key, value| %>
       <%= filter_hidden_field_tag key, value %>
     <% end %>
diff --git a/app/views/bubbles/index/_workflow_filter.html.erb b/app/views/cards/index/_workflow_filter.html.erb
similarity index 89%
rename from app/views/bubbles/index/_workflow_filter.html.erb
rename to app/views/cards/index/_workflow_filter.html.erb
index fd078736e..7c9df340e 100644
--- a/app/views/bubbles/index/_workflow_filter.html.erb
+++ b/app/views/cards/index/_workflow_filter.html.erb
@@ -13,13 +13,13 @@
     aria-label="In stage…" aria-description="In stage…"
     data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
     <strong class="popup__title margin-block-start-half pad-inline-half">In stage(s)…</strong>
-    <%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
+    <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
           data: { controller: "form" } do |form| %>
       <% filter.as_params.except(:stage_ids).each do |key, value| %>
         <%= filter_hidden_field_tag key, value %>
       <% end %>
 
-      <%= link_to bubbles_path(filter.as_params.except(:stage_ids)), class: "btn popup__item" do %>
+      <%= link_to cards_path(filter.as_params.except(:stage_ids)), class: "btn popup__item" do %>
         <span class="overflow-ellipsis">All stages</span>
       <% end %>
 
diff --git a/app/views/bubbles/index/bubbles/_popped.html.erb b/app/views/cards/index/cards/_closed.html.erb
similarity index 68%
rename from app/views/bubbles/index/bubbles/_popped.html.erb
rename to app/views/cards/index/cards/_closed.html.erb
index 877c5bbee..7c53916dd 100644
--- a/app/views/bubbles/index/bubbles/_popped.html.erb
+++ b/app/views/cards/index/cards/_closed.html.erb
@@ -4,8 +4,8 @@
   </h2>
 
   <section class="cards--grid">
-    <% if bubbles.any? %>
-      <%= render partial: "bubbles/cards/preview", collection: bubbles, as: :bubble, cached: true %>
+    <% if cards.any? %>
+      <%= render partial: "cards/cards/preview", collection: cards, as: :card, cached: true %>
     <% else %>
       <p class="txt-medium translucent">Nothing here</p>
     <% end %>
diff --git a/app/views/bubbles/index/bubbles/_considering.html.erb b/app/views/cards/index/cards/_considering.html.erb
similarity index 73%
rename from app/views/bubbles/index/bubbles/_considering.html.erb
rename to app/views/cards/index/cards/_considering.html.erb
index 972481b6e..9f184eb63 100644
--- a/app/views/bubbles/index/bubbles/_considering.html.erb
+++ b/app/views/cards/index/cards/_considering.html.erb
@@ -3,8 +3,8 @@
     Considering
   </h2>
 
-  <% if bubbles.any? %>
-    <%= render partial: "bubbles/cards/mini", collection: bubbles, as: :bubble, cached: true %>
+  <% if cards.any? %>
+    <%= render partial: "cards/cards/mini", collection: cards, as: :card, cached: true %>
   <% else %>
     <p class="txt-medium translucent">Nothing here</p>
   <% end %>
diff --git a/app/views/bubbles/index/bubbles/_doing.html.erb b/app/views/cards/index/cards/_doing.html.erb
similarity index 60%
rename from app/views/bubbles/index/bubbles/_doing.html.erb
rename to app/views/cards/index/cards/_doing.html.erb
index b8a73d4be..644ac5f63 100644
--- a/app/views/bubbles/index/bubbles/_doing.html.erb
+++ b/app/views/cards/index/cards/_doing.html.erb
@@ -1,14 +1,14 @@
-<section class="cards gap position-relative" style="align-items: center; view-transition-name: cards-container;" data-controller="bubble-size" data-action="turbo:morph@window->bubble-size#resize">
+<section class="cards gap position-relative" style="align-items: center; view-transition-name: cards-container;" data-controller="card-size" data-action="turbo:morph@window->card-size#resize">
   <% if workflow = filter.single_workflow %>
-    <%= render "bubbles/index/workflow_filter", workflow: workflow, filter: filter %>
+    <%= render "cards/index/workflow_filter", workflow: workflow, filter: filter %>
   <% else %>
     <h2 class="txt-align-center flex-inline center txt-uppercase txt-medium margin-none-block-start margin-block-end">
       Doing
     </h2>
   <% end %>
 
-  <% if bubbles.any? %>
-    <%= render partial: "bubbles/cards/preview", collection: bubbles, as: :bubble, cached: true %>
+  <% if cards.any? %>
+    <%= render partial: "cards/cards/preview", collection: cards, as: :card, cached: true %>
   <% else %>
     <p class="txt-medium translucent">Nothing here</p>
   <% end %>
diff --git a/app/views/bubbles/pins/show.html.erb b/app/views/cards/pins/show.html.erb
similarity index 50%
rename from app/views/bubbles/pins/show.html.erb
rename to app/views/cards/pins/show.html.erb
index 5a8852a03..64eb1ad5c 100644
--- a/app/views/bubbles/pins/show.html.erb
+++ b/app/views/cards/pins/show.html.erb
@@ -1,11 +1,11 @@
-<%= turbo_frame_tag dom_id(@bubble, :pin) do %>
-  <% if @bubble.pinned_by? Current.user %>
-    <%= button_to bubble_pin_path(@bubble), method: :delete, class: "btn btn--reversed" do %>
+<%= turbo_frame_tag dom_id(@card, :pin) do %>
+  <% if @card.pinned_by? Current.user %>
+    <%= button_to card_pin_path(@card), method: :delete, class: "btn btn--reversed" do %>
       <%= icon_tag "pinned" %>
       <span class="for-screen-reader">Un-pin this card</span>
     <% end %>
   <% else %>
-    <%= button_to bubble_pin_path(@bubble), class: "btn" do %>
+    <%= button_to card_pin_path(@card), class: "btn" do %>
       <%= icon_tag "unpinned" %>
       <span class="for-screen-reader">Pin this card</span>
     <% end %>
diff --git a/app/views/bubbles/readings/create.turbo_stream.erb b/app/views/cards/readings/create.turbo_stream.erb
similarity index 100%
rename from app/views/bubbles/readings/create.turbo_stream.erb
rename to app/views/cards/readings/create.turbo_stream.erb
diff --git a/app/views/bubbles/show.html.erb b/app/views/cards/show.html.erb
similarity index 58%
rename from app/views/bubbles/show.html.erb
rename to app/views/cards/show.html.erb
index 660a334c0..e00ca579e 100644
--- a/app/views/bubbles/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -1,32 +1,32 @@
-<% @page_title = bubble_title(@bubble) %>
+<% @page_title = card_title(@card) %>
 
 <% content_for :header do %>
-  <% if @bubble.creating? && @bubble.can_recover_abandoned_creation? %>
+  <% if @card.creating? && @card.can_recover_abandoned_creation? %>
     <div class="fill-selected position-sticky flex align-center gap-half justify-center border-block margin-block-end"
-          style="view-transition-name: draft-banner; --bubble-color: <%= @bubble.color %>;">
+          style="view-transition-name: draft-banner; --card-color: <%= @card.color %>;">
       You have an unsaved work. Would you like to continue where you left off?
-      <%= button_to bubble_recover_path(@bubble), class: "btn btn--reversed", data: { turbo_action: "replace" } do %>
+      <%= button_to card_recover_path(@card), class: "btn btn--reversed", data: { turbo_action: "replace" } do %>
         <span>Restore</span>
       <% end %>
     </div>
   <% end %>
 
-  <% if @bubble.drafted? %>
+  <% if @card.drafted? %>
     <div class="fill-selected position-sticky flex align-center gap-half fill-highlight justify-center border-block margin-block-end"
           style="view-transition-name: draft-banner;">
       This is a draft, it’s only visible to you.
-      <%= render "bubbles/publish", bubble: @bubble %>
+      <%= render "cards/publish", card: @card %>
     </div>
   <% end %>
 
   <nav class="align-start max-width">
     <%= link_to_home %>
-    <%= link_to_back fallback_path: bubbles_path(bucket_id: @bubble.bucket) %>
+    <%= link_to_back fallback_path: cards_path(collection_id: @card.collection) %>
 
-    <div class="card__actions-container card__actions-container--top center flex align-center gap border-radius" style="--bubble-color: <%= @bubble.color %>;">
+    <div class="something-to-rename__actions-container card__actions-container--top center flex align-center gap border-radius" style="--card-color: <%= @card.color %>;">
       <strong class="txt-uppercase">Considering</strong>
-      <% if @bubble.doing? %>
-        <%= form_with url: bubble_engagement_path(@bubble), method: :delete, data: { controller: "form" }, class: "flex" do %>
+      <% if @card.doing? %>
+        <%= form_with url: card_engagement_path(@card), method: :delete, data: { controller: "form" }, class: "flex" do %>
           <label class="switch flex-item-no-shrink">
             <input type="checkbox" class="switch__input" data-action="form#submit" checked>
             <span class="switch__btn round"></span>
@@ -34,7 +34,7 @@
           </label>
         <% end %>
       <% else %>
-        <%= form_with url: bubble_engagement_path(@bubble), method: :post, data: { controller: "form" }, class: "flex" do %>
+        <%= form_with url: card_engagement_path(@card), method: :post, data: { controller: "form" }, class: "flex" do %>
           <label class="switch flex-item-no-shrink">
             <input type="checkbox" class="switch__input" data-action="form#submit">
             <span class="switch__btn round"></span>
@@ -50,9 +50,9 @@
   </nav>
 <% end %>
 
-<div data-controller="beacon" data-beacon-url-value="<%= bubble_reading_url(@bubble) %>">
-  <div class="card__container position-relative <%= "card__container--pointing" unless @bubble.published? %>" style="--bubble-color: <%= @bubble.color %>;">
-    <%= render "bubbles/cards/perma", bubble: @bubble %>
+<div data-controller="beacon" data-beacon-url-value="<%= card_reading_url(@card) %>">
+  <div class="card__container position-relative <%= "card__container--pointing" unless @card.published? %>" style="--card-color: <%= @card.color %>;">
+    <%= render "cards/cards/perma", card: @card %>
 
     <div class="card__actions flex flex-column gap-half">
       <button class="car__star-button btn">
@@ -61,9 +61,9 @@
         <input type="checkbox" class="card__star-input">
       </button>
 
-      <%= render "bubbles/color", bubble: @bubble %>
-      <%= render "bubbles/image", bubble: @bubble %>
-      <%= button_to bucket_bubble_path(@bubble.bucket, @bubble),
+      <%= render "cards/color", card: @card %>
+      <%= render "cards/image", card: @card %>
+      <%= button_to collection_card_path(@card.collection, @card),
             method: :delete,
             class: "btn",
             data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
@@ -73,22 +73,22 @@
     </div>
 
 
-    <% if @bubble.published? %>
+    <% if @card.published? %>
       <div class="card__actions card__actions--right flex flex-column gap-half">
-        <%= turbo_frame_tag dom_id(@bubble, :watch), src: bubble_watch_path(@bubble), refresh: :morph %>
-        <%= turbo_frame_tag dom_id(@bubble, :pin), src: bubble_pin_path(@bubble), refresh: :morph %>
+        <%= turbo_frame_tag dom_id(@card, :watch), src: card_watch_path(@card), refresh: :morph %>
+        <%= turbo_frame_tag dom_id(@card, :pin), src: card_pin_path(@card), refresh: :morph %>
       </div>
     <% end %>
   </div>
 
-  <% unless @bubble.drafted? || @bubble.creating? %>
+  <% unless @card.drafted? || @card.creating? %>
     <div class="card__actions-wrapper">
-      <%= render "bubbles/pop_toggle", bubble: @bubble %>
+      <%= render "cards/closure_toggle", card: @card %>
     </div>
   <% end %>
 
-  <% if @bubble.published? %>
-    <%= render "bubbles/messages", bubble: @bubble %>
+  <% if @card.published? %>
+    <%= render "cards/messages", card: @card %>
   <% else %>
     <div class="comments pad-block">
       <div class="comment comment--new flex-inline align-start full-width">
@@ -100,18 +100,18 @@
           <div class="comment__body txt-align-start">
             <form data-controller="outlet-auto-save paste"
                 class="flex flex-column gap full-width"
-                data-outlet-auto-save-auto-save-outlet="#bubble_form"
+                data-outlet-auto-save-auto-save-outlet="#card_form"
                 data-action="paste->paste#pasteFiles">
-              <%= tag.house_md @bubble.draft_comment, name: "bubble[draft_comment]", class: "input comment__input",
-                    form: "bubble_form",
-                    placeholder: new_comment_placeholder(@bubble),
+              <%= tag.house_md @card.draft_comment, name: "card[draft_comment]", class: "input comment__input",
+                    form: "card_form",
+                    placeholder: new_comment_placeholder(@card),
                     data: { action: "house-md:change->outlet-auto-save#change focusout->outlet-auto-save#submit", uploads_url: uploads_url(format: "json") } %>
             </form>
 
-            <% if @bubble.creating? %>
+            <% if @card.creating? %>
               <div class="margin-block-start flex align-center gap">
-                <%= button_to "Create card", bubble_publish_path(@bubble), class: "btn btn--reversed" %>
-                <%= button_to "Save as draft", bucket_bubble_path(@bubble.bucket, @bubble), name: "bubble[status]", value: "drafted", method: :put, class: "btn" %>
+                <%= button_to "Create card", card_publish_path(@card), class: "btn btn--reversed" %>
+                <%= button_to "Save as draft", collection_card_path(@card.collection, @card), name: "card[status]", value: "drafted", method: :put, class: "btn" %>
               </div>
             <% end %>
           </div>
diff --git a/app/views/cards/stagings/_stages.html.erb b/app/views/cards/stagings/_stages.html.erb
new file mode 100644
index 000000000..fe8f86869
--- /dev/null
+++ b/app/views/cards/stagings/_stages.html.erb
@@ -0,0 +1,9 @@
+<% workflow = card.collection.workflow %>
+
+<% if workflow  %>
+  <div id="<%= dom_id(card, "stages") %>" class="card__stages flex flex-column max-width min-width pad-block">
+    <% workflow.stages.each do |stage| %>
+      <%= button_to_set_stage card, stage %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/cards/stagings/create.turbo_stream.erb b/app/views/cards/stagings/create.turbo_stream.erb
new file mode 100644
index 000000000..e52906f74
--- /dev/null
+++ b/app/views/cards/stagings/create.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace dom_id(@card, "stages") do %>
+  <%= render partial: "cards/stagings/stages", locals: { card: @card } %>
+<% end %>
diff --git a/app/views/cards/taggings/create.turbo_stream.erb b/app/views/cards/taggings/create.turbo_stream.erb
new file mode 100644
index 000000000..770fa5882
--- /dev/null
+++ b/app/views/cards/taggings/create.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.replace([ @card, :tags ], partial: "cards/cards/perma/tags", locals: { card: @card }) %>
diff --git a/app/views/bubbles/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
similarity index 67%
rename from app/views/bubbles/taggings/new.html.erb
rename to app/views/cards/taggings/new.html.erb
index 4122a8f1d..6ff9f1306 100644
--- a/app/views/bubbles/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -1,8 +1,8 @@
-<%= turbo_frame_tag @bubble, :tagging do %>
+<%= turbo_frame_tag @card, :tagging do %>
   <dialog class="popup panel flex-column align-start justify-start fill-white shadow" data-dialog-target="dialog">
     <strong class="popup__title margin-block-half pad-inline-half">Tag this…</strong>
 
-    <%= form_with url: bubble_taggings_path(@bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %>
+    <%= form_with url: card_taggings_path(@card), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %>
       <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %>
       <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %>
         <%= icon_tag "add" %>
@@ -12,9 +12,9 @@
 
     <div class="flex flex-column full-width popup__list">
       <% @tags.each do |tag| %>
-          <%= button_to bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post, class: "btn full-width popup__item" do %>
+          <%= button_to card_taggings_path(@card, params: { tag_title: tag.title }), method: :post, class: "btn full-width popup__item" do %>
             <span class="overflow-ellipsis"><%= tag.hashtag %></span>
-            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @card.tagged_with?(tag) %>
         <% end %>
       <% end %>
     </div>
diff --git a/app/views/bubbles/tags/_listbox_option.html.erb b/app/views/cards/tags/_listbox_option.html.erb
similarity index 69%
rename from app/views/bubbles/tags/_listbox_option.html.erb
rename to app/views/cards/tags/_listbox_option.html.erb
index 712b94022..25b035d71 100644
--- a/app/views/bubbles/tags/_listbox_option.html.erb
+++ b/app/views/cards/tags/_listbox_option.html.erb
@@ -1,4 +1,4 @@
 <div class="flex gap-half justify-space-between align-center" style="--btn-icon-size: 1rem">
   <%= tag.hashtag %>
-  <%= icon_tag "check" if bubble.tagged_with?(tag) %>
+  <%= icon_tag "check" if card.tagged_with?(tag) %>
 </div>
diff --git a/app/views/cards/watches/show.html.erb b/app/views/cards/watches/show.html.erb
new file mode 100644
index 000000000..90c0b9af9
--- /dev/null
+++ b/app/views/cards/watches/show.html.erb
@@ -0,0 +1,13 @@
+<%= turbo_frame_tag dom_id(@card, :watch) do %>
+  <% if @card.watched_by? Current.user %>
+      <%= button_to card_watch_path(@card), method: :delete, class: "btn btn--reversed" do %>
+        <%= icon_tag "bell" %>
+        <span class="for-screen-reader">Stop watching</span>
+      <% end %>
+  <% else %>
+      <%= button_to card_watch_path(@card), class: "btn" do %>
+        <%= icon_tag "bell-off" %>
+        <span class="for-screen-reader">Watch this</span>
+      <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/buckets/_access_toggle.erb b/app/views/collections/_access_toggle.erb
similarity index 100%
rename from app/views/buckets/_access_toggle.erb
rename to app/views/collections/_access_toggle.erb
diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb
new file mode 100644
index 000000000..54c07b22f
--- /dev/null
+++ b/app/views/collections/_collection.html.erb
@@ -0,0 +1,27 @@
+<li class="collection flex flex-column txt-align-center max-width">
+  <%= link_to cards_path(collection_ids: [ collection ]),
+        class: "border border-radius margin-block-end-half cards__container flex justify-center align-center position-relative",
+        aria: { hidden: true }, tabindex: -1 do %>
+    <div class="cards collection__cards flex flex-wrap gap justify-center align-end" style="view-transition-name: cards_<%= collection.id %>">
+      <% collection.cards.active.published_or_drafted_by(Current.user).ordered_by_activity.limit(10).each do |card| %>
+        <div class="<%= class_names("card", drafted: card.drafted?) %>" style="--card-color: <%= card.color %>; <%= card_rotation(card) %>"
+          data-card-size-target="card"
+          data-activity-score="<%= card.activity_score %>"
+          data-activity-score-at="<%= card.activity_score_at.to_i %>">
+          <span class="something-to-rename__shape"></span>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <div class="flex align-center justify-center flex-column flex-wrap center gap-half position-relative full-width">
+    <%= link_to cards_path(collection_ids: [ collection ]), class: "txt-ink flex flex-column" do %>
+      <strong class="txt-large"><%= collection.name %></strong>
+    <% end %>
+
+    <%= link_to edit_collection_path(collection), class: "btn txt-small collection__button" do %>
+      <%= icon_tag "settings" %>
+      <span class="for-screen-reader">Settings for <%= collection.name %></span>
+    <% end %>
+  </div>
+</li>
diff --git a/app/views/buckets/edit.html.erb b/app/views/collections/edit.html.erb
similarity index 73%
rename from app/views/buckets/edit.html.erb
rename to app/views/collections/edit.html.erb
index c1a04ee59..84e7a7d54 100644
--- a/app/views/buckets/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -1,32 +1,32 @@
-<% @page_title = "Edit #{@bucket.name}" %>
+<% @page_title = "Edit #{@collection.name}" %>
 
 <% content_for :header do %>
   <nav>
-    <%= link_to_back fallback_path: bubbles_path(bucket_ids: [ @bbucket ]) %>
+    <%= link_to_back fallback_path: cards_path(collection_ids: [ @bbucket ]) %>
 
-    <%= form_with model: @bucket, class: "flex-item-justify-end", method: :delete do |form| %>
+    <%= form_with model: @collection, class: "flex-item-justify-end", method: :delete do |form| %>
       <%= form.button class: "btn btn--negative", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
         <%= icon_tag "minus" %>
-        <span class="for-screen-reader">Delete <%= @bucket.name %></span>
+        <span class="for-screen-reader">Delete <%= @collection.name %></span>
       <% end %>
     <% end %>
   </nav>
 <% end %>
 
 <div class="panel shadow center" style="--panel-size: 55ch;">
-  <%= form_with model: @bucket, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
+  <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
     <div class="flex align-center gap">
-      <%= translation_button(:bucket_name) %>
+      <%= translation_button(:collection_name) %>
 
       <label class="flex-item-grow txt-large">
-        <strong><%= form.text_field :name, name: "bucket[name]", class: "input full-width",
+        <strong><%= form.text_field :name, name: "collection[name]", class: "input full-width",
               required: true, autofocus: true, placeholder: "Give it a name…",
               data: { action: "keydown.enter->form#submit:prevent, keydown.esc->form#cancel" } %></strong>
       </label>
     </div>
 
     <section class="margin-block pad-inline fill-shade border-radius">
-      <%= access_menu_tag @bucket do %>
+      <%= access_menu_tag @collection do %>
         <li class="flex align-center gap margin-none">
           <figure class="avatar flex-item-no-shrink" style="--avatar-border-radius: 0; --avatar-size: 4ch;">
             <%= icon_tag "everyone" %>
@@ -39,8 +39,8 @@
 
           <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true" />
 
-          <label for="bucket_all_access" class="switch">
-            <%= form.check_box :all_access, class: "switch__input", checked: @bucket.all_access?, data: { action: "change->toggle-class#toggle" } %>
+          <label for="collection_all_access" class="switch">
+            <%= form.check_box :all_access, class: "switch__input", checked: @collection.all_access?, data: { action: "change->toggle-class#toggle" } %>
             <span class="switch__btn round"></span>
             <span class="for-screen-reader">Give everyone access to this project</span>
           </label>
@@ -69,14 +69,14 @@
       <span class="for-screen-reader">Save</span>
     </button>
 
-    <%= link_to "Cancel and go back", bubbles_path(bucket_ids: [ @bucket ]), data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %>
+    <%= link_to "Cancel and go back", cards_path(collection_ids: [ @collection ]), data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %>
   <% end %>
 </div>
 
 <div class="panel shadow center flex flex-column gap-half margin-block-double" style="--panel-size: 55ch;">
   <strong class="txt-large">Choose a workflow</strong>
   <p class="margin-none">Use a workflow to track progress in this collection.</p>
-  <%= form_with model: @bucket, url: bucket_workflow_path(@bucket), local: true, method: :patch, data: { controller: "form" } do |form| %>
+  <%= form_with model: @collection, url: collection_workflow_path(@collection), local: true, method: :patch, data: { controller: "form" } do |form| %>
     <%= form.select :workflow_id, Current.account.workflows.map { |w| [w.name, w.id] }, { include_blank: "Choose…" }, class: "input input--select full-width", data: { action: "change->form#submit" } %>
   <% end %>
   <p><%= link_to "Manage workflows", workflows_path, class: "btn btn--plain txt-link" %></p>
diff --git a/app/views/collections/involvements/update.html.erb b/app/views/collections/involvements/update.html.erb
new file mode 100644
index 000000000..b72570962
--- /dev/null
+++ b/app/views/collections/involvements/update.html.erb
@@ -0,0 +1 @@
+<%= access_involvement_advance_button(@collection, Current.user) %>
diff --git a/app/views/buckets/new.html.erb b/app/views/collections/new.html.erb
similarity index 80%
rename from app/views/buckets/new.html.erb
rename to app/views/collections/new.html.erb
index a608cd383..f2c4b9e3d 100644
--- a/app/views/buckets/new.html.erb
+++ b/app/views/collections/new.html.erb
@@ -1,4 +1,4 @@
-<% @page_title = "Create a new bucket" %>
+<% @page_title = "Create a new collection" %>
 
 <% content_for :header do %>
   <nav>
@@ -6,8 +6,8 @@
   </nav>
 <% end %>
 
-<div class="panel shadow center" style="--panel-size: 55ch; view-transition-name: new-bucket">
-  <%= form_with model: @bucket, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
+<div class="panel shadow center" style="--panel-size: 55ch; view-transition-name: new-collection">
+  <%= form_with model: @collection, class: "flex flex-column gap txt-large", data: { controller: "form" } do |form| %>
     <h2 class="txt-x-large">Create a new collection</h2>
     <label class="flex align-center gap">
       <%= form.text_field :name, required: true, class: "input full-width", autofocus: true, placeholder: "Give it a name…", data: { action: "keydown.esc@document->form#cancel" } %>
diff --git a/app/views/comments/_body.html.erb b/app/views/comments/_body.html.erb
index abc970439..4c58dfa51 100644
--- a/app/views/comments/_body.html.erb
+++ b/app/views/comments/_body.html.erb
@@ -6,11 +6,11 @@
           <%= link_to comment.creator.name, user_path(comment.creator), class: "txt-ink btn btn--plain fill-transparent", data: { turbo_frame: "_top" } %>
         </strong>
 
-        <%= link_to bucket_bubble_path(comment.bubble.bucket, comment.bubble, anchor: "comment_#{comment.id}"), class: "txt-undecorated txt-uppercase" do %>
+        <%= link_to collection_card_path(comment.card.collection, comment.card, anchor: "comment_#{comment.id}"), class: "txt-undecorated txt-uppercase" do %>
           <%= local_datetime_tag comment.created_at, style: :shortdate, class: "txt-ink translucent" %>
         <% end %>
 
-        <%= link_to edit_bucket_bubble_comment_path(comment.bubble.bucket, comment.bubble, comment),
+        <%= link_to edit_collection_card_comment_path(comment.card.collection, comment.card, comment),
               class: "comment__edit btn btn--plain txt-xx-small fill-transparent translucent flex-item-justify-end" do %>
           <%= icon_tag "menu-dots-horizontal" %>
           <span class="for-screen-reader">Edit this comment</span>
diff --git a/app/views/comments/_new.html.erb b/app/views/comments/_new.html.erb
index 53474199e..8c75edcf1 100644
--- a/app/views/comments/_new.html.erb
+++ b/app/views/comments/_new.html.erb
@@ -5,11 +5,11 @@
 
   <div class="comment__content flex-inline flex-column full-width">
     <div class="comment__body txt-align-start">
-      <%= form_with model: Comment.new, url: bucket_bubble_comments_path(bubble.bucket, bubble), class: "flex flex-column gap full-width",
+      <%= form_with model: Comment.new, url: collection_card_comments_path(card.collection, card), class: "flex flex-column gap full-width",
             data: { controller: "form paste local-save",
-                    local_save_key_value: "comment-#{bubble.id}",
+                    local_save_key_value: "comment-#{card.id}",
                     action: "turbo:submit-end->local-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } do |form| %>
-        <%= form.markdown_area :body, class: "input comment__input", required: true, placeholder: new_comment_placeholder(bubble),
+        <%= form.markdown_area :body, class: "input comment__input", required: true, placeholder: new_comment_placeholder(card),
               data: { local_save_target: "input", action: "house-md:change->local-save#save turbo:morph-element->local-save#restoreContent" } %>
         <%= form.button class: "comment__submit btn btn--reversed flex-item-justify-start" do %>
           <span>Post this comment</span>
diff --git a/app/views/comments/create.html.erb b/app/views/comments/create.html.erb
index d669eecaf..958284c0a 100644
--- a/app/views/comments/create.html.erb
+++ b/app/views/comments/create.html.erb
@@ -1 +1 @@
-<%= render "bubbles/messages", bubble: @bubble %>
+<%= render "cards/messages", card: @card %>
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
index e7d120acc..795a79d71 100644
--- a/app/views/comments/edit.html.erb
+++ b/app/views/comments/edit.html.erb
@@ -1,14 +1,14 @@
 <%= turbo_frame_tag dom_id(@comment) do %>
   <div class="comment__content comment--edit flex-inline flex-column full-width">
     <div class="comment__body txt-align-start">
-      <%= form_with model: [@bubble.bucket, @bubble, @comment], class: "flex flex-column gap full-width",
+      <%= form_with model: [@card.collection, @card, @comment], class: "flex flex-column gap full-width",
             data: { controller: "form paste", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } do |form| %>
-        <%= form.markdown_area :body, class: "input comment__input", required: true, autofocus: true, placeholder: new_comment_placeholder(@bubble) %>
+        <%= form.markdown_area :body, class: "input comment__input", required: true, autofocus: true, placeholder: new_comment_placeholder(@card) %>
         <div class="flex gap-half justify-start">
           <%= form.button class: "btn btn--reversed", type: :submit do %>
             <span>Save changes</span>
           <% end %>
-          <%= link_to bucket_bubble_comment_path(@bubble.bucket, @bubble, @comment), class: "btn", data: { form_target: "cancel" } do %>
+          <%= link_to collection_card_comment_path(@card.collection, @card, @comment), class: "btn", data: { form_target: "cancel" } do %>
             <span">Cancel</span>
           <% end %>
 
@@ -20,7 +20,7 @@
         </div>
       <% end %>
 
-      <%= form_with url: bucket_bubble_comment_path(@bubble.bucket, @bubble, @comment), method: :delete, id: dom_id(@comment, :delete_form), data: { turbo_frame: "_top" } %>
+      <%= form_with url: collection_card_comment_path(@card.collection, @card, @comment), method: :delete, id: dom_id(@comment, :delete_form), data: { turbo_frame: "_top" } %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/comments/reactions/_reaction.html.erb b/app/views/comments/reactions/_reaction.html.erb
index 4e29ea0ca..c5790204d 100644
--- a/app/views/comments/reactions/_reaction.html.erb
+++ b/app/views/comments/reactions/_reaction.html.erb
@@ -13,7 +13,7 @@
           class: [ "txt-small", { "txt-medium": reaction.all_emoji? } ],
           data: { action: "click->reaction-delete#reveal keydown.enter->reaction-delete#reveal:prevent", reaction_delete_target: "content" } %>
 
-    <%= button_to bucket_bubble_comment_reaction_path(comment.bubble.bucket, comment.bubble, comment, reaction),
+    <%= button_to collection_card_comment_reaction_path(comment.card.collection, comment.card, comment, reaction),
           method: :delete,
           class: "btn btn--negative flex-item-justify-end reaction__delete",
           data: { action: "reaction-delete#perform", reaction_delete_target: "button" } do %>
diff --git a/app/views/comments/reactions/_reactions.html.erb b/app/views/comments/reactions/_reactions.html.erb
index f452049bd..3515721c0 100644
--- a/app/views/comments/reactions/_reactions.html.erb
+++ b/app/views/comments/reactions/_reactions.html.erb
@@ -7,7 +7,7 @@
 
     <%= turbo_frame_tag comment, :new_reaction do %>
       <div class="flex-inline" data-controller="soft-keyboard">
-        <%= link_to new_bucket_bubble_comment_reaction_path(comment.bubble.bucket, comment.bubble, comment), role: "button",
+        <%= link_to new_collection_card_comment_reaction_path(comment.card.collection, comment.card, comment), role: "button",
               class: "txt-small btn reaction__action", action: "soft-keyboard#open" do %>
           <%= icon_tag "reaction" %>
           <span class="for-screen-reader">Add a reaction</span>
diff --git a/app/views/comments/reactions/new.html.erb b/app/views/comments/reactions/new.html.erb
index 3cbf3504b..fc3983949 100644
--- a/app/views/comments/reactions/new.html.erb
+++ b/app/views/comments/reactions/new.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag dom_id(@comment, :new_reaction) do %>
-  <%= form_with url: bucket_bubble_comment_reactions_path(@comment.bubble.bucket, @comment.bubble, @comment),
+  <%= form_with url: collection_card_comment_reactions_path(@comment.card.collection, @comment.card, @comment),
         class: "reaction reaction__form flex-inline postion--relative max-width align-center fill-white gap expanded",
         html: { aria: { label: "New reaction" } },
         data: { controller: "form", turbo_frame: dom_id(@comment, :reacting), action: "keydown.esc->form#cancel" } do |form| %>
@@ -17,7 +17,7 @@
       <span class="for-screen-reader">Submit</span>
     <% end %>
 
-    <%= link_to bucket_bubble_comment_reactions_path(@comment.bubble.bucket, @comment.bubble, @comment), role: "button",
+    <%= link_to collection_card_comment_reactions_path(@comment.card.collection, @comment.card, @comment), role: "button",
           data: { turbo_frame: dom_id(@comment, :reactions), form_target: "cancel" }, class: "btn btn--negative" do %>
       <%= icon_tag "minus" %>
       <span class="for-screen-reader">Cancel</span>
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index ee2d7b21b..19c27733a 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -1,18 +1,18 @@
-<% bubble = event.summary.bubble %>
-<% link = event.action == "commented" ? bucket_bubble_path(bubble.bucket, bubble, anchor: dom_id(event.comment)) : bucket_bubble_path(bubble.bucket, bubble) %>
+<% card = event.summary.card %>
+<% link = event.action == "commented" ? collection_card_path(card.collection, card, anchor: dom_id(event.comment)) : collection_card_path(card.collection, card) %>
 
 <%= link_to link,
       class: "event panel center center-block flex-inline align-start justify-start gap position-relative",
-      style: "--bubble-color: #{ bubble.color }; background-color: color-mix(in srgb, var(--bubble-color) 10%, var(--color-bg));
-  color: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink));",
+      style: "--card-color: #{ card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-bg));
+  color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));",
       data: { related_element_target: "related",
-              related_element_group_value: bubble.id,
+              related_element_group_value: card.id,
               action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>
   <div class="avatar txt-x-small flex-item-no-shrink">
     <%= avatar_image_tag(event.creator) %>
   </div>
 
-  <div class="flex flex-column min-width txt-small align-start txt-align-start" style="color: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink));">
+  <div class="flex flex-column min-width txt-small align-start txt-align-start" style="color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));">
     <div class="flex align-start gap full-width">
       <strong class="event__title txt-break overflow-line-clamp txt-tight-lines">
         <%= event_action_sentence(event) %>
@@ -31,6 +31,6 @@
       </span>
     <% end %>
 
-    <span class="event__bucket"><%= bubble.bucket.name %></span>
+    <span class="event__collection"><%= card.collection.name %></span>
   </div>
 <% end %>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index b791ea1c7..94a9a756a 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -1,4 +1,4 @@
-<% presenter = BucketFilterPresenter.new(@buckets, params, cookies) %>
+<% presenter = CollectionFilterPresenter.new(@collections, params, cookies) %>
 <div class="position-relative max-width margin-block-end-half"
 		data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
 	<button class="events__filter-btn input input--select flex-inline center min-width max-width txt-small" data-action="click->dialog#open:stop">
@@ -13,15 +13,15 @@
 		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
 					data: { controller: "form" } do |form| %>
 			<%= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
-			<% @buckets.each do |bucket| %>
+			<% @collections.each do |collection| %>
 				<div class="btn popup__item">
-					<%= form.check_box "bucket_ids[]", {
-						checked: (params[:bucket_ids] || cookies[:bucket_filter]&.split(","))&.include?(bucket.id.to_s),
+					<%= form.check_box "collection_ids[]", {
+						checked: (params[:collection_ids] || cookies[:collection_filter]&.split(","))&.include?(collection.id.to_s),
 						data: { action: "change->form#submit" },
 						include_hidden: false,
-					}, bucket.id %>
+					}, collection.id %>
 
-					<%= form.label "bucket_ids[]", bucket.name, for: dom_id(bucket, :filter), class: "overflow-ellipsis" %>
+					<%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
 					<%= icon_tag "check", class: "checked flex-item-justify-end" %>
 				</div>
 			<% end %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 3144288ed..0907353a1 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -22,7 +22,7 @@
     <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
       <% @filters.each do |filter| %>
         <h3 class="txt-small margin-block-end-half txt-tight-lines">
-          <%= link_to filter.summary, bubbles_path(**filter.as_params) %>
+          <%= link_to filter.summary, cards_path(**filter.as_params) %>
         </h3>
       <% end %>
     </div>
@@ -37,15 +37,15 @@
   <div class="txt-align-start">
     <div class="flex align-start gap min-width" >
       <h2 class="txt-normal txt-uppercase overflow-ellipsis">Collections</h2>
-      <%= link_to new_bucket_path, class: "btn txt-xx-small flex-item-justify-end flex-item-no-shrink", style: "view-transition-name: new-bucket" do %>
+      <%= link_to new_collection_path, class: "btn txt-xx-small flex-item-justify-end flex-item-no-shrink", style: "view-transition-name: new-collection" do %>
         <%= icon_tag "add" %>
         <span class="for-screen-reader">New</span>
       <% end %>
     </div>
 
     <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
-      <% @buckets.each do |bucket| %>
-        <h3 class="txt-small margin-block-end-half txt-tight-lines"><%= link_to bucket.name, bubbles_path(bucket_ids: [ bucket ]) %></h3>
+      <% @collections.each do |collection| %>
+        <h3 class="txt-small margin-block-end-half txt-tight-lines"><%= link_to collection.name, cards_path(collection_ids: [ collection ]) %></h3>
       <% end %>
     </div>
   </div>
diff --git a/app/views/filters/_assignees.html.erb b/app/views/filters/_assignees.html.erb
index 2fe0c9564..96aae698a 100644
--- a/app/views/filters/_assignees.html.erb
+++ b/app/views/filters/_assignees.html.erb
@@ -14,13 +14,13 @@
 
     <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">Assigned to…</strong>
-      <%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
+      <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
             data: { controller: "form" } do |form| %>
         <% filter.as_params.except(:assignee_ids, :assignment_status).each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
         <% end %>
 
-        <%= link_to bubbles_path(filter.as_params.except(:assignee_ids, :assignment_status)), class: "btn popup__item" do %>
+        <%= link_to cards_path(filter.as_params.except(:assignee_ids, :assignment_status)), class: "btn popup__item" do %>
           <span class="overflow-ellipsis">Clear all</span>
         <% end %>
 
diff --git a/app/views/filters/_broadcasts.html.erb b/app/views/filters/_broadcasts.html.erb
index d84fdd32a..ff1777e7c 100644
--- a/app/views/filters/_broadcasts.html.erb
+++ b/app/views/filters/_broadcasts.html.erb
@@ -1,7 +1,7 @@
-<% if filter.buckets.any? %>
-  <% filter.buckets.each do |bucket| %>
-    <%= turbo_stream_from bucket %>
+<% if filter.collections.any? %>
+  <% filter.collections.each do |collection| %>
+    <%= turbo_stream_from collection %>
   <% end %>
 <% else %>
-  <%= turbo_stream_from Current.account, :buckets %>
+  <%= turbo_stream_from Current.account, :collections %>
 <% end %>
diff --git a/app/views/filters/_buckets.html.erb b/app/views/filters/_collections.html.erb
similarity index 62%
rename from app/views/filters/_buckets.html.erb
rename to app/views/filters/_collections.html.erb
index 2d03acf93..8b3fb6e1f 100644
--- a/app/views/filters/_buckets.html.erb
+++ b/app/views/filters/_collections.html.erb
@@ -1,8 +1,8 @@
 <div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
   <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
     <span class="overflow-ellipsis">
-      <% if filter.buckets.any? %>
-        <%= filter.buckets.map(&:name).to_sentence %>
+      <% if filter.collections.any? %>
+        <%= filter.collections.map(&:name).to_sentence %>
       <% else %>
         In Collection…
       <% end %>
@@ -11,21 +11,21 @@
 
   <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
     <strong class="popup__title margin-block-start-half pad-inline-half">In Collection</strong>
-    <%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
+    <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
           data: { controller: "form" } do |form| %>
-      <% filter.as_params.except(:bucket_ids).each do |key, value| %>
+      <% filter.as_params.except(:collection_ids).each do |key, value| %>
         <%= filter_hidden_field_tag key, value %>
       <% end %>
 
-      <% Current.user.buckets.order(:name).each do |bucket| %>
+      <% Current.user.collections.order(:name).each do |collection| %>
         <div class="btn popup__item">
-          <%= form.check_box "bucket_ids[]", {
-            checked: filter.buckets.include?(bucket),
+          <%= form.check_box "collection_ids[]", {
+            checked: filter.collections.include?(collection),
             data: { action: "change->form#submit" },
             include_hidden: false,
-          }, bucket.id %>
+          }, collection.id %>
 
-          <%= form.label "bucket_ids[]", bucket.name, for: dom_id(bucket, :filter), class: "overflow-ellipsis" %>
+          <%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
           <%= icon_tag "check", class: "checked flex-item-justify-end" %>
         </div>
       <% end %>
diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb
index cacfc40c5..420ef97eb 100644
--- a/app/views/filters/_creators.html.erb
+++ b/app/views/filters/_creators.html.erb
@@ -15,13 +15,13 @@
         aria-label="Added by…" aria-description="Added by…"
         data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half">Added by…</strong>
-      <%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
+      <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
             data: { controller: "form" } do |form| %>
         <% filter.as_params.except(:creator_ids).each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
         <% end %>
 
-        <%= link_to bubbles_path(filter.as_params.except(:creator_ids)), class: "btn popup__item" do %>
+        <%= link_to cards_path(filter.as_params.except(:creator_ids)), class: "btn popup__item" do %>
           <span class="overflow-ellipsis">Clear all</span>
         <% end %>
 
diff --git a/app/views/filters/_dialog.html.erb b/app/views/filters/_dialog.html.erb
index 79db59813..ef7e42679 100644
--- a/app/views/filters/_dialog.html.erb
+++ b/app/views/filters/_dialog.html.erb
@@ -17,7 +17,7 @@
     </div>
 
     <div class="pad fill-shade border-radius margin-block-end">
-      <%= form_tag bubbles_path, class: "flex align-center gap input input--actor txt-small fill-white border-radius", method: :get do %>
+      <%= form_tag cards_path, class: "flex align-center gap input input--actor txt-small fill-white border-radius", method: :get do %>
         <% @filter.as_params.each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
         <% end %>
@@ -31,7 +31,7 @@
       <% end %>
     </div>
 
-    <%= form_with url: bubbles_path, id: :filter_form, method: :get, class: "flex flex-column gap full-width", style: "--border-color: var(--color-subtle)" do %>
+    <%= form_with url: cards_path, id: :filter_form, method: :get, class: "flex flex-column gap full-width", style: "--border-color: var(--color-subtle)" do %>
       <% Array(params[:terms]).each do |term| %>
         <%= hidden_field_tag "terms[]", term, id: nil %>
       <% end %>
@@ -41,16 +41,16 @@
           <li class="filter__label"><strong>In Collection</strong></li>
 
           <li>
-            <%= button_tag type: :button, class: "btn filter__button", data: { action: "filter-form#clearCategory", filter_form_name_param: "bucket_ids[]" } do %>
+            <%= button_tag type: :button, class: "btn filter__button", data: { action: "filter-form#clearCategory", filter_form_name_param: "collection_ids[]" } do %>
               <span>All Collections</span>
             <% end %>
           </li>
 
-          <% Current.user.buckets.order(:name).each do |bucket| %>
+          <% Current.user.collections.order(:name).each do |collection| %>
             <li>
-              <%= label_tag "bucket_ids_#{bucket.id}", class: "btn filter__button" do %>
-                <%= check_box_tag "bucket_ids[]", bucket.id, filter.buckets.include?(bucket), id: "bucket_ids_#{bucket.id}", hidden: true %>
-                <span><%= bucket.name %></span>
+              <%= label_tag "collection_ids_#{collection.id}", class: "btn filter__button" do %>
+                <%= check_box_tag "collection_ids[]", collection.id, filter.collections.include?(collection), id: "collection_ids_#{collection.id}", hidden: true %>
+                <span><%= collection.name %></span>
                 <%= icon_tag "close" %>
               <% end %>
             </li>
@@ -173,7 +173,7 @@
 
   <div class="flex align-center txt-align-center justify-space-between gap-half margin-block-start">
     <%= tag.button class: "btn", form: :filter_form, formaction: filters_path, formmethod: :post do %>
-      <%= icon_tag "bubbles" %>
+      <%= icon_tag "cards" %>
       <span>Save collection</span>
     <% end %>
 
diff --git a/app/views/filters/_filter.html.erb b/app/views/filters/_filter.html.erb
index e058941fe..b8def1c6a 100644
--- a/app/views/filters/_filter.html.erb
+++ b/app/views/filters/_filter.html.erb
@@ -1,25 +1,25 @@
 <% cache_if filter.cacheable?, filter do %>
-  <li class="bucket flex flex-column txt-align-center max-width position-relative">
-    <%= link_to bubbles_path(**filter.as_params),
-          class: "border border-radius margin-block-end-half bubbles__container flex justify-center align-center position-relative",
+  <li class="collection flex flex-column txt-align-center max-width position-relative">
+    <%= link_to cards_path(**filter.as_params),
+          class: "border border-radius margin-block-end-half cards__container flex justify-center align-center position-relative",
           aria: { hidden: true }, tabindex: -1 do %>
-      <div class="bubbles bucket__bubbles flex flex-wrap gap justify-center align-end" style="view-transition-name: bubbles_<%= filter.id %>">
-        <% filter.bubbles.ordered_by_activity.limit(10).each do |bubble| %>
-          <div class="<%= class_names("bubble", drafted: bubble.drafted?) %>" style="--bubble-color: <%= bubble.color %>; <%= bubble_rotation(bubble) %>"
-            data-bubble-size-target="bubble"
-            data-activity-score="<%= bubble.activity_score %>"
-            data-activity-score-at="<%= bubble.activity_score_at.to_i %>">
-            <span class="bubble__shape"></span>
+      <div class="cards collection__cards flex flex-wrap gap justify-center align-end" style="view-transition-name: cards_<%= filter.id %>">
+        <% filter.cards.ordered_by_activity.limit(10).each do |card| %>
+          <div class="<%= class_names("card", drafted: card.drafted?) %>" style="--card-color: <%= card.color %>; <%= card_rotation(card) %>"
+            data-card-size-target="card"
+            data-activity-score="<%= card.activity_score %>"
+            data-activity-score-at="<%= card.activity_score_at.to_i %>">
+            <span class="something-to-rename__shape"></span>
           </div>
         <% end %>
       </div>
     <% end %>
 
     <div class="flex align-center justify-center flex-column flex-wrap center gap-half position-relative full-width">
-      <%= link_to bubbles_path(**filter.as_params), class: "txt-ink" do %>
+      <%= link_to cards_path(**filter.as_params), class: "txt-ink" do %>
         <strong class="txt-medium"><%= icon_tag "filter", class: "flex-inline", style: "vertical-align: bottom" %> <%= filter.summary %></strong>
       <% end %>
-      <%= button_to filter_path(filter), method: :delete, class: "btn txt-small btn--negative bucket__button", data: { turbo_confirm: "Are you sure you want to delete this filter?" } do %>
+      <%= button_to filter_path(filter), method: :delete, class: "btn txt-small btn--negative collection__button", data: { turbo_confirm: "Are you sure you want to delete this filter?" } do %>
         <%= icon_tag "minus" %>
         <span class="for-screen-reader">Delete</span>
       <% end %>
diff --git a/app/views/filters/_indexed_by.html.erb b/app/views/filters/_indexed_by.html.erb
index ff15bcb7f..5fbe85a9a 100644
--- a/app/views/filters/_indexed_by.html.erb
+++ b/app/views/filters/_indexed_by.html.erb
@@ -9,7 +9,7 @@
       aria-label="Sort by…" aria-description="Sort by…"
       data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
     <strong class="popup__title margin-block-start-half pad-inline-half">Sort by…</strong>
-    <%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
+    <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
           data: { controller: "form" } do |form| %>
       <% filter.as_params.except(:indexed_by).each do |key, value| %>
         <%= filter_hidden_field_tag key, value %>
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index a266f33e1..1f9631587 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -5,7 +5,7 @@
   </button>
 
   <div class="flex-inline center align-center gap-half">
-    <%= render "filters/buckets", filter: filter %>
+    <%= render "filters/collections", filter: filter %>
     <%= render "filters/indexed_by", filter: filter %>
     <%= render "filters/stages", filter: filter %>
     <%= render "filters/tags", filter: filter %>
@@ -17,7 +17,7 @@
     <% end %>
 
     <% if any_filters?(filter) %>
-      <%= link_to bubbles_path, class: "btn btn--remove txt-small" do %>
+      <%= link_to cards_path, class: "btn btn--remove txt-small" do %>
         <%= icon_tag "close" %>
         <span class="for-screen-reader">Clear all</span>
       <% end %>
diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb
index 1b736da94..fad318e43 100644
--- a/app/views/filters/_stages.html.erb
+++ b/app/views/filters/_stages.html.erb
@@ -14,7 +14,7 @@
         aria-label="In stage…" aria-description="In stage…"
         data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half">In stage…</strong>
-      <%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
+      <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
             data: { controller: "form" } do |form| %>
         <% filter.as_params.except(:stage_ids).each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
diff --git a/app/views/filters/_tags.html.erb b/app/views/filters/_tags.html.erb
index 4c6e28bc5..a1db6a506 100644
--- a/app/views/filters/_tags.html.erb
+++ b/app/views/filters/_tags.html.erb
@@ -12,13 +12,13 @@
 
     <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">Tagged…</strong>
-      <%= form_with url: bubbles_path, method: :get, class: "flex flex-column full-width popup__list",
+      <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
             data: { controller: "form" } do |form| %>
         <% filter.as_params.except(:tag_ids).each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
         <% end %>
 
-        <%= link_to bubbles_path(filter.as_params.except(:tag_ids)), class: "btn popup__item" do %>
+        <%= link_to cards_path(filter.as_params.except(:tag_ids)), class: "btn popup__item" do %>
           <span class="overflow-ellipsis">Clear all</span>
         <% end %>
 
diff --git a/app/views/my/pins/_pin.html.erb b/app/views/my/pins/_pin.html.erb
index c9ececb69..a1d0701c8 100644
--- a/app/views/my/pins/_pin.html.erb
+++ b/app/views/my/pins/_pin.html.erb
@@ -1,33 +1,33 @@
 <% cache pin do %>
   <%= tag.div id: dom_id(pin), class: "pin tray__item flex txt-normal" do %>
-    <%= link_to bucket_bubble_path(pin.bubble.bucket, pin.bubble),
+    <%= link_to collection_card_path(pin.card.collection, pin.card),
           class: "pin__content shadow fill-white flex align-start txt-align-start gap flex-item-grow max-width border border-radius txt-ink overflow-clip",
           data: { action: "click->dialog#close", turbo_frame: "_top" },
-          style: "--bubble-color: #{ pin.bubble.color };" do %>
+          style: "--card-color: #{ pin.card.color };" do %>
       <div class="flex flex-column min-width flex-item-grow">
         <div class="pin__header flex gap-half align-center txt-uppercase">
-          <div class="pin__bucket flex-inline flex-item-justify-start txt-reversed min-width txt-xx-small">
-            <span class="txt-xx-small overflow-ellipsis"><%= pin.bubble.bucket.name %></span>
+          <div class="pin__collection flex-inline flex-item-justify-start txt-reversed min-width txt-xx-small">
+            <span class="txt-xx-small overflow-ellipsis"><%= pin.card.collection.name %></span>
           </div>
 
-          <% if pin.bubble&.stage %>
+          <% if pin.card&.stage %>
             <strong class="pin__stage border txt-tight-lines flex-item-justify-end txt-xx-small">
-              <%= pin.bubble&.stage&.name %>
+              <%= pin.card&.stage&.name %>
             </strong>
           <% end %>
         </div>
 
-        <strong class="pin__title overflow-ellipsis txt-small"><%= bubble_title(pin.bubble) %></strong>
+        <strong class="pin__title overflow-ellipsis txt-small"><%= card_title(pin.card) %></strong>
 
         <div class="tray__item-meta flex align-end gap-half txt-tight-lines">
           <div class="translucent">
-            <span>Updated</span> <%= local_datetime_tag(pin.bubble.updated_at, style: :ago) -%>
+            <span>Updated</span> <%= local_datetime_tag(pin.card.updated_at, style: :ago) -%>
           </div>
 
-          <%= " · " if pin.bubble.tags.any? %>
+          <%= " · " if pin.card.tags.any? %>
           <div class="overflow-ellipsis pin__tags txt-uppercase">
-            <%= "#" if pin.bubble.tags.any? %>
-            <%= pin.bubble.tags.map(&:title).join(", ") %>
+            <%= "#" if pin.card.tags.any? %>
+            <%= pin.card.tags.map(&:title).join(", ") %>
           </div>
         </div>
       </div>
diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb
index 69f408d52..ac26e4404 100644
--- a/app/views/notifications/_notification.html.erb
+++ b/app/views/notifications/_notification.html.erb
@@ -13,7 +13,7 @@
             <%= notification_body(notification) %>
           <% end %>
         </div>
-      <div class="tray__item-meta overflow-ellipsis translucent"><%= notification.bubble.bucket.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
+      <div class="tray__item-meta overflow-ellipsis translucent"><%= notification.card.collection.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %></div>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/notifications/settings/_bucket.html.erb b/app/views/notifications/settings/_collection.html.erb
similarity index 68%
rename from app/views/notifications/settings/_bucket.html.erb
rename to app/views/notifications/settings/_collection.html.erb
index 16839b0c3..ad680363a 100644
--- a/app/views/notifications/settings/_bucket.html.erb
+++ b/app/views/notifications/settings/_collection.html.erb
@@ -1,13 +1,13 @@
-<%= turbo_frame_tag dom_id(bucket, :involvement) do %>
+<%= turbo_frame_tag dom_id(collection, :involvement) do %>
   <div class="flex align-center gap-half pad-inline">
     <h2 class="txt-medium overflow-ellipsis">
-      <%= bucket.name %>
+      <%= collection.name %>
     </h2>
 
     <hr class="separator--horizontal flex-item-grow" style="--border-color: var(--color-subtle-dark); --border-style: dashed" aria-hidden="true">
 
     <label class="switch flex-item-no-shrink">
-      <%= access_involvement_advance_button(bucket, user) %>
+      <%= access_involvement_advance_button(collection, user) %>
     </label>
   </div>
 <% end %>
diff --git a/app/views/notifications/settings/show.html.erb b/app/views/notifications/settings/show.html.erb
index b1733a492..63f18e193 100644
--- a/app/views/notifications/settings/show.html.erb
+++ b/app/views/notifications/settings/show.html.erb
@@ -11,5 +11,5 @@
 <% end %>
 
 <section class="panel center flex flex-column gap-half margin-block">
-  <%= render partial: "notifications/settings/bucket", collection: @buckets, locals: { user: Current.user } %>
+  <%= render partial: "notifications/settings/collection", collection: @collections, locals: { user: Current.user } %>
 </section>
diff --git a/app/views/pwa/manifest.json.erb b/app/views/pwa/manifest.json.erb
index e24451126..ddb805011 100644
--- a/app/views/pwa/manifest.json.erb
+++ b/app/views/pwa/manifest.json.erb
@@ -21,7 +21,7 @@
   "start_url": "/",
   "display": "standalone",
   "scope": "/",
-  "description": "Bubble-up the biggest issues in your projects",
+  "description": "Card-up the biggest issues in your projects",
   "categories": ["bugs", "business", "productivity"],
   "shortcuts": [
     {
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 16f2f6ad2..0ca56680c 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -8,7 +8,7 @@
         </span>
 
         <span>
-          <%= tag.bubbles.pluck(:title).to_sentence %>
+          <%= tag.cards.pluck(:title).to_sentence %>
         </span>
 
         <%= button_to tag_path(tag), class: "btn txt-small", method: :delete, data: { turbo_confirm: "Are you sure?" } do %>
diff --git a/app/views/terminals/_event.html.erb b/app/views/terminals/_event.html.erb
index a24c69e3c..fd67cd405 100644
--- a/app/views/terminals/_event.html.erb
+++ b/app/views/terminals/_event.html.erb
@@ -1,5 +1,5 @@
 <li class="min-width overflow-ellipsis">
-  <%= link_to event_action_sentence(event), bucket_bubble_path(event.bubble.bucket, event.bubble), 
+  <%= link_to event_action_sentence(event), collection_card_path(event.card.collection, event.card), 
       class: "terminal__link", 
       data: { turbo_frame: "_top" } %>
 </li>
\ No newline at end of file
diff --git a/app/views/terminals/edit.html.erb b/app/views/terminals/edit.html.erb
index d3492045e..38496e662 100644
--- a/app/views/terminals/edit.html.erb
+++ b/app/views/terminals/edit.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag "terminal_form" do %>
-  <%= form_tag bubbles_path, class: "flex align-center gap-half", method: :get, data: { controller: "form", turbo_frame: "_top" } do %>
+  <%= form_tag cards_path, class: "flex align-center gap-half", method: :get, data: { controller: "form", turbo_frame: "_top" } do %>
     <% @filter.as_params.each do |key, value| %>
       <%= filter_hidden_field_tag key, value, autofocus: true %>
     <% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index c78100427..f18dc58be 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -32,8 +32,8 @@
       </div>
 
       <div class="flex flex-column gap">
-        <%= link_to "Everything assigned to #{@user.name}", bubbles_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
-        <%= link_to "Everything added by #{@user.name}", bubbles_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "Everything assigned to #{@user.name}", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "Everything added by #{@user.name}", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
       </div>
     </div>
   </div>
diff --git a/config/recurring.yml b/config/recurring.yml
index 7ace77fd4..210967d29 100644
--- a/config/recurring.yml
+++ b/config/recurring.yml
@@ -1,9 +1,9 @@
 production:
-  auto_pop_all_due:
-    class: Bubble::AutoPopAllDueJob
+  auto_closure_all_due:
+    class: Card::AutoPopAllDueJob
     schedule: every hour
   auto_reconsider_all_inactive:
-    class: Bubble::AutoReconsiderAllStagnatedJob
+    class: Card::AutoReconsiderAllStagnatedJob
     schedule: every hour
   remove_abandoned_creations:
     class: RemoveAbandonedCreationsJob
diff --git a/config/routes.rb b/config/routes.rb
index 2508ae3b0..cc179969a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,12 +8,12 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :bubbles do
-    scope module: :bubbles do
+  resources :cards do
+    scope module: :cards do
       resource :engagement
       resource :image
       resource :pin
-      resource :pop
+      resource :closure
       resource :publish
       resource :reading
       resource :recover
@@ -40,14 +40,14 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :buckets do
-    scope module: :buckets do
+  resources :collections do
+    scope module: :collections do
       resource :subscriptions
       resource :workflow, only: :update
       resource :involvement
     end
 
-    resources :bubbles do
+    resources :cards do
       resources :comments do
         resources :reactions, module: :comments
       end
@@ -85,13 +85,13 @@ Rails.application.routes.draw do
   get "join/:join_code", to: "users#new", as: :join
   post "join/:join_code", to: "users#create"
 
-  resolve "Bubble" do |bubble, options|
-    route_for :bucket_bubble, bubble.bucket, bubble, options
+  resolve "Card" do |card, options|
+    route_for :collection_card, card.collection, card, options
   end
 
   resolve "Comment" do |comment, options|
     options[:anchor] = ActionView::RecordIdentifier.dom_id(comment)
-    route_for :bucket_bubble, comment.bubble.bucket, comment.bubble, options
+    route_for :collection_card, comment.card.collection, comment.card, options
   end
 
   get "up", to: "rails/health#show", as: :rails_health_check
diff --git a/config/storage.yml b/config/storage.yml
index a97c77b38..ad39ec2d8 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -14,14 +14,14 @@ local:
 #   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
 #   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
 #   region: us-east-1
-#   bucket: your_own_bucket-<%= Rails.env %>
+#   collection: your_own_collection-<%= Rails.env %>
 
 # Remember not to checkin your GCS keyfile to a repository
 # google:
 #   service: GCS
 #   project: your_project
 #   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
-#   bucket: your_own_bucket-<%= Rails.env %>
+#   collection: your_own_collection-<%= Rails.env %>
 
 # Use bin/rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
 # microsoft:
diff --git a/db/migrate/20250409043626_rename_bubbles_to_cards.rb b/db/migrate/20250409043626_rename_bubbles_to_cards.rb
new file mode 100644
index 000000000..bdb31e05c
--- /dev/null
+++ b/db/migrate/20250409043626_rename_bubbles_to_cards.rb
@@ -0,0 +1,53 @@
+class RenameBubblesToCards < ActiveRecord::Migration[8.1]
+  def change
+    # Tables
+    rename_table "bubbles", "cards"
+    rename_table "bubble_engagements", "card_engagements"
+    rename_table "pops", "closures"
+    rename_table "pop_reasons", "closure_reasons"
+    rename_table "buckets", "collections"
+    rename_table "buckets_filters", "collections_filters"
+
+    # Columns
+    rename_column "assignments", "bubble_id", "card_id"
+    rename_column "card_engagements", "bubble_id", "card_id"
+    rename_column "events", "bubble_id", "card_id"
+    rename_column "messages", "bubble_id", "card_id"
+    rename_column "notifications", "bubble_id", "card_id"
+    rename_column "pins", "bubble_id", "card_id"
+    rename_column "closures", "bubble_id", "card_id"
+    rename_column "taggings", "bubble_id", "card_id"
+    rename_column "watches", "bubble_id", "card_id"
+
+    rename_column "cards", "bucket_id", "collection_id"
+    rename_column "accesses", "bucket_id", "collection_id"
+    rename_column "collections_filters", "bucket_id", "collection_id"
+
+    # Indexes
+    rename_index "assignments", "index_assignments_on_bubble_id", "index_assignments_on_card_id"
+    rename_index "card_engagements", "index_bubble_engagements_on_bubble_id", "index_card_engagements_on_card_id"
+    rename_index "events", "index_events_on_bubble_id", "index_events_on_card_id"
+    rename_index "messages", "index_messages_on_bubble_id", "index_messages_on_card_id"
+    rename_index "notifications", "index_notifications_on_bubble_id", "index_notifications_on_card_id"
+    rename_index "pins", "index_pins_on_bubble_id", "index_pins_on_card_id"
+    rename_index "pins", "index_pins_on_bubble_id_and_user_id", "index_pins_on_card_id_and_user_id"
+    rename_index "closures", "index_pops_on_bubble_id", "index_closures_on_card_id"
+    rename_index "closures", "index_pops_on_bubble_id_and_created_at", "index_closures_on_card_id_and_created_at"
+    rename_index "watches", "index_watches_on_bubble_id", "index_watches_on_card_id"
+    rename_index "taggings", "index_taggings_on_bubble_id_and_tag_id", "index_taggings_on_card_id_and_tag_id"
+
+    rename_index "accesses", "index_accesses_on_bucket_id", "index_accesses_on_collection_id"
+    rename_index "accesses", "index_accesses_on_bucket_id_and_user_id", "index_accesses_on_collection_id_and_user_id"
+    rename_index "collections_filters", "index_buckets_filters_on_bucket_id", "index_collections_filters_on_collection_id"
+
+    # Search tables
+    execute <<~SQL
+      CREATE VIRTUAL TABLE cards_search_index USING fts5(title);
+      INSERT INTO cards_search_index(title) SELECT title FROM bubbles_search_index;
+    SQL
+
+    execute <<~SQL
+      DROP TABLE bubbles_search_index;
+    SQL
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index db3e5ac8d..95589151b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,15 +10,15 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_09_043626) do
   create_table "accesses", force: :cascade do |t|
-    t.integer "bucket_id", null: false
+    t.integer "collection_id", null: false
     t.datetime "created_at", null: false
     t.string "involvement", default: "watching", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
-    t.index ["bucket_id", "user_id"], name: "index_accesses_on_bucket_id_and_user_id", unique: true
-    t.index ["bucket_id"], name: "index_accesses_on_bucket_id"
+    t.index ["collection_id", "user_id"], name: "index_accesses_on_collection_id_and_user_id", unique: true
+    t.index ["collection_id"], name: "index_accesses_on_collection_id"
     t.index ["user_id"], name: "index_accesses_on_user_id"
   end
 
@@ -88,26 +88,26 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
   create_table "assignments", force: :cascade do |t|
     t.integer "assignee_id", null: false
     t.integer "assigner_id", null: false
-    t.integer "bubble_id", null: false
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["assignee_id", "bubble_id"], name: "index_assignments_on_assignee_id_and_bubble_id", unique: true
-    t.index ["bubble_id"], name: "index_assignments_on_bubble_id"
+    t.index ["assignee_id", "card_id"], name: "index_assignments_on_assignee_id_and_card_id", unique: true
+    t.index ["card_id"], name: "index_assignments_on_card_id"
   end
 
-  create_table "bubble_engagements", force: :cascade do |t|
-    t.integer "bubble_id"
+  create_table "card_engagements", force: :cascade do |t|
+    t.integer "card_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["bubble_id"], name: "index_bubble_engagements_on_bubble_id"
+    t.index ["card_id"], name: "index_card_engagements_on_card_id"
   end
 
-  create_table "bubbles", force: :cascade do |t|
+  create_table "cards", force: :cascade do |t|
     t.float "activity_score", default: 0.0, null: false
     t.datetime "activity_score_at"
     t.float "activity_score_order", default: 0.0, null: false
     t.integer "boosts_count", default: 0, null: false
-    t.integer "bucket_id", null: false
+    t.integer "collection_id", null: false
     t.string "color"
     t.integer "comments_count", default: 0, null: false
     t.datetime "created_at", null: false
@@ -118,13 +118,32 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
     t.text "status", default: "creating", null: false
     t.string "title"
     t.datetime "updated_at", null: false
-    t.index ["activity_score_order"], name: "index_bubbles_on_activity_score_order", order: :desc
-    t.index ["bucket_id"], name: "index_bubbles_on_bucket_id"
-    t.index ["last_active_at", "status"], name: "index_bubbles_on_last_active_at_and_status"
-    t.index ["stage_id"], name: "index_bubbles_on_stage_id"
+    t.index ["activity_score_order"], name: "index_cards_on_activity_score_order"
+    t.index ["collection_id"], name: "index_cards_on_collection_id"
+    t.index ["last_active_at", "status"], name: "index_cards_on_last_active_at_and_status"
+    t.index ["stage_id"], name: "index_cards_on_stage_id"
   end
 
-  create_table "buckets", force: :cascade do |t|
+  create_table "closure_reasons", force: :cascade do |t|
+    t.integer "account_id"
+    t.datetime "created_at", null: false
+    t.string "label"
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_closure_reasons_on_account_id"
+  end
+
+  create_table "closures", force: :cascade do |t|
+    t.integer "card_id", null: false
+    t.datetime "created_at", null: false
+    t.string "reason", null: false
+    t.datetime "updated_at", null: false
+    t.integer "user_id"
+    t.index ["card_id", "created_at"], name: "index_closures_on_card_id_and_created_at"
+    t.index ["card_id"], name: "index_closures_on_card_id", unique: true
+    t.index ["user_id"], name: "index_closures_on_user_id"
+  end
+
+  create_table "collections", force: :cascade do |t|
     t.integer "account_id", null: false
     t.boolean "all_access", default: false, null: false
     t.datetime "created_at", null: false
@@ -132,16 +151,16 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
     t.string "name", null: false
     t.datetime "updated_at", null: false
     t.integer "workflow_id"
-    t.index ["account_id"], name: "index_buckets_on_account_id"
-    t.index ["creator_id"], name: "index_buckets_on_creator_id"
-    t.index ["workflow_id"], name: "index_buckets_on_workflow_id"
+    t.index ["account_id"], name: "index_collections_on_account_id"
+    t.index ["creator_id"], name: "index_collections_on_creator_id"
+    t.index ["workflow_id"], name: "index_collections_on_workflow_id"
   end
 
-  create_table "buckets_filters", id: false, force: :cascade do |t|
-    t.integer "bucket_id", null: false
+  create_table "collections_filters", id: false, force: :cascade do |t|
+    t.integer "collection_id", null: false
     t.integer "filter_id", null: false
-    t.index ["bucket_id"], name: "index_buckets_filters_on_bucket_id"
-    t.index ["filter_id"], name: "index_buckets_filters_on_filter_id"
+    t.index ["collection_id"], name: "index_collections_filters_on_collection_id"
+    t.index ["filter_id"], name: "index_collections_filters_on_filter_id"
   end
 
   create_table "comments", force: :cascade do |t|
@@ -164,14 +183,14 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
 
   create_table "events", force: :cascade do |t|
     t.string "action", null: false
-    t.integer "bubble_id", null: false
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
     t.date "due_date"
     t.json "particulars", default: {}
     t.integer "summary_id", null: false
     t.datetime "updated_at", null: false
-    t.index ["bubble_id"], name: "index_events_on_bubble_id"
+    t.index ["card_id"], name: "index_events_on_card_id"
     t.index ["creator_id"], name: "index_events_on_creator_id"
     t.index ["summary_id", "action"], name: "index_events_on_summary_id_and_action"
   end
@@ -200,17 +219,17 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
   end
 
   create_table "messages", force: :cascade do |t|
-    t.integer "bubble_id", null: false
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "messageable_id", null: false
     t.string "messageable_type", null: false
     t.datetime "updated_at", null: false
-    t.index ["bubble_id"], name: "index_messages_on_bubble_id"
+    t.index ["card_id"], name: "index_messages_on_card_id"
     t.index ["messageable_type", "messageable_id"], name: "index_messages_on_messageable", unique: true
   end
 
   create_table "notifications", force: :cascade do |t|
-    t.integer "bubble_id", null: false
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "event_id", null: false
     t.datetime "read_at"
@@ -218,7 +237,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
     t.string "resource_type", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
-    t.index ["bubble_id"], name: "index_notifications_on_bubble_id"
+    t.index ["card_id"], name: "index_notifications_on_card_id"
     t.index ["event_id"], name: "index_notifications_on_event_id"
     t.index ["resource_type", "resource_id"], name: "index_notifications_on_resource"
     t.index ["user_id", "read_at", "created_at"], name: "index_notifications_on_user_id_and_read_at_and_created_at", order: { read_at: :desc, created_at: :desc }
@@ -226,34 +245,15 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
   end
 
   create_table "pins", force: :cascade do |t|
-    t.integer "bubble_id", null: false
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
-    t.index ["bubble_id", "user_id"], name: "index_pins_on_bubble_id_and_user_id", unique: true
-    t.index ["bubble_id"], name: "index_pins_on_bubble_id"
+    t.index ["card_id", "user_id"], name: "index_pins_on_card_id_and_user_id", unique: true
+    t.index ["card_id"], name: "index_pins_on_card_id"
     t.index ["user_id"], name: "index_pins_on_user_id"
   end
 
-  create_table "pop_reasons", force: :cascade do |t|
-    t.integer "account_id"
-    t.datetime "created_at", null: false
-    t.string "label"
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_pop_reasons_on_account_id"
-  end
-
-  create_table "pops", force: :cascade do |t|
-    t.integer "bubble_id", null: false
-    t.datetime "created_at", null: false
-    t.string "reason", null: false
-    t.datetime "updated_at", null: false
-    t.integer "user_id"
-    t.index ["bubble_id", "created_at"], name: "index_pops_on_bubble_id_and_created_at"
-    t.index ["bubble_id"], name: "index_pops_on_bubble_id", unique: true
-    t.index ["user_id"], name: "index_pops_on_user_id"
-  end
-
   create_table "reactions", force: :cascade do |t|
     t.integer "comment_id", null: false
     t.string "content", limit: 16, null: false
@@ -274,11 +274,11 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
   end
 
   create_table "taggings", force: :cascade do |t|
-    t.integer "bubble_id", null: false
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "tag_id", null: false
     t.datetime "updated_at", null: false
-    t.index ["bubble_id", "tag_id"], name: "index_taggings_on_bubble_id_and_tag_id", unique: true
+    t.index ["card_id", "tag_id"], name: "index_taggings_on_card_id_and_tag_id", unique: true
     t.index ["tag_id"], name: "index_taggings_on_tag_id"
   end
 
@@ -306,12 +306,12 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
   end
 
   create_table "watches", force: :cascade do |t|
-    t.integer "bubble_id", null: false
+    t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "user_id", null: false
     t.boolean "watching", default: true, null: false
-    t.index ["bubble_id"], name: "index_watches_on_bubble_id"
+    t.index ["card_id"], name: "index_watches_on_card_id"
     t.index ["user_id"], name: "index_watches_on_user_id"
   end
 
@@ -333,29 +333,29 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_07_093421) do
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
-  add_foreign_key "bubbles", "workflow_stages", column: "stage_id"
-  add_foreign_key "buckets", "workflows"
-  add_foreign_key "events", "bubbles"
+  add_foreign_key "cards", "workflow_stages", column: "stage_id"
+  add_foreign_key "closures", "cards"
+  add_foreign_key "closures", "users"
+  add_foreign_key "collections", "workflows"
+  add_foreign_key "events", "cards"
   add_foreign_key "events", "event_summaries", column: "summary_id"
-  add_foreign_key "messages", "bubbles"
-  add_foreign_key "notifications", "bubbles"
+  add_foreign_key "messages", "cards"
+  add_foreign_key "notifications", "cards"
   add_foreign_key "notifications", "events"
   add_foreign_key "notifications", "users"
-  add_foreign_key "pins", "bubbles"
+  add_foreign_key "pins", "cards"
   add_foreign_key "pins", "users"
-  add_foreign_key "pops", "bubbles"
-  add_foreign_key "pops", "users"
   add_foreign_key "sessions", "users"
-  add_foreign_key "taggings", "bubbles"
+  add_foreign_key "taggings", "cards"
   add_foreign_key "taggings", "tags"
   add_foreign_key "users", "accounts"
-  add_foreign_key "watches", "bubbles"
+  add_foreign_key "watches", "cards"
   add_foreign_key "watches", "users"
   add_foreign_key "workflow_stages", "workflows"
   add_foreign_key "workflows", "accounts"
 
   # Virtual tables defined in this database.
   # Note that virtual tables may not work with other database engines. Be careful if changing database.
-  create_virtual_table "bubbles_search_index", "fts5", ["title"]
+  create_virtual_table "cards_search_index", "fts5", ["title"]
   create_virtual_table "comments_search_index", "fts5", ["body"]
 end
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 64906dbd4..678e96d2e 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -23,7 +23,7 @@ columns:
     comment:
   - &23 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: bucket_id
+    name: collection_id
     cast_type: *1
     sql_type_metadata: *2
     'null': false
@@ -341,9 +341,9 @@ columns:
   - *5
   - *19
   - *20
-  - &25 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &24 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: bubble_id
+    name: card_id
     cast_type: *1
     sql_type_metadata: *2
     'null': false
@@ -353,11 +353,11 @@ columns:
     comment:
   - *6
   - *9
-  bubble_engagements:
+  card_engagements:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
-    name: bubble_id
+    name: card_id
     cast_type: *1
     sql_type_metadata: *2
     'null': true
@@ -367,7 +367,7 @@ columns:
     comment:
   - *6
   - *9
-  bubbles:
+  cards:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -439,7 +439,7 @@ columns:
     collation:
     comment:
   - *6
-  - &24 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &25 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: creator_id
     cast_type: *1
@@ -473,7 +473,7 @@ columns:
     name: last_active_at
     cast_type: *3
     sql_type_metadata: *4
-    'null': true
+    'null': false
     default:
     default_function:
     collation:
@@ -509,7 +509,56 @@ columns:
     collation:
     comment:
   - *9
-  buckets:
+  closure_reasons:
+  - *5
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: account_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: label
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
+  closures:
+  - *5
+  - *24
+  - *6
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: reason
+    cast_type: *7
+    sql_type_metadata: *8
+    'null': false
+    default:
+    default_function:
+    collation:
+    comment:
+  - *9
+  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+    auto_increment:
+    name: user_id
+    cast_type: *1
+    sql_type_metadata: *2
+    'null': true
+    default:
+    default_function:
+    collation:
+    comment:
+  collections:
   - *5
   - &32 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -540,7 +589,7 @@ columns:
     collation:
     comment:
   - *6
-  - *24
+  - *25
   - *10
   - *9
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -553,16 +602,16 @@ columns:
     default_function:
     collation:
     comment:
-  buckets_filters:
+  collections_filters:
   - *23
   - *18
   comments:
   - *5
   - *6
-  - *24
+  - *25
   - *9
   creators_filters:
-  - *24
+  - *25
   - *18
   event_summaries:
   - *5
@@ -580,9 +629,9 @@ columns:
     default_function:
     collation:
     comment:
-  - *25
-  - *6
   - *24
+  - *6
+  - *25
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: due_date
@@ -625,7 +674,7 @@ columns:
   filters:
   - *5
   - *6
-  - *24
+  - *25
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: fields
@@ -673,7 +722,7 @@ columns:
     comment:
   messages:
   - *5
-  - *25
+  - *24
   - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -698,7 +747,7 @@ columns:
   - *9
   notifications:
   - *5
-  - *25
+  - *24
   - *6
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
@@ -744,59 +793,10 @@ columns:
   - *30
   pins:
   - *5
-  - *25
+  - *24
   - *6
   - *9
   - *30
-  pop_reasons:
-  - *5
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: account_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: label
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
-  - *9
-  pops:
-  - *5
-  - *25
-  - *6
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: reason
-    cast_type: *7
-    sql_type_metadata: *8
-    'null': false
-    default:
-    default_function:
-    collation:
-    comment:
-  - *9
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: user_id
-    cast_type: *1
-    sql_type_metadata: *2
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   reactions:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -879,7 +879,7 @@ columns:
   - *30
   taggings:
   - *5
-  - *25
+  - *24
   - *6
   - *31
   - *9
@@ -937,7 +937,7 @@ columns:
   - *9
   watches:
   - *5
-  - *25
+  - *24
   - *6
   - *9
   - *30
@@ -983,10 +983,12 @@ primary_keys:
   assignees_filters:
   assigners_filters:
   assignments: id
-  bubble_engagements: id
-  bubbles: id
-  buckets: id
-  buckets_filters:
+  card_engagements: id
+  cards: id
+  closure_reasons: id
+  closures: id
+  collections: id
+  collections_filters:
   comments: id
   creators_filters:
   event_summaries: id
@@ -997,8 +999,6 @@ primary_keys:
   messages: id
   notifications: id
   pins: id
-  pop_reasons: id
-  pops: id
   reactions: id
   schema_migrations: version
   sessions: id
@@ -1019,10 +1019,12 @@ data_sources:
   assignees_filters: true
   assigners_filters: true
   assignments: true
-  bubble_engagements: true
-  bubbles: true
-  buckets: true
-  buckets_filters: true
+  card_engagements: true
+  cards: true
+  closure_reasons: true
+  closures: true
+  collections: true
+  collections_filters: true
   comments: true
   creators_filters: true
   event_summaries: true
@@ -1033,8 +1035,6 @@ data_sources:
   messages: true
   notifications: true
   pins: true
-  pop_reasons: true
-  pops: true
   reactions: true
   schema_migrations: true
   sessions: true
@@ -1048,9 +1048,10 @@ indexes:
   accesses:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_user_id
-    unique: false
+    name: index_accesses_on_collection_id_and_user_id
+    unique: true
     columns:
+    - collection_id
     - user_id
     lengths: {}
     orders: {}
@@ -1064,10 +1065,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_bucket_id
+    name: index_accesses_on_collection_id
     unique: false
     columns:
-    - bucket_id
+    - collection_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1080,10 +1081,9 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: accesses
-    name: index_accesses_on_bucket_id_and_user_id
-    unique: true
+    name: index_accesses_on_user_id
+    unique: false
     columns:
-    - bucket_id
     - user_id
     lengths: {}
     orders: {}
@@ -1303,10 +1303,11 @@ indexes:
   assignments:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignments
-    name: index_assignments_on_bubble_id
-    unique: false
+    name: index_assignments_on_assignee_id_and_card_id
+    unique: true
     columns:
-    - bubble_id
+    - assignee_id
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1319,28 +1320,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: assignments
-    name: index_assignments_on_assignee_id_and_bubble_id
-    unique: true
-    columns:
-    - assignee_id
-    - bubble_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  bubble_engagements:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: bubble_engagements
-    name: index_bubble_engagements_on_bubble_id
+    name: index_assignments_on_card_id
     unique: false
     columns:
-    - bubble_id
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1351,13 +1334,30 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  bubbles:
+  card_engagements:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: bubbles
-    name: index_bubbles_on_stage_id
+    table: card_engagements
+    name: index_card_engagements_on_card_id
     unique: false
     columns:
-    - stage_id
+    - card_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  cards:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: cards
+    name: index_cards_on_collection_id
+    unique: false
+    columns:
+    - collection_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1369,8 +1369,24 @@ indexes:
     comment:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: bubbles
-    name: index_bubbles_on_last_active_at_and_status
+    table: cards
+    name: index_cards_on_activity_score_order
+    unique: false
+    columns:
+    - activity_score_order
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: cards
+    name: index_cards_on_last_active_at_and_status
     unique: false
     columns:
     - last_active_at
@@ -1386,11 +1402,45 @@ indexes:
     comment:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: bubbles
-    name: index_bubbles_on_bucket_id
+    table: cards
+    name: index_cards_on_stage_id
     unique: false
     columns:
-    - bucket_id
+    - stage_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  closure_reasons:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: closure_reasons
+    name: index_closure_reasons_on_account_id
+    unique: false
+    columns:
+    - account_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  closures:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: closures
+    name: index_closures_on_card_id
+    unique: true
+    columns:
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1402,28 +1452,12 @@ indexes:
     comment:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: bubbles
-    name: index_bubbles_on_activity_score_order
+    table: closures
+    name: index_closures_on_card_id_and_created_at
     unique: false
     columns:
-    - activity_score_order
-    lengths: {}
-    orders: :desc
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  buckets:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: buckets
-    name: index_buckets_on_workflow_id
-    unique: false
-    columns:
-    - workflow_id
+    - card_id
+    - created_at
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1435,8 +1469,41 @@ indexes:
     comment:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: buckets
-    name: index_buckets_on_creator_id
+    table: closures
+    name: index_closures_on_user_id
+    unique: false
+    columns:
+    - user_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  collections:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: collections
+    name: index_collections_on_account_id
+    unique: false
+    columns:
+    - account_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: collections
+    name: index_collections_on_creator_id
     unique: false
     columns:
     - creator_id
@@ -1451,11 +1518,11 @@ indexes:
     comment:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: buckets
-    name: index_buckets_on_account_id
+    table: collections
+    name: index_collections_on_workflow_id
     unique: false
     columns:
-    - account_id
+    - workflow_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1466,10 +1533,26 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  buckets_filters:
+  collections_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: buckets_filters
-    name: index_buckets_filters_on_filter_id
+    table: collections_filters
+    name: index_collections_filters_on_collection_id
+    unique: false
+    columns:
+    - collection_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: collections_filters
+    name: index_collections_filters_on_filter_id
     unique: false
     columns:
     - filter_id
@@ -1483,22 +1566,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: buckets_filters
-    name: index_buckets_filters_on_bucket_id
-    unique: false
-    columns:
-    - bucket_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   comments: []
   creators_filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
@@ -1535,6 +1602,22 @@ indexes:
     valid: true
   event_summaries: []
   events:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: events
+    name: index_events_on_card_id
+    unique: false
+    columns:
+    - card_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: events
     name: index_events_on_summary_id_and_action
@@ -1568,22 +1651,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: events
-    name: index_events_on_bubble_id
-    unique: false
-    columns:
-    - bubble_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   filters:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: filters
@@ -1669,6 +1736,22 @@ indexes:
     comment:
     valid: true
   messages:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: messages
+    name: index_messages_on_card_id
+    unique: false
+    columns:
+    - card_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: messages
     name: index_messages_on_messageable
@@ -1686,12 +1769,13 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  notifications:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: messages
-    name: index_messages_on_bubble_id
+    table: notifications
+    name: index_notifications_on_card_id
     unique: false
     columns:
-    - bubble_id
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1702,7 +1786,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  notifications:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: notifications
     name: index_notifications_on_user_id
@@ -1772,12 +1855,30 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  pins:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: notifications
-    name: index_notifications_on_bubble_id
-    unique: false
+    table: pins
+    name: index_pins_on_card_id_and_user_id
+    unique: true
     columns:
-    - bubble_id
+    - card_id
+    - user_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: pins
+    name: index_pins_on_card_id
+    unique: false
+    columns:
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1788,7 +1889,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  pins:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: pins
     name: index_pins_on_user_id
@@ -1805,106 +1905,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: pins
-    name: index_pins_on_bubble_id
-    unique: false
-    columns:
-    - bubble_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: pins
-    name: index_pins_on_bubble_id_and_user_id
-    unique: true
-    columns:
-    - bubble_id
-    - user_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  pop_reasons:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: pop_reasons
-    name: index_pop_reasons_on_account_id
-    unique: false
-    columns:
-    - account_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  pops:
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: pops
-    name: index_pops_on_bubble_id_and_created_at
-    unique: false
-    columns:
-    - bubble_id
-    - created_at
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: pops
-    name: index_pops_on_user_id
-    unique: false
-    columns:
-    - user_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: pops
-    name: index_pops_on_bubble_id
-    unique: true
-    columns:
-    - bubble_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   reactions:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: reactions
@@ -1957,6 +1957,23 @@ indexes:
     comment:
     valid: true
   taggings:
+  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+    table: taggings
+    name: index_taggings_on_card_id_and_tag_id
+    unique: true
+    columns:
+    - card_id
+    - tag_id
+    lengths: {}
+    orders: {}
+    opclasses: {}
+    where:
+    type:
+    using:
+    include:
+    nulls_not_distinct:
+    comment:
+    valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: taggings
     name: index_taggings_on_tag_id
@@ -1973,13 +1990,13 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
+  tags:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: taggings
-    name: index_taggings_on_bubble_id_and_tag_id
-    unique: true
+    table: tags
+    name: index_tags_on_account_id
+    unique: false
     columns:
-    - bubble_id
-    - tag_id
+    - account_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -1990,7 +2007,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  tags:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: tags
     name: index_tags_on_account_id_and_title
@@ -2008,22 +2024,6 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-  - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
-    table: tags
-    name: index_tags_on_account_id
-    unique: false
-    columns:
-    - account_id
-    lengths: {}
-    orders: {}
-    opclasses: {}
-    where:
-    type:
-    using:
-    include:
-    nulls_not_distinct:
-    comment:
-    valid: true
   users:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: users
@@ -2076,10 +2076,10 @@ indexes:
   watches:
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: watches
-    name: index_watches_on_user_id
+    name: index_watches_on_card_id
     unique: false
     columns:
-    - user_id
+    - card_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -2092,10 +2092,10 @@ indexes:
     valid: true
   - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
     table: watches
-    name: index_watches_on_bubble_id
+    name: index_watches_on_user_id
     unique: false
     columns:
-    - bubble_id
+    - user_id
     lengths: {}
     orders: {}
     opclasses: {}
@@ -2140,4 +2140,4 @@ indexes:
     nulls_not_distinct:
     comment:
     valid: true
-version: 20250407093421
+version: 20250409043626
diff --git a/script/closureulate/collections_and_cards.rb b/script/closureulate/collections_and_cards.rb
new file mode 100644
index 000000000..c405390f1
--- /dev/null
+++ b/script/closureulate/collections_and_cards.rb
@@ -0,0 +1,17 @@
+require_relative "../../config/environment"
+
+BUCKETS_COUNT = 100
+BUBBLES_PER_COLLECTION = 50
+
+ApplicationRecord.current_tenant = "development-tenant"
+account = Account.first
+user = account.users.first
+Current.session = user.sessions.last
+workflow = account.workflows.first
+
+BUCKETS_COUNT.times do |collection_index|
+  collection = account.collections.create!(name: "Collection #{collection_index}", creator: user, workflow: workflow)
+  BUBBLES_PER_COLLECTION.times do |card_index|
+    collection.cards.create!(title: "Card #{card_index}", creator: user, status: :published)
+  end
+end
diff --git a/script/fill_account_pop_reasons.rb b/script/fill_account_closure_reasons.rb
similarity index 75%
rename from script/fill_account_pop_reasons.rb
rename to script/fill_account_closure_reasons.rb
index 6cb543be7..65c14c013 100755
--- a/script/fill_account_pop_reasons.rb
+++ b/script/fill_account_closure_reasons.rb
@@ -4,6 +4,6 @@ require_relative "../config/environment"
 
 ApplicationRecord.with_each_tenant do |tenant|
   Account.find_each do |account|
-    account.send(:create_default_pop_reasons)
+    account.send(:create_default_closure_reasons)
   end
 end
diff --git a/script/populate/buckets_and_bubbles.rb b/script/populate/buckets_and_bubbles.rb
deleted file mode 100644
index d247f65b9..000000000
--- a/script/populate/buckets_and_bubbles.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require_relative "../../config/environment"
-
-BUCKETS_COUNT = 100
-BUBBLES_PER_BUCKET = 50
-
-ApplicationRecord.current_tenant = "development-tenant"
-account = Account.first
-user = account.users.first
-Current.session = user.sessions.last
-workflow = account.workflows.first
-
-BUCKETS_COUNT.times do |bucket_index|
-  bucket = account.buckets.create!(name: "Collection #{bucket_index}", creator: user, workflow: workflow)
-  BUBBLES_PER_BUCKET.times do |card_index|
-    bucket.bubbles.create!(title: "Card #{card_index}", creator: user, status: :published)
-  end
-end
diff --git a/script/remove_duplicated_tags.rb b/script/remove_duplicated_tags.rb
index 31efade8e..c4957e65b 100755
--- a/script/remove_duplicated_tags.rb
+++ b/script/remove_duplicated_tags.rb
@@ -11,8 +11,8 @@ ApplicationRecord.with_each_tenant do |tenant|
         to_keep, to_merge = tags.first, tags[1..]
 
         to_merge.each do |tag_to_merge|
-          tag_to_merge.bubbles.each do |bubble|
-            to_keep.bubbles << bubble unless to_keep.bubbles.include?(bubble)
+          tag_to_merge.cards.each do |card|
+            to_keep.cards << card unless to_keep.cards.include?(card)
           end
 
           tag_to_merge.destroy
diff --git a/script/renaming/content.rb b/script/renaming/content.rb
new file mode 100644
index 000000000..d63591e5c
--- /dev/null
+++ b/script/renaming/content.rb
@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+require "find"
+require "active_support/core_ext/string" # for camelize
+
+RENAME_RULES = {
+  "bubble" => "card",
+  "popped" => "closed",
+  "poppable" => "closeable",
+  "pop" => "closure",
+  "bucket" => "collection"
+}
+
+EXTENSIONS = %w[.rb .yml .html .js .css .erb]
+EXCLUDED_DIRS = %w[db .git script/renaming vendor/javascript]
+
+# Helper to build replacement regex patterns respecting case and separators
+def build_patterns(from, to)
+  boundary = "(?<=\\A|[^a-zA-Z0-9])#{from}(?=[^a-zA-Z0-9]|\\z)"
+  camel = from.camelize
+  camel_plural = camel.pluralize
+  underscore_plural = from.pluralize.underscore
+  dasherized_plural = underscore_plural.dasherize
+
+  [
+    # Match lowercase boundary-delimited
+    [ /#{boundary}/, to ],
+    # Match capitalized version (e.g., Bubble => Card)
+    [ /(?<![a-zA-Z0-9])#{from.capitalize}(?![a-z])/, to.capitalize ],
+    # Match all-uppercase
+    [ /(?<![a-zA-Z0-9])#{from.upcase}(?![A-Z])/, to.upcase ],
+    # Match CamelCase and plural CamelCase
+    [ /(?<![a-zA-Z0-9])#{camel}(?![a-z])/, to.camelize ],
+    [ /(?<![a-zA-Z0-9])#{camel_plural}(?![a-z])/, to.camelize.pluralize ],
+    # Match lowerCamelCase
+    [ /(?<![a-zA-Z0-9])#{from.camelize(:lower)}(?![a-z])/, to.camelize(:lower) ],
+    # Match underscore and dashed plural forms (e.g. bubbles(:logo) => cards(:logo))
+    [ /(?<![a-zA-Z0-9])#{underscore_plural}(?![a-z])/, to.pluralize.underscore ],
+    [ /(?<![a-zA-Z0-9])#{dasherized_plural}(?![a-z])/, to.pluralize.underscore.dasherize ]
+  ]
+end
+
+patterns = []
+RENAME_RULES.each do |from, to|
+  patterns.concat(build_patterns(from, to))
+end
+
+Find.find(".") do |path|
+  next if File.directory?(path)
+  next unless EXTENSIONS.include?(File.extname(path))
+  next if EXCLUDED_DIRS.any? { |dir| path.start_with?("./#{dir}/") }
+
+  content = File.read(path)
+  original_content = content.dup
+
+  patterns.each do |regex, replacement|
+    content.gsub!(regex, replacement)
+  end
+
+  if content != original_content
+    puts "Renaming in: #{path}"
+    File.write(path, content)
+  end
+end
diff --git a/script/renaming/files.rb b/script/renaming/files.rb
new file mode 100644
index 000000000..c75fddd84
--- /dev/null
+++ b/script/renaming/files.rb
@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+require "fileutils"
+require "active_support/core_ext/string" # for camelize
+
+# Configuration
+EXCLUDED_DIRS = [ "db", ".git", "script/renaming" ].freeze
+
+RENAMES = {
+  "bubble" => "card",
+  "poppable" => "closeable",
+  "popped" => "closed",
+  "pop" => "closure",
+  "bucket" => "collection"
+}.freeze
+
+FILE_EXTENSIONS = %w[rb yml html css js jpg jpeg png gif svg erb].freeze
+
+def excluded_path?(path)
+  EXCLUDED_DIRS.any? { |excluded| path.split(File::SEPARATOR).include?(excluded) }
+end
+
+def rename_path(path)
+  new_path = path.dup
+
+  RENAMES.each do |from, to|
+    # Replace snake_case, kebab-case, plain, and CamelCase versions
+    patterns = [
+      [ /(?<=\A|[^a-zA-Z0-9])#{from}(?=[^a-zA-Z0-9]|\z)/i, to ],
+      [ from.camelize, to.camelize ],
+      [ from.camelize(:lower), to.camelize(:lower) ],
+      [ from.underscore.dasherize, to.underscore.dasherize ],
+      [ from.underscore, to.underscore ]
+    ]
+
+    patterns.each do |pattern, replacement|
+      new_path.gsub!(pattern, replacement)
+    end
+  end
+
+  new_path
+end
+
+# Rename Directories First
+dirs = Dir.glob("**/*/").reject { |path| excluded_path?(path) }.sort_by { |dir| -dir.count("/") }
+
+puts "Renaming directories..."
+dirs.each do |dir|
+  clean_dir = dir.chomp("/")
+  new_dir = rename_path(clean_dir)
+
+  next if clean_dir == new_dir
+  next if File.exist?(new_dir)
+
+  puts "Renaming dir: #{clean_dir} => #{new_dir}"
+  FileUtils.mkdir_p(File.dirname(new_dir))
+  FileUtils.mv(clean_dir, new_dir)
+end
+
+# Rename Files
+files = Dir.glob("**/*.{#{FILE_EXTENSIONS.join(",")}}").reject { |path| excluded_path?(path) }
+
+puts "Renaming files..."
+files.each do |file|
+  new_file = rename_path(file)
+
+  next if file == new_file
+  next if File.exist?(new_file)
+
+  puts "Renaming file: #{file} => #{new_file}"
+  FileUtils.mkdir_p(File.dirname(new_file))
+  FileUtils.mv(file, new_file)
+end
+
+puts "Renaming complete!"
diff --git a/test/controllers/bubbles/assignments_controller_test.rb b/test/controllers/bubbles/assignments_controller_test.rb
deleted file mode 100644
index 6fd1b3e95..000000000
--- a/test/controllers/bubbles/assignments_controller_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "test_helper"
-
-class Bubbles::AssignmentsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "new" do
-    get new_bubble_assignment_url(bubbles(:logo))
-    assert_response :success
-  end
-
-  test "create" do
-    assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: false, to: true do
-      post bubble_assignments_url(bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
-    end
-    assert_response :success
-
-    assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: true, to: false do
-      post bubble_assignments_url(bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
-    end
-    assert_response :success
-  end
-end
diff --git a/test/controllers/bubbles/boosts_controller_test.rb b/test/controllers/bubbles/boosts_controller_test.rb
deleted file mode 100644
index 540166de6..000000000
--- a/test/controllers/bubbles/boosts_controller_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require "test_helper"
-
-class Bubbles::BoostsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "create" do
-    boost_count = bubbles(:logo).boosts_count
-
-    assert_difference "bubbles(:logo).reload.boosts_count", +1 do
-      post bubble_boosts_path(bubbles(:logo), params: { boost_count: boost_count }, format: :turbo_stream)
-    end
-
-    assert_turbo_stream action: :update, target: dom_id(bubbles(:logo), :boosts)
-  end
-
-  test "create with value" do
-    boost_count = 10
-
-    assert_changes "bubbles(:logo).reload.boosts_count", to: boost_count do
-      post bubble_boosts_path(bubbles(:logo), params: { boost_count: boost_count }, format: :turbo_stream)
-    end
-
-    assert_turbo_stream action: :update, target: dom_id(bubbles(:logo), :boosts)
-  end
-end
diff --git a/test/controllers/bubbles/engagements_controller_test.rb b/test/controllers/bubbles/engagements_controller_test.rb
deleted file mode 100644
index a232eee87..000000000
--- a/test/controllers/bubbles/engagements_controller_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require "test_helper"
-
-class Bubbles::EngagementsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "create" do
-    bubble = bubbles(:text)
-
-    assert_changes -> { bubble.reload.doing? }, from: false, to: true do
-      post bubble_engagement_url(bubble)
-    end
-
-    assert_redirected_to bucket_bubble_url(bubble.bucket, bubble)
-  end
-
-  test "destroy" do
-    bubble = bubbles(:logo)
-
-    assert_changes -> { bubble.reload.doing? }, from: true, to: false do
-      delete bubble_engagement_url(bubble)
-    end
-
-    assert_redirected_to bucket_bubble_url(bubble.bucket, bubble)
-  end
-end
diff --git a/test/controllers/bubbles/pins_controller_test.rb b/test/controllers/bubbles/pins_controller_test.rb
deleted file mode 100644
index c4a6c3c0e..000000000
--- a/test/controllers/bubbles/pins_controller_test.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "test_helper"
-
-class Bubbles::PinsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "create" do
-    assert_changes -> { bubbles(:layout).pinned_by?(users(:kevin)) }, from: false, to: true do
-      perform_enqueued_jobs do
-        assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
-          post bubble_pin_path(bubbles(:layout))
-        end
-      end
-    end
-
-    assert_redirected_to bubble_pin_path(bubbles(:layout))
-  end
-
-  test "destroy" do
-    assert_changes -> { bubbles(:shipping).pinned_by?(users(:kevin)) }, from: true, to: false do
-      perform_enqueued_jobs do
-        assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
-          delete bubble_pin_path(bubbles(:shipping))
-        end
-      end
-    end
-
-    assert_redirected_to bubble_pin_path(bubbles(:shipping))
-  end
-end
diff --git a/test/controllers/bubbles/pops_controller_test.rb b/test/controllers/bubbles/pops_controller_test.rb
deleted file mode 100644
index 553eb2ee6..000000000
--- a/test/controllers/bubbles/pops_controller_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require "test_helper"
-
-class Bubbles::PopsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "create" do
-    bubble = bubbles(:logo)
-
-    assert_changes -> { bubble.reload.popped? }, from: false, to: true do
-      post bubble_pop_url(bubble, reason: "Scope too big")
-    end
-
-    assert_equal "Scope too big", bubble.pop.reason
-
-    assert_redirected_to bucket_bubble_url(bubble.bucket, bubble)
-  end
-
-  test "destroy" do
-    bubble = bubbles(:shipping)
-
-    assert_changes -> { bubble.reload.popped? }, from: true, to: false do
-      delete bubble_pop_url(bubble)
-    end
-
-    assert_redirected_to bucket_bubble_url(bubble.bucket, bubble)
-  end
-end
diff --git a/test/controllers/bubbles/publishes_controller_test.rb b/test/controllers/bubbles/publishes_controller_test.rb
deleted file mode 100644
index dbcafbaca..000000000
--- a/test/controllers/bubbles/publishes_controller_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require "test_helper"
-
-class Bubbles::PublishesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "create" do
-    bubble = bubbles(:logo)
-    bubble.drafted!
-
-    assert_changes -> { bubble.reload.published? }, from: false, to: true do
-      post bubble_publish_path(bubble)
-    end
-
-    assert_redirected_to bubble
-  end
-end
diff --git a/test/controllers/bubbles/taggings_controller_test.rb b/test/controllers/bubbles/taggings_controller_test.rb
deleted file mode 100644
index 2f12b18b4..000000000
--- a/test/controllers/bubbles/taggings_controller_test.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require "test_helper"
-
-class Bubbles::TaggingsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "new" do
-    get new_bubble_tagging_url(bubbles(:logo))
-    assert_response :success
-  end
-
-  test "toggle tag on" do
-    assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: false, to: true do
-      post bubble_taggings_url(bubbles(:logo)), params: { tag_title: tags(:mobile).title }, as: :turbo_stream
-    end
-    assert_response :success
-  end
-
-  test "toggle tag off" do
-    assert_changes "bubbles(:logo).tagged_with?(tags(:web))", from: true, to: false do
-      post bubble_taggings_url(bubbles(:logo)), params: { tag_title: tags(:web).title }, as: :turbo_stream
-    end
-    assert_response :success
-  end
-end
diff --git a/test/controllers/bubbles/watches_controller_test.rb b/test/controllers/bubbles/watches_controller_test.rb
deleted file mode 100644
index 42e72a8bd..000000000
--- a/test/controllers/bubbles/watches_controller_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require "test_helper"
-
-class Bubbles::WatchesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "create" do
-    bubbles(:logo).unwatch_by users(:kevin)
-
-    assert_changes -> { bubbles(:logo).watched_by?(users(:kevin)) }, from: false, to: true do
-      post bubble_watch_path(bubbles(:logo))
-    end
-
-    assert_redirected_to bubble_watch_path(bubbles(:logo))
-  end
-
-  test "destroy" do
-    bubbles(:logo).watch_by users(:kevin)
-
-    assert_changes -> { bubbles(:logo).watched_by?(users(:kevin)) }, from: true, to: false do
-      delete bubble_watch_path(bubbles(:logo))
-    end
-
-    assert_redirected_to bubble_watch_path(bubbles(:logo))
-  end
-end
diff --git a/test/controllers/bubbles_controller_test.rb b/test/controllers/bubbles_controller_test.rb
deleted file mode 100644
index 84dbb06ea..000000000
--- a/test/controllers/bubbles_controller_test.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require "test_helper"
-
-class BubblesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "index" do
-    get bubbles_url
-    assert_response :success
-  end
-
-  test "filtered index" do
-    get bubbles_url(filters(:jz_assignments).as_params.merge(term: "haggis"))
-    assert_response :success
-  end
-
-  test "create" do
-    assert_difference "Bubble.count", 1 do
-      post bucket_bubbles_url(buckets(:writebook))
-    end
-    assert_redirected_to bucket_bubble_url(buckets(:writebook), Bubble.last)
-  end
-
-  test "show" do
-    get bucket_bubble_url(buckets(:writebook), bubbles(:logo))
-    assert_response :success
-  end
-
-  test "edit" do
-    get edit_bucket_bubble_url(buckets(:writebook), bubbles(:logo))
-    assert_response :success
-  end
-
-  test "update" do
-    patch bucket_bubble_url(buckets(:writebook), bubbles(:logo)), params: {
-      bubble: {
-        title: "Logo needs to change",
-        color: "#000000",
-        due_on: 1.week.from_now,
-        image: fixture_file_upload("moon.jpg", "image/jpeg"),
-        draft_comment: "Something more in-depth",
-        tag_ids: [ tags(:mobile).id ] } }
-    assert_redirected_to bucket_bubble_url(buckets(:writebook), bubbles(:logo))
-
-    bubble = bubbles(:logo).reload
-    assert_equal "Logo needs to change", bubble.title
-    assert_equal "#000000", bubble.color
-    assert_equal 1.week.from_now.to_date, bubble.due_on
-    assert_equal "moon.jpg", bubble.image.filename.to_s
-    assert_equal [ tags(:mobile) ], bubble.tags
-
-    assert_equal "Something more in-depth", bubble.messages.comments.first.comment.body_plain_text.strip
-  end
-
-  test "users can only see bubbles in buckets they have access to" do
-    get bucket_bubble_url(buckets(:writebook), bubbles(:logo))
-    assert_response :success
-
-    buckets(:writebook).update! all_access: false
-    buckets(:writebook).accesses.revoke_from users(:kevin)
-    get bucket_bubble_url(buckets(:writebook), bubbles(:logo))
-    assert_response :not_found
-  end
-end
diff --git a/test/controllers/buckets/involvements_controller_test.rb b/test/controllers/buckets/involvements_controller_test.rb
deleted file mode 100644
index 014b98f1e..000000000
--- a/test/controllers/buckets/involvements_controller_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require "test_helper"
-
-class Buckets::InvolvementsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "update" do
-    bucket = buckets(:writebook)
-    bucket.access_for(users(:kevin)).access_only!
-
-    assert_changes -> { bucket.access_for(users(:kevin)).involvement }, from: "access_only", to: "watching" do
-      put bucket_involvement_url(bucket, involvement: "watching")
-    end
-
-    assert_response :success
-  end
-end
diff --git a/test/controllers/buckets/workflows_controller_test.rb b/test/controllers/buckets/workflows_controller_test.rb
deleted file mode 100644
index 6a9140425..000000000
--- a/test/controllers/buckets/workflows_controller_test.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require "test_helper"
-
-class Buckets::WorkflowsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "update" do
-    bucket = buckets(:writebook)
-
-    patch bucket_workflow_url(bucket), params: { bucket: { workflow_id: workflows(:on_call).id } }
-
-    assert_redirected_to bubbles_path(bucket_ids: [ bucket.id ])
-    assert_equal workflows(:on_call), bucket.reload.workflow
-  end
-end
diff --git a/test/controllers/buckets_controller_test.rb b/test/controllers/buckets_controller_test.rb
deleted file mode 100644
index 0202e75cf..000000000
--- a/test/controllers/buckets_controller_test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require "test_helper"
-
-class BucketsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "new" do
-    get new_bucket_url
-    assert_response :success
-  end
-
-  test "create" do
-    assert_difference -> { Bucket.count }, +1 do
-      post buckets_url, params: { bucket: { name: "Remodel Punch List" } }
-    end
-
-    bucket = Bucket.last
-    assert_redirected_to bubbles_path(bucket_ids: [ bucket ])
-    assert_includes bucket.users, users(:kevin)
-    assert_equal "Remodel Punch List", bucket.name
-  end
-
-  test "edit" do
-    get edit_bucket_url(buckets(:writebook))
-    assert_response :success
-  end
-
-  test "update" do
-    patch bucket_url(buckets(:writebook)), params: {
-      bucket: {
-        name: "Writebook bugs",
-        all_access: false
-      },
-      user_ids: users(:david, :jz).pluck(:id)
-    }
-
-    assert_redirected_to bubbles_path(bucket_ids: [ buckets(:writebook) ])
-    assert_equal "Writebook bugs", buckets(:writebook).reload.name
-    assert_equal users(:david, :jz).sort, buckets(:writebook).users.sort
-    assert_not buckets(:writebook).all_access?
-  end
-
-  test "update all access" do
-    bucket = Current.set(session: sessions(:kevin)) do
-      accounts("37s").buckets.create! name: "New bucket", all_access: false
-    end
-    assert_equal [ users(:kevin) ], bucket.users
-
-    patch bucket_url(bucket), params: { bucket: { name: "Bugs", all_access: true } }
-
-    assert_redirected_to bubbles_path(bucket_ids: [ bucket ])
-    assert bucket.reload.all_access?
-    assert_equal accounts("37s").users, bucket.users
-  end
-
-  test "destroy" do
-    assert_difference -> { Bucket.count }, -1 do
-      delete bucket_url(buckets(:writebook))
-      assert_redirected_to root_url
-    end
-  end
-end
diff --git a/test/controllers/cards/assignments_controller_test.rb b/test/controllers/cards/assignments_controller_test.rb
new file mode 100644
index 000000000..c71571fdf
--- /dev/null
+++ b/test/controllers/cards/assignments_controller_test.rb
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class Cards::AssignmentsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "new" do
+    get new_card_assignment_url(cards(:logo))
+    assert_response :success
+  end
+
+  test "create" do
+    assert_changes "cards(:logo).assigned_to?(users(:david))", from: false, to: true do
+      post card_assignments_url(cards(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
+    end
+    assert_response :success
+
+    assert_changes "cards(:logo).assigned_to?(users(:david))", from: true, to: false do
+      post card_assignments_url(cards(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
+    end
+    assert_response :success
+  end
+end
diff --git a/test/controllers/cards/boosts_controller_test.rb b/test/controllers/cards/boosts_controller_test.rb
new file mode 100644
index 000000000..6866fa459
--- /dev/null
+++ b/test/controllers/cards/boosts_controller_test.rb
@@ -0,0 +1,27 @@
+require "test_helper"
+
+class Cards::BoostsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "create" do
+    boost_count = cards(:logo).boosts_count
+
+    assert_difference "cards(:logo).reload.boosts_count", +1 do
+      post card_boosts_path(cards(:logo), params: { boost_count: boost_count }, format: :turbo_stream)
+    end
+
+    assert_turbo_stream action: :update, target: dom_id(cards(:logo), :boosts)
+  end
+
+  test "create with value" do
+    boost_count = 10
+
+    assert_changes "cards(:logo).reload.boosts_count", to: boost_count do
+      post card_boosts_path(cards(:logo), params: { boost_count: boost_count }, format: :turbo_stream)
+    end
+
+    assert_turbo_stream action: :update, target: dom_id(cards(:logo), :boosts)
+  end
+end
diff --git a/test/controllers/cards/closures_controller_test.rb b/test/controllers/cards/closures_controller_test.rb
new file mode 100644
index 000000000..a6e964148
--- /dev/null
+++ b/test/controllers/cards/closures_controller_test.rb
@@ -0,0 +1,29 @@
+require "test_helper"
+
+class Cards::ClosuresControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "create" do
+    card = cards(:logo)
+
+    assert_changes -> { card.reload.closed? }, from: false, to: true do
+      post card_closure_url(card, reason: "Scope too big")
+    end
+
+    assert_equal "Scope too big", card.closure.reason
+
+    assert_redirected_to collection_card_url(card.collection, card)
+  end
+
+  test "destroy" do
+    card = cards(:shipping)
+
+    assert_changes -> { card.reload.closed? }, from: true, to: false do
+      delete card_closure_url(card)
+    end
+
+    assert_redirected_to collection_card_url(card.collection, card)
+  end
+end
diff --git a/test/controllers/cards/engagements_controller_test.rb b/test/controllers/cards/engagements_controller_test.rb
new file mode 100644
index 000000000..d1f39a635
--- /dev/null
+++ b/test/controllers/cards/engagements_controller_test.rb
@@ -0,0 +1,27 @@
+require "test_helper"
+
+class Cards::EngagementsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "create" do
+    card = cards(:text)
+
+    assert_changes -> { card.reload.doing? }, from: false, to: true do
+      post card_engagement_url(card)
+    end
+
+    assert_redirected_to collection_card_url(card.collection, card)
+  end
+
+  test "destroy" do
+    card = cards(:logo)
+
+    assert_changes -> { card.reload.doing? }, from: true, to: false do
+      delete card_engagement_url(card)
+    end
+
+    assert_redirected_to collection_card_url(card.collection, card)
+  end
+end
diff --git a/test/controllers/cards/pins_controller_test.rb b/test/controllers/cards/pins_controller_test.rb
new file mode 100644
index 000000000..39b12a053
--- /dev/null
+++ b/test/controllers/cards/pins_controller_test.rb
@@ -0,0 +1,31 @@
+require "test_helper"
+
+class Cards::PinsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "create" do
+    assert_changes -> { cards(:layout).pinned_by?(users(:kevin)) }, from: false, to: true do
+      perform_enqueued_jobs do
+        assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
+          post card_pin_path(cards(:layout))
+        end
+      end
+    end
+
+    assert_redirected_to card_pin_path(cards(:layout))
+  end
+
+  test "destroy" do
+    assert_changes -> { cards(:shipping).pinned_by?(users(:kevin)) }, from: true, to: false do
+      perform_enqueued_jobs do
+        assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do
+          delete card_pin_path(cards(:shipping))
+        end
+      end
+    end
+
+    assert_redirected_to card_pin_path(cards(:shipping))
+  end
+end
diff --git a/test/controllers/cards/publishes_controller_test.rb b/test/controllers/cards/publishes_controller_test.rb
new file mode 100644
index 000000000..c9df4d0aa
--- /dev/null
+++ b/test/controllers/cards/publishes_controller_test.rb
@@ -0,0 +1,18 @@
+require "test_helper"
+
+class Cards::PublishesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "create" do
+    card = cards(:logo)
+    card.drafted!
+
+    assert_changes -> { card.reload.published? }, from: false, to: true do
+      post card_publish_path(card)
+    end
+
+    assert_redirected_to card
+  end
+end
diff --git a/test/controllers/bubbles/readings_controller_test.rb b/test/controllers/cards/readings_controller_test.rb
similarity index 62%
rename from test/controllers/bubbles/readings_controller_test.rb
rename to test/controllers/cards/readings_controller_test.rb
index 3cc682d83..83da1859f 100644
--- a/test/controllers/bubbles/readings_controller_test.rb
+++ b/test/controllers/cards/readings_controller_test.rb
@@ -1,13 +1,13 @@
 require "test_helper"
 
-class Bubbles::ReadingsControllerTest < ActionDispatch::IntegrationTest
+class Cards::ReadingsControllerTest < ActionDispatch::IntegrationTest
   setup do
     sign_in_as :kevin
   end
 
   test "index" do
     assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
-      post bubble_reading_url(bubbles(:logo)), as: :turbo_stream
+      post card_reading_url(cards(:logo)), as: :turbo_stream
     end
 
     assert_response :success
diff --git a/test/controllers/cards/taggings_controller_test.rb b/test/controllers/cards/taggings_controller_test.rb
new file mode 100644
index 000000000..60271f415
--- /dev/null
+++ b/test/controllers/cards/taggings_controller_test.rb
@@ -0,0 +1,26 @@
+require "test_helper"
+
+class Cards::TaggingsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "new" do
+    get new_card_tagging_url(cards(:logo))
+    assert_response :success
+  end
+
+  test "toggle tag on" do
+    assert_changes "cards(:logo).tagged_with?(tags(:mobile))", from: false, to: true do
+      post card_taggings_url(cards(:logo)), params: { tag_title: tags(:mobile).title }, as: :turbo_stream
+    end
+    assert_response :success
+  end
+
+  test "toggle tag off" do
+    assert_changes "cards(:logo).tagged_with?(tags(:web))", from: true, to: false do
+      post card_taggings_url(cards(:logo)), params: { tag_title: tags(:web).title }, as: :turbo_stream
+    end
+    assert_response :success
+  end
+end
diff --git a/test/controllers/cards/watches_controller_test.rb b/test/controllers/cards/watches_controller_test.rb
new file mode 100644
index 000000000..05bf60a3c
--- /dev/null
+++ b/test/controllers/cards/watches_controller_test.rb
@@ -0,0 +1,27 @@
+require "test_helper"
+
+class Cards::WatchesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "create" do
+    cards(:logo).unwatch_by users(:kevin)
+
+    assert_changes -> { cards(:logo).watched_by?(users(:kevin)) }, from: false, to: true do
+      post card_watch_path(cards(:logo))
+    end
+
+    assert_redirected_to card_watch_path(cards(:logo))
+  end
+
+  test "destroy" do
+    cards(:logo).watch_by users(:kevin)
+
+    assert_changes -> { cards(:logo).watched_by?(users(:kevin)) }, from: true, to: false do
+      delete card_watch_path(cards(:logo))
+    end
+
+    assert_redirected_to card_watch_path(cards(:logo))
+  end
+end
diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb
new file mode 100644
index 000000000..c44041ed5
--- /dev/null
+++ b/test/controllers/cards_controller_test.rb
@@ -0,0 +1,65 @@
+require "test_helper"
+
+class CardsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "index" do
+    get cards_url
+    assert_response :success
+  end
+
+  test "filtered index" do
+    get cards_url(filters(:jz_assignments).as_params.merge(term: "haggis"))
+    assert_response :success
+  end
+
+  test "create" do
+    assert_difference "Card.count", 1 do
+      post collection_cards_url(collections(:writebook))
+    end
+    assert_redirected_to collection_card_url(collections(:writebook), Card.last)
+  end
+
+  test "show" do
+    get collection_card_url(collections(:writebook), cards(:logo))
+    assert_response :success
+  end
+
+  test "edit" do
+    get edit_collection_card_url(collections(:writebook), cards(:logo))
+    assert_response :success
+  end
+
+  test "update" do
+    patch collection_card_url(collections(:writebook), cards(:logo)), params: {
+      card: {
+        title: "Logo needs to change",
+        color: "#000000",
+        due_on: 1.week.from_now,
+        image: fixture_file_upload("moon.jpg", "image/jpeg"),
+        draft_comment: "Something more in-depth",
+        tag_ids: [ tags(:mobile).id ] } }
+    assert_redirected_to collection_card_url(collections(:writebook), cards(:logo))
+
+    card = cards(:logo).reload
+    assert_equal "Logo needs to change", card.title
+    assert_equal "#000000", card.color
+    assert_equal 1.week.from_now.to_date, card.due_on
+    assert_equal "moon.jpg", card.image.filename.to_s
+    assert_equal [ tags(:mobile) ], card.tags
+
+    assert_equal "Something more in-depth", card.messages.comments.first.comment.body_plain_text.strip
+  end
+
+  test "users can only see cards in collections they have access to" do
+    get collection_card_url(collections(:writebook), cards(:logo))
+    assert_response :success
+
+    collections(:writebook).update! all_access: false
+    collections(:writebook).accesses.revoke_from users(:kevin)
+    get collection_card_url(collections(:writebook), cards(:logo))
+    assert_response :not_found
+  end
+end
diff --git a/test/controllers/collections/involvements_controller_test.rb b/test/controllers/collections/involvements_controller_test.rb
new file mode 100644
index 000000000..943f0dd58
--- /dev/null
+++ b/test/controllers/collections/involvements_controller_test.rb
@@ -0,0 +1,18 @@
+require "test_helper"
+
+class Collections::InvolvementsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "update" do
+    collection = collections(:writebook)
+    collection.access_for(users(:kevin)).access_only!
+
+    assert_changes -> { collection.access_for(users(:kevin)).involvement }, from: "access_only", to: "watching" do
+      put collection_involvement_url(collection, involvement: "watching")
+    end
+
+    assert_response :success
+  end
+end
diff --git a/test/controllers/collections/workflows_controller_test.rb b/test/controllers/collections/workflows_controller_test.rb
new file mode 100644
index 000000000..b733784fd
--- /dev/null
+++ b/test/controllers/collections/workflows_controller_test.rb
@@ -0,0 +1,16 @@
+require "test_helper"
+
+class Collections::WorkflowsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "update" do
+    collection = collections(:writebook)
+
+    patch collection_workflow_url(collection), params: { collection: { workflow_id: workflows(:on_call).id } }
+
+    assert_redirected_to cards_path(collection_ids: [ collection.id ])
+    assert_equal workflows(:on_call), collection.reload.workflow
+  end
+end
diff --git a/test/controllers/collections_controller_test.rb b/test/controllers/collections_controller_test.rb
new file mode 100644
index 000000000..48fe44ade
--- /dev/null
+++ b/test/controllers/collections_controller_test.rb
@@ -0,0 +1,63 @@
+require "test_helper"
+
+class CollectionsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "new" do
+    get new_collection_url
+    assert_response :success
+  end
+
+  test "create" do
+    assert_difference -> { Collection.count }, +1 do
+      post collections_url, params: { collection: { name: "Remodel Punch List" } }
+    end
+
+    collection = Collection.last
+    assert_redirected_to cards_path(collection_ids: [ collection ])
+    assert_includes collection.users, users(:kevin)
+    assert_equal "Remodel Punch List", collection.name
+  end
+
+  test "edit" do
+    get edit_collection_url(collections(:writebook))
+    assert_response :success
+  end
+
+  test "update" do
+    patch collection_url(collections(:writebook)), params: {
+      collection: {
+        name: "Writebook bugs",
+        all_access: false
+      },
+      user_ids: users(:david, :jz).pluck(:id)
+    }
+
+    assert_redirected_to cards_path(collection_ids: [ collections(:writebook) ])
+    assert_equal "Writebook bugs", collections(:writebook).reload.name
+    assert_equal users(:david, :jz).sort, collections(:writebook).users.sort
+    assert_not collections(:writebook).all_access?
+  end
+
+  test "update all access" do
+    collection = Current.set(session: sessions(:kevin)) do
+      accounts("37s").collections.create! name: "New collection", all_access: false
+    end
+    assert_equal [ users(:kevin) ], collection.users
+
+    patch collection_url(collection), params: { collection: { name: "Bugs", all_access: true } }
+
+    assert_redirected_to cards_path(collection_ids: [ collection ])
+    assert collection.reload.all_access?
+    assert_equal accounts("37s").users, collection.users
+  end
+
+  test "destroy" do
+    assert_difference -> { Collection.count }, -1 do
+      delete collection_url(collections(:writebook))
+      assert_redirected_to root_url
+    end
+  end
+end
diff --git a/test/controllers/comments_controller_test.rb b/test/controllers/comments_controller_test.rb
index 6298e1bac..78d4987ae 100644
--- a/test/controllers/comments_controller_test.rb
+++ b/test/controllers/comments_controller_test.rb
@@ -6,15 +6,15 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "create" do
-    assert_difference "bubbles(:logo).messages.comments.count", +1 do
-      post bucket_bubble_comments_url(buckets(:writebook), bubbles(:logo), params: { comment: { body: "Agreed." } })
+    assert_difference "cards(:logo).messages.comments.count", +1 do
+      post collection_card_comments_url(collections(:writebook), cards(:logo), params: { comment: { body: "Agreed." } })
     end
 
     assert_response :success
   end
 
   test "update" do
-    put bucket_bubble_comment_url(buckets(:writebook), bubbles(:logo), comments(:logo_agreement_kevin)), params: { comment: { body: "I've changed my mind" } }
+    put collection_card_comment_url(collections(:writebook), cards(:logo), comments(:logo_agreement_kevin)), params: { comment: { body: "I've changed my mind" } }
 
     assert_response :success
     assert_equal "I've changed my mind", comments(:logo_agreement_kevin).reload.body.content
@@ -22,7 +22,7 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
 
   test "update another user's comment" do
     assert_no_changes "comments(:logo_agreement_jz).body.content" do
-      put bucket_bubble_comment_url(buckets(:writebook), bubbles(:logo), comments(:logo_agreement_jz)), params: { comment: { body: "I've changed my mind" } }
+      put collection_card_comment_url(collections(:writebook), cards(:logo), comments(:logo_agreement_jz)), params: { comment: { body: "I've changed my mind" } }
     end
 
     assert_response :forbidden
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
index 6529f2f36..01be44161 100644
--- a/test/controllers/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -26,15 +26,15 @@ class EventsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "only displays events from filtered buckets" do
-    get events_path(bucket_ids: [ buckets(:writebook).id ])
+  test "only displays events from filtered collections" do
+    get events_path(collection_ids: [ collections(:writebook).id ])
     assert_response :success
 
     events_shown = css_select(".event").count
     assert events_shown > 0, "Should show some events"
 
     css_select(".event").each do |event|
-      assert_includes event.text, buckets(:writebook).name
+      assert_includes event.text, collections(:writebook).name
     end
   end
 end
diff --git a/test/controllers/filters_controller_test.rb b/test/controllers/filters_controller_test.rb
index 1562686ea..979bfdd34 100644
--- a/test/controllers/filters_controller_test.rb
+++ b/test/controllers/filters_controller_test.rb
@@ -8,26 +8,26 @@ class FiltersControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_difference "users(:david).filters.count", +1 do
       post filters_url, params: {
-        indexed_by: "popped",
+        indexed_by: "closed",
         assignment_status: "unassigned",
         tag_ids: [ tags(:mobile).id ],
         assignee_ids: [ users(:jz).id ],
-        bucket_ids: [ buckets(:writebook).id ] }
+        collection_ids: [ collections(:writebook).id ] }
     end
-    assert_redirected_to bubbles_path(Filter.last.as_params)
+    assert_redirected_to cards_path(Filter.last.as_params)
 
     filter = Filter.last
-    assert_predicate filter.indexed_by, :popped?
+    assert_predicate filter.indexed_by, :closed?
     assert_predicate filter.assignment_status, :unassigned?
     assert_equal [ tags(:mobile) ], filter.tags
     assert_equal [ users(:jz) ], filter.assignees
-    assert_equal [ buckets(:writebook) ], filter.buckets
+    assert_equal [ collections(:writebook) ], filter.collections
   end
 
   test "destroy" do
     assert_difference "users(:david).filters.count", -1 do
       delete filter_url(filters(:jz_assignments))
     end
-    assert_redirected_to bubbles_path(filters(:jz_assignments).as_params)
+    assert_redirected_to cards_path(filters(:jz_assignments).as_params)
   end
 end
diff --git a/test/controllers/my/pins_controller_test.rb b/test/controllers/my/pins_controller_test.rb
index 0ea9e7435..cf8416445 100644
--- a/test/controllers/my/pins_controller_test.rb
+++ b/test/controllers/my/pins_controller_test.rb
@@ -9,6 +9,6 @@ class My::PinsControllerTest < ActionDispatch::IntegrationTest
     get my_pins_url
 
     assert_response :success
-    assert_select "div", text: /#{users(:kevin).pins.first.bubble.title}/
+    assert_select "div", text: /#{users(:kevin).pins.first.card.title}/
   end
 end
diff --git a/test/controllers/reactions_controller_test.rb b/test/controllers/reactions_controller_test.rb
index 12dcc10bc..e46c9ac30 100644
--- a/test/controllers/reactions_controller_test.rb
+++ b/test/controllers/reactions_controller_test.rb
@@ -9,8 +9,8 @@ class Comments::ReactionsControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_turbo_stream_broadcasts [ @comment, :comments ], count: 1 do
       assert_difference -> { @comment.reactions.count }, 1 do
-        post bucket_bubble_comment_reactions_url(@comment.bubble.bucket, @comment.bubble, @comment, format: :turbo_stream), params: { reaction: { content: "Great work!" } }
-        assert_redirected_to bucket_bubble_comment_reactions_url(@comment.bubble.bucket, @comment.bubble, @comment)
+        post collection_card_comment_reactions_url(@comment.card.collection, @comment.card, @comment, format: :turbo_stream), params: { reaction: { content: "Great work!" } }
+        assert_redirected_to collection_card_comment_reactions_url(@comment.card.collection, @comment.card, @comment)
       end
     end
   end
@@ -18,7 +18,7 @@ class Comments::ReactionsControllerTest < ActionDispatch::IntegrationTest
   test "destroy" do
     assert_turbo_stream_broadcasts [ @comment, :comments ], count: 1 do
       assert_difference -> { @comment.reactions.count }, -1 do
-        delete bucket_bubble_comment_reaction_url(@comment.bubble.bucket, @comment.bubble, @comment, reactions(:kevin), format: :turbo_stream)
+        delete collection_card_comment_reaction_url(@comment.card.collection, @comment.card, @comment, reactions(:kevin), format: :turbo_stream)
         assert_response :success
       end
     end
diff --git a/test/controllers/recovers_controller_test.rb b/test/controllers/recovers_controller_test.rb
index 1de4e2165..c276fdb33 100644
--- a/test/controllers/recovers_controller_test.rb
+++ b/test/controllers/recovers_controller_test.rb
@@ -1,18 +1,18 @@
 require "test_helper"
 
-class Bubbles::RecoversControllerTest < ActionDispatch::IntegrationTest
+class Cards::RecoversControllerTest < ActionDispatch::IntegrationTest
   setup do
     sign_in_as :jz
   end
 
   test "create" do
-    abandoned_bubble = buckets(:writebook).bubbles.create! creator: users(:kevin)
-    abandoned_bubble.update!(title: "An edited title")
-    unsaved_bubble = buckets(:writebook).bubbles.create! creator: users(:kevin)
+    abandoned_card = collections(:writebook).cards.create! creator: users(:kevin)
+    abandoned_card.update!(title: "An edited title")
+    unsaved_card = collections(:writebook).cards.create! creator: users(:kevin)
 
-    post bubble_recover_url(unsaved_bubble)
+    post card_recover_url(unsaved_card)
 
-    assert_redirected_to abandoned_bubble
-    assert_equal [ abandoned_bubble ], Bubble.creating
+    assert_redirected_to abandoned_card
+    assert_equal [ abandoned_card ], Card.creating
   end
 end
diff --git a/test/fixtures/accesses.yml b/test/fixtures/accesses.yml
index da031f507..60c6f081b 100644
--- a/test/fixtures/accesses.yml
+++ b/test/fixtures/accesses.yml
@@ -1,11 +1,11 @@
 writebook_david:
-  bucket: writebook
+  collection: writebook
   user: david
 
 writebook_jz:
-  bucket: writebook
+  collection: writebook
   user: jz
 
 writebook_kevin:
-  bucket: writebook
+  collection: writebook
   user: kevin
diff --git a/test/fixtures/assignments.yml b/test/fixtures/assignments.yml
index 6ac04e823..81e778f62 100644
--- a/test/fixtures/assignments.yml
+++ b/test/fixtures/assignments.yml
@@ -1,16 +1,16 @@
 logo_jz:
   assigner: david
   assignee: jz
-  bubble: logo
+  card: logo
   created_at: <%= 1.week.ago %>
 
 logo_kevin:
   assigner: david
   assignee: kevin
-  bubble: logo
+  card: logo
   created_at: <%= 1.day.ago %>
 
 layout_jz:
   assigner: david
   assignee: jz
-  bubble: layout
+  card: layout
diff --git a/test/fixtures/bubble/engagements.yml b/test/fixtures/card/engagements.yml
similarity index 53%
rename from test/fixtures/bubble/engagements.yml
rename to test/fixtures/card/engagements.yml
index 473d868f5..f15900c8b 100644
--- a/test/fixtures/bubble/engagements.yml
+++ b/test/fixtures/card/engagements.yml
@@ -1,2 +1,2 @@
 logo_engagement:
-  bubble: logo
+  card: logo
diff --git a/test/fixtures/bubbles.yml b/test/fixtures/cards.yml
similarity index 89%
rename from test/fixtures/bubbles.yml
rename to test/fixtures/cards.yml
index facdf351c..757b0a442 100644
--- a/test/fixtures/bubbles.yml
+++ b/test/fixtures/cards.yml
@@ -1,5 +1,5 @@
 logo:
-  bucket: writebook
+  collection: writebook
   creator: david
   title: The logo isn't big enough
   color: "#ED8008"
@@ -12,7 +12,7 @@ logo:
   last_active_at: <%= Time.current %>
 
 layout:
-  bucket: writebook
+  collection: writebook
   creator: david
   title: Layout is broken
   color: "#698F9C"
@@ -23,7 +23,7 @@ layout:
   last_active_at: <%= Time.current %>
 
 text:
-  bucket: writebook
+  collection: writebook
   creator: kevin
   title: The text is too small
   color: "#3B4B59"
@@ -32,7 +32,7 @@ text:
   last_active_at: <%= Time.current %>
 
 shipping:
-  bucket: writebook
+  collection: writebook
   creator: kevin
   title: We need to ship the app
   color: "#ED8008"
diff --git a/test/fixtures/pops.yml b/test/fixtures/closures.yml
similarity index 68%
rename from test/fixtures/pops.yml
rename to test/fixtures/closures.yml
index 555e1dd8d..8ddfbbe4c 100644
--- a/test/fixtures/pops.yml
+++ b/test/fixtures/closures.yml
@@ -1,4 +1,4 @@
 shipping:
-  bubble: shipping
+  card: shipping
   user: kevin
   reason: Closed
diff --git a/test/fixtures/buckets.yml b/test/fixtures/collections.yml
similarity index 100%
rename from test/fixtures/buckets.yml
rename to test/fixtures/collections.yml
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index a98684bec..672fed176 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -1,13 +1,13 @@
 logo_published:
   creator: david
-  bubble: logo
+  card: logo
   action: published
   summary: logo_initial_activity
   created_at: <%= 1.week.ago %>
 
 logo_assignment_jz:
   creator: david
-  bubble: logo
+  card: logo
   action: assigned
   summary: logo_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
@@ -15,14 +15,14 @@ logo_assignment_jz:
 
 logo_boost_dhh:
   creator: david
-  bubble: logo
+  card: logo
   action: boosted
   summary: logo_initial_activity
   created_at: <%= 1.week.ago + 2.hours %>
 
 logo_assignment_km:
   creator: david
-  bubble: logo
+  card: logo
   action: assigned
   summary: logo_second_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:kevin) ] }.to_json %>
@@ -30,42 +30,42 @@ logo_assignment_km:
 
 logo_boost_km1:
   creator: kevin
-  bubble: logo
+  card: logo
   action: boosted
   summary: logo_second_activity
   created_at: <%= 1.day.ago + 1.hour %>
 
 logo_boost_km2:
   creator: kevin
-  bubble: logo
+  card: logo
   action: boosted
   summary: logo_second_activity
   created_at: <%= 1.day.ago + 2.hours %>
 
 logo_boost_jz1:
   creator: jz
-  bubble: logo
+  card: logo
   action: boosted
   summary: logo_second_activity
   created_at: <%= 1.day.ago + 3.hours %>
 
 logo_boost_jz2:
   creator: jz
-  bubble: logo
+  card: logo
   action: boosted
   summary: logo_third_activity
   created_at: <%= 1.hour.ago %>
 
 layout_published:
   creator: david
-  bubble: layout
+  card: layout
   action: published
   summary: layout_initial_activity
   created_at: <%= 1.week.ago %>
 
 layout_commented:
   creator: david
-  bubble: layout
+  card: layout
   action: commented
   summary: layout_initial_activity
   particulars: <%= { comment_id: ActiveRecord::FixtureSet.identify(:layout_overflowing_david) }.to_json %>
@@ -73,7 +73,7 @@ layout_commented:
 
 layout_assignment_jz:
   creator: david
-  bubble: layout
+  card: layout
   action: assigned
   summary: layout_initial_activity
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
@@ -81,21 +81,21 @@ layout_assignment_jz:
 
 text_published:
   creator: kevin
-  bubble: text
+  card: text
   action: published
   summary: text_initial_activity
   created_at: <%= 1.week.ago %>
 
 shipping_published:
   creator: kevin
-  bubble: shipping
+  card: shipping
   action: published
   summary: shipping_initial_activity
   created_at: <%= 1.week.ago %>
 
-shipping_popped:
+shipping_closed:
   creator: kevin
-  bubble: shipping
-  action: popped
+  card: shipping
+  action: closed
   summary: shipping_initial_activity
   created_at: <%= 2.days.ago %>
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index bff5edec3..443cc85a4 100644
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -1,40 +1,40 @@
 logo_1:
-  bubble: logo
+  card: logo
   messageable: logo_initial_activity (EventSummary)
   created_at: <%= 1.week.ago %>
 
 logo_2:
-  bubble: logo
+  card: logo
   messageable: logo_agreement_jz (Comment)
   created_at: <%= 2.days.ago %>
 
 logo_3:
-  bubble: logo
+  card: logo
   messageable: logo_second_activity (EventSummary)
   created_at: <%= 1.day.ago %>
 
 logo_4:
-  bubble: logo
+  card: logo
   messageable: logo_agreement_kevin (Comment)
   created_at: <%= 2.hours.ago %>
 
 logo_5:
-  bubble: logo
+  card: logo
   messageable: logo_third_activity (EventSummary)
   created_at: <%= 1.hour.ago %>
 
 layout_1:
-  bubble: layout
+  card: layout
   messageable: layout_initial_activity (EventSummary)
 
 layout_2:
-  bubble: layout
+  card: layout
   messageable: layout_overflowing_david (Comment)
 
 text_1:
-  bubble: text
+  card: text
   messageable: text_initial_activity (EventSummary)
 
 shipping_1:
-  bubble: shipping
+  card: shipping
   messageable: shipping_initial_activity (EventSummary)
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index 7bff2665c..d6db9d360 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -1,13 +1,13 @@
 logo_published_kevin:
   user: kevin
   event: logo_published
-  bubble: logo
-  resource: logo (Bubble)
+  card: logo
+  resource: logo (Card)
   created_at: <%= 1.week.ago %>
 
 layout_commented_kevin:
   user: kevin
   event: layout_commented
-  bubble: layout
+  card: layout
   resource: layout_overflowing_david (Comment)
   created_at: <%= 1.week.ago %>
diff --git a/test/fixtures/pins.yml b/test/fixtures/pins.yml
index 3f90f9b5d..d73e0cfb3 100644
--- a/test/fixtures/pins.yml
+++ b/test/fixtures/pins.yml
@@ -1,7 +1,7 @@
 logo_kevin:
-  bubble: logo
+  card: logo
   user: kevin
 
 shipping_kevin:
-  bubble: shipping
+  card: shipping
   user: kevin 
\ No newline at end of file
diff --git a/test/fixtures/taggings.yml b/test/fixtures/taggings.yml
index 3eb5b11a8..23e17dd61 100644
--- a/test/fixtures/taggings.yml
+++ b/test/fixtures/taggings.yml
@@ -1,15 +1,15 @@
 logo_web:
-  bubble: logo
+  card: logo
   tag: web
 
 layout_web:
-  bubble: layout
+  card: layout
   tag: web
 
 layout_mobile:
-  bubble: layout
+  card: layout
   tag: mobile
 
 text_mobile:
-  bubble: text
+  card: text
   tag: mobile
diff --git a/test/fixtures/watches.yml b/test/fixtures/watches.yml
index 517505c8d..40bf28619 100644
--- a/test/fixtures/watches.yml
+++ b/test/fixtures/watches.yml
@@ -1,44 +1,44 @@
 logo_david:
-  bubble: logo
+  card: logo
   user: david
   watching: true
 
 logo_kevin:
-  bubble: logo
+  card: logo
   user: kevin
   watching: true
 
 layout_david:
-  bubble: layout
+  card: layout
   user: david
   watching: true
 
 layout_kevin:
-  bubble: layout
+  card: layout
   user: kevin
   watching: true
 
 text_david:
-  bubble: text
+  card: text
   user: david
   watching: true
 
 text_jz:
-  bubble: text
+  card: text
   user: jz
   watching: true
 
 shipping_david:
-  bubble: shipping
+  card: shipping
   user: david
   watching: true
 
 shipping_jz:
-  bubble: shipping
+  card: shipping
   user: jz
   watching: true
 
 shipping_kevin:
-  bubble: shipping
+  card: shipping
   user: kevin
   watching: true
diff --git a/test/integration/bubble_messages.rb b/test/integration/bubble_messages.rb
deleted file mode 100644
index dd9af9a04..000000000
--- a/test/integration/bubble_messages.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require "test_helper"
-
-class BubbleMessagesTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "messages system" do
-    # Create a bubble
-    post bucket_bubbles_url(buckets(:writebook))
-    bubble = Bubble.last
-    assert_equal 1, bubble.messages.count
-    assert_predicate bubble.messages.last, :event_summary?
-    assert_equal "created", bubble.messages.last.messageable.events.sole.action
-
-    # Boost it
-    post bubble_boosts_path(bubble, format: :turbo_stream)
-    assert_equal 1, bubble.messages.count
-    assert_predicate bubble.messages.last, :event_summary?
-    assert_equal 2, bubble.messages.last.event_summary.events.count
-    assert_equal "boosted", bubble.messages.last.messageable.events.last.action
-
-    # Comment on it
-    post bucket_bubble_comments_url(buckets(:writebook), bubble), params: { comment: { body: "Agreed." } }
-    assert_equal 2, bubble.messages.count
-    assert_predicate bubble.messages.last, :comment?
-    assert_equal "Agreed.", bubble.messages.last.messageable.body
-
-    # Assign it
-    post bucket_bubble_assignments_url(buckets(:writebook), bubble), params: { assignee_id: users(:kevin).id }
-    assert_equal 3, bubble.messages.count
-    assert_predicate bubble.messages.last, :event_summary?
-    assert_equal 1, bubble.messages.last.event_summary.events.count
-    assert_equal "assigned", bubble.messages.last.messageable.events.last.action
-
-    # Stage it
-    post bubble_stagings_url(bubble), params: { stage_id: workflow_stages(:qa_triage).id }
-    assert_equal 3, bubble.messages.count
-    assert_predicate bubble.messages.last, :event_summary?
-    assert_equal 2, bubble.messages.last.event_summary.events.count
-    assert_equal "staged", bubble.messages.last.messageable.events.last.action
-
-    # Unstage it
-    post bubble_stagings_url(bubble), params: { stage_id: workflow_stages(:qa_triage).id }
-    assert_equal 3, bubble.messages.count
-    assert_predicate bubble.messages.last, :event_summary?
-    assert_equal 3, bubble.messages.last.event_summary.events.count
-    assert_equal "unstaged", bubble.messages.last.messageable.events.last.action
-  end
-end
diff --git a/test/integration/card_messages.rb b/test/integration/card_messages.rb
new file mode 100644
index 000000000..464133fd7
--- /dev/null
+++ b/test/integration/card_messages.rb
@@ -0,0 +1,50 @@
+require "test_helper"
+
+class CardMessagesTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "messages system" do
+    # Create a card
+    post collection_cards_url(collections(:writebook))
+    card = Card.last
+    assert_equal 1, card.messages.count
+    assert_predicate card.messages.last, :event_summary?
+    assert_equal "created", card.messages.last.messageable.events.sole.action
+
+    # Boost it
+    post card_boosts_path(card, format: :turbo_stream)
+    assert_equal 1, card.messages.count
+    assert_predicate card.messages.last, :event_summary?
+    assert_equal 2, card.messages.last.event_summary.events.count
+    assert_equal "boosted", card.messages.last.messageable.events.last.action
+
+    # Comment on it
+    post collection_card_comments_url(collections(:writebook), card), params: { comment: { body: "Agreed." } }
+    assert_equal 2, card.messages.count
+    assert_predicate card.messages.last, :comment?
+    assert_equal "Agreed.", card.messages.last.messageable.body
+
+    # Assign it
+    post collection_card_assignments_url(collections(:writebook), card), params: { assignee_id: users(:kevin).id }
+    assert_equal 3, card.messages.count
+    assert_predicate card.messages.last, :event_summary?
+    assert_equal 1, card.messages.last.event_summary.events.count
+    assert_equal "assigned", card.messages.last.messageable.events.last.action
+
+    # Stage it
+    post card_stagings_url(card), params: { stage_id: workflow_stages(:qa_triage).id }
+    assert_equal 3, card.messages.count
+    assert_predicate card.messages.last, :event_summary?
+    assert_equal 2, card.messages.last.event_summary.events.count
+    assert_equal "staged", card.messages.last.messageable.events.last.action
+
+    # Unstage it
+    post card_stagings_url(card), params: { stage_id: workflow_stages(:qa_triage).id }
+    assert_equal 3, card.messages.count
+    assert_predicate card.messages.last, :event_summary?
+    assert_equal 3, card.messages.last.event_summary.events.count
+    assert_equal "unstaged", card.messages.last.messageable.events.last.action
+  end
+end
diff --git a/test/models/account/closure_reasons_test.rb b/test/models/account/closure_reasons_test.rb
new file mode 100644
index 000000000..499b76a8a
--- /dev/null
+++ b/test/models/account/closure_reasons_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class ClosureReasonsTest < ActiveSupport::TestCase
+  test "create defaults closure reasons on creation" do
+    account = Account.create! name: "Rails"
+    assert_equal Account::ClosureReasons::DEFAULT_LABELS, account.closure_reasons.pluck(:label)
+  end
+end
diff --git a/test/models/account/pop_reasons_test.rb b/test/models/account/pop_reasons_test.rb
deleted file mode 100644
index d72c562b7..000000000
--- a/test/models/account/pop_reasons_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "test_helper"
-
-class PopReasonsTest < ActiveSupport::TestCase
-  test "create defaults pop reasons on creation" do
-    account = Account.create! name: "Rails"
-    assert_equal Account::PopReasons::DEFAULT_LABELS, account.pop_reasons.pluck(:label)
-  end
-end
diff --git a/test/models/bubble/assignable_test.rb b/test/models/bubble/assignable_test.rb
deleted file mode 100644
index 56542544c..000000000
--- a/test/models/bubble/assignable_test.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require "test_helper"
-
-class Bubble::AssignableTest < ActiveSupport::TestCase
-  test "assigning a user makes them watch the bubble" do
-    assert_not bubbles(:layout).assigned_to?(users(:kevin))
-    bubbles(:layout).unwatch_by users(:kevin)
-
-    with_current_user(:jz) do
-      bubbles(:layout).toggle_assignment(users(:kevin))
-    end
-
-    assert bubbles(:layout).assigned_to?(users(:kevin))
-    assert bubbles(:layout).watched_by?(users(:kevin))
-  end
-end
diff --git a/test/models/bubble/commentable_test.rb b/test/models/bubble/commentable_test.rb
deleted file mode 100644
index dc5f6903b..000000000
--- a/test/models/bubble/commentable_test.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require "test_helper"
-
-class Bubble::CommentableTest < ActiveSupport::TestCase
-  test "creating a comment on a bubble makes the creator watch the bubble" do
-    buckets(:writebook).access_for(users(:kevin)).access_only!
-    assert_not bubbles(:text).watched_by?(users(:kevin))
-
-    with_current_user(:kevin) do
-      bubbles(:text).capture Comment.new(body: "This sounds interesting!")
-    end
-
-    assert bubbles(:text).watched_by?(users(:kevin))
-  end
-end
diff --git a/test/models/bubble/engageable_test.rb b/test/models/bubble/engageable_test.rb
deleted file mode 100644
index bdc75e4e3..000000000
--- a/test/models/bubble/engageable_test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require "test_helper"
-
-class Bubble::EngageableTest < ActiveSupport::TestCase
-  setup do
-    Current.session = sessions(:david)
-  end
-
-  test "check the engagement status of a bubble" do
-    assert bubbles(:logo).doing?
-    assert_not bubbles(:text).doing?
-
-    assert_not bubbles(:logo).considering?
-    assert bubbles(:text).considering?
-  end
-
-  test "change the engagement" do
-    assert_changes -> { bubbles(:text).reload.doing? }, to: true do
-      bubbles(:text).engage
-    end
-
-    assert_changes -> { bubbles(:logo).reload.doing? }, to: false do
-      bubbles(:logo).reconsider
-    end
-  end
-
-  test "engaging with popped bubbles" do
-    bubbles(:text).pop!
-
-    assert_not bubbles(:text).considering?
-    assert_not bubbles(:text).doing?
-
-    bubbles(:text).engage
-    assert_not bubbles(:text).reload.popped?
-    assert bubbles(:text).doing?
-
-    bubbles(:text).pop!
-    bubbles(:text).reconsider
-    assert_not bubbles(:text).reload.popped?
-    assert bubbles(:text).considering?
-  end
-
-  test "scopes" do
-    assert_includes Bubble.doing, bubbles(:logo)
-    assert_not_includes Bubble.doing, bubbles(:text)
-
-    assert_includes Bubble.considering, bubbles(:text)
-    assert_not_includes Bubble.considering, bubbles(:logo)
-  end
-
-  test "auto_reconsider_all_stagnated" do
-    bubbles(:logo, :shipping).each(&:engage)
-
-    bubbles(:logo).update!(last_active_at: 1.day.ago - Bubble::Engageable::STAGNATED_AFTER)
-    bubbles(:shipping).update!(last_active_at: 1.day.from_now - Bubble::Engageable::STAGNATED_AFTER)
-
-    assert_difference -> { Bubble.considering.count }, +1 do
-      Bubble.auto_reconsider_all_stagnated
-    end
-
-    assert bubbles(:shipping).reload.doing?
-    assert bubbles(:logo).reload.considering?
-  end
-end
diff --git a/test/models/bubble/eventable_test.rb b/test/models/bubble/eventable_test.rb
deleted file mode 100644
index cb24b2212..000000000
--- a/test/models/bubble/eventable_test.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "test_helper"
-
-class Bubble::EventableTest < ActiveSupport::TestCase
-  setup do
-    Current.session = sessions(:david)
-  end
-
-  test "new bubbles get the current time as the last activity time" do
-    freeze_time
-
-    bubble = buckets(:writebook).bubbles.create!(title: "Some card card", creator: users(:david))
-    assert_equal Time.current, bubble.last_active_at
-  end
-
-  test "tracking events update the last activity time" do
-    travel_to Time.current
-
-    bubbles(:logo).pop!
-    assert_equal Time.current, bubbles(:logo).last_active_at
-  end
-end
diff --git a/test/models/bubble/messages_test.rb b/test/models/bubble/messages_test.rb
deleted file mode 100644
index d507ebd69..000000000
--- a/test/models/bubble/messages_test.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require "test_helper"
-
-class Bubble::MessagesTest < ActiveSupport::TestCase
-  test "creating a bubble does not create a message by default" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "New"
-
-    assert_empty bubble.messages
-  end
-
-  test "creating a bubble with an initial draft comment" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    assert_equal 1, bubble.messages.count
-    assert_equal "This is a comment", bubble.draft_comment.strip
-  end
-
-  test "updating the draft comment" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    bubble.update! draft_comment: "This is an updated comment"
-
-    assert_equal 1, bubble.messages.count
-    assert_equal "This is an updated comment", bubble.draft_comment.strip
-  end
-
-  test "setting the draft comment to be blank removes it" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    bubble.update! draft_comment: " "
-
-    assert bubble.messages.first.nil?
-  end
-
-  test "omitting the draft comment does not remove it" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "New",
-      draft_comment: "This is a comment"
-
-    bubble.update! title: "Newer"
-
-    assert_equal 1, bubble.messages.count
-    assert_equal "This is a comment", bubble.draft_comment.strip
-  end
-end
diff --git a/test/models/bubble/poppable_test.rb b/test/models/bubble/poppable_test.rb
deleted file mode 100644
index 2eea8c30d..000000000
--- a/test/models/bubble/poppable_test.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "test_helper"
-
-class Bubble::PoppableTest < ActiveSupport::TestCase
-  test "popped scope" do
-    assert_equal [ bubbles(:shipping) ], Bubble.popped
-    assert_not_includes Bubble.active, bubbles(:shipping)
-  end
-
-  test "popping" do
-    assert_not bubbles(:logo).popped?
-
-    bubbles(:logo).pop!(user: users(:kevin))
-
-    assert bubbles(:logo).popped?
-    assert_equal users(:kevin), bubbles(:logo).popped_by
-  end
-
-  test "auto_pop_all_due" do
-    bubbles(:logo, :shipping).each(&:reconsider)
-
-    bubbles(:logo).update!(last_active_at: 1.day.ago - Bubble::Poppable::AUTO_POP_AFTER)
-    bubbles(:shipping).update!(last_active_at: 1.day.from_now - Bubble::Poppable::AUTO_POP_AFTER)
-
-    assert_difference -> { Bubble.popped.count }, +1 do
-      Bubble.auto_pop_all_due
-    end
-
-    assert bubbles(:logo).reload.popped?
-    assert_not bubbles(:shipping).reload.popped?
-  end
-end
diff --git a/test/models/bubble/scorable_test.rb b/test/models/bubble/scorable_test.rb
deleted file mode 100644
index 997add0dd..000000000
--- a/test/models/bubble/scorable_test.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require "test_helper"
-
-class Bubble::ScorableTest < ActiveSupport::TestCase
-  test "a bubble has a score that increases with activity" do
-    bubble = bubbles(:logo)
-
-    score = bubble.activity_score
-    assert_operator score, :>, 0
-
-    with_current_user :kevin do
-      bubble.capture Comment.create(body: "This is exciting!")
-    end
-
-    assert_operator bubble.activity_score, :>, score
-  end
-
-  test "commenting on a bubble boosts its score more than boosting it" do
-    bubble = bubbles(:logo)
-    bubble.rescore
-
-    comment_change = capture_change -> { bubble.activity_score } do
-      with_current_user :kevin do
-        bubble.capture Comment.create(body: "This is exciting!")
-      end
-    end
-
-    boost_change = capture_change -> { bubble.activity_score } do
-      with_current_user :kevin do
-        bubble.boost!
-      end
-    end
-
-    assert_operator comment_change, :>, boost_change
-  end
-
-  test "recent activity counts more than older activity in the ordering" do
-    with_current_user :kevin do
-      travel_to 5.days.ago
-      bubble_old = buckets(:writebook).bubbles.create! status: :published, title: "old"
-      bubble_mid = buckets(:writebook).bubbles.create! status: :published, title: "mid"
-      bubble_new = buckets(:writebook).bubbles.create! status: :published, title: "new"
-
-      bubble_old.boost!
-      bubble_old.boost!
-
-      travel_back
-      travel_to 2.days.ago
-      bubble_mid.boost!
-
-      travel_back
-      bubble_new.boost!
-
-      assert_equal %w[ new mid old ], Bubble.where(id: [ bubble_old, bubble_mid, bubble_new ]).ordered_by_activity.map(&:title)
-    end
-  end
-
-  test "items with old activity are more stale than those with none, or with new activity" do
-    with_current_user :kevin do
-      travel_to 20.days.ago
-      bubble_old = buckets(:writebook).bubbles.create! status: :published, title: "old"
-      bubble_new = buckets(:writebook).bubbles.create! status: :published, title: "new"
-      bubble_none = buckets(:writebook).bubbles.create! status: :published, title: "none"
-
-      bubble_old.boost!
-      bubble_old.boost!
-
-      travel_back
-      travel_to 2.days.ago
-      bubble_new.boost!
-      bubble_new.boost!
-
-      travel_back
-
-      assert_equal %w[ old new none ], Bubble.where(id: [ bubble_none, bubble_old, bubble_new ]).ordered_by_staleness.map(&:title)
-
-      bubble_old.boost!
-
-      assert_equal %w[ new old none ], Bubble.where(id: [ bubble_none, bubble_old, bubble_new ]).ordered_by_staleness.map(&:title)
-    end
-  end
-
-  test "bubbles with no activity have a valid activity_score_order" do
-    bubble = Bubble.create! bucket: buckets(:writebook), creator: users(:kevin)
-
-    bubble.rescore
-
-    assert bubble.activity_score.zero?
-    assert_not bubble.activity_score_order.infinite?
-  end
-end
diff --git a/test/models/bubble/searchable_test.rb b/test/models/bubble/searchable_test.rb
deleted file mode 100644
index 2cf5c6d92..000000000
--- a/test/models/bubble/searchable_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "test_helper"
-
-class Bubble::SearchableTest < ActiveSupport::TestCase
-  setup do
-    Bubble.all.each(&:reindex)
-    Comment.all.each(&:reindex)
-  end
-
-  test "searching by title" do
-    assert_includes Bubble.mentioning("layout is broken"), bubbles(:layout)
-  end
-
-  test "searching by comment" do
-    assert_includes Bubble.mentioning("overflowing"), bubbles(:layout)
-  end
-
-  test "sanitizing search query" do
-    assert_includes Bubble.mentioning("broken \""), bubbles(:layout)
-  end
-
-  test "a search with no valid terms returns empty results" do
-    assert_empty Bubble.mentioning("\"")
-  end
-end
diff --git a/test/models/bubble/statuses_test.rb b/test/models/bubble/statuses_test.rb
deleted file mode 100644
index 9f846efd6..000000000
--- a/test/models/bubble/statuses_test.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require "test_helper"
-
-class Bubble::StatusesTest < ActiveSupport::TestCase
-  test "bubbles start out in a `creating` state" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "Newly created bubble"
-
-    assert bubble.creating?
-    assert_not_includes Bubble.published_or_drafted_by(users(:kevin)), bubble
-    assert_not_includes Bubble.published_or_drafted_by(users(:jz)), bubble
-  end
-
-  test "bubbles are only visible to the creator when drafted" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "Drafted Bubble"
-    bubble.drafted!
-
-    assert_includes Bubble.published_or_drafted_by(users(:kevin)), bubble
-    assert_not_includes Bubble.published_or_drafted_by(users(:jz)), bubble
-  end
-
-  test "bubbles are visible to everyone when published" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin), title: "Published Bubble"
-    bubble.published!
-
-    assert_includes Bubble.published_or_drafted_by(users(:kevin)), bubble
-    assert_includes Bubble.published_or_drafted_by(users(:jz)), bubble
-  end
-
-  test "can_recover_abandoned_creation?" do
-    bubble = buckets(:writebook).bubbles.create! creator: users(:kevin)
-    unsaved_bubble = buckets(:writebook).bubbles.new creator: users(:kevin)
-
-    assert_not unsaved_bubble.can_recover_abandoned_creation?
-
-    bubble.update!(title: "Something worth keeping")
-    assert unsaved_bubble.can_recover_abandoned_creation?
-  end
-
-  test "recover_abandoned_creation" do
-    bubble_edited = buckets(:writebook).bubbles.create! creator: users(:kevin)
-    bubble_edited.update!(title: "Something worth keeping")
-
-    bubble_not_edited = buckets(:writebook).bubbles.create! creator: users(:kevin)
-
-    assert bubble_not_edited.can_recover_abandoned_creation?
-
-    assert_equal bubble_edited, bubble_not_edited.recover_abandoned_creation
-
-    assert_raises(ActiveRecord::RecordNotFound) { bubble_not_edited.reload }
-  end
-
-  test "remove_abandoned_creations" do
-    bubble_old = buckets(:writebook).bubbles.create! creator: users(:kevin), updated_at: 2.days.ago
-    bubble_recent = buckets(:writebook).bubbles.create! creator: users(:kevin)
-
-    assert_equal 2, Bubble.creating.count
-
-    Bubble.remove_abandoned_creations
-
-    assert_equal [ bubble_recent ], Bubble.creating
-  end
-end
diff --git a/test/models/bubble/taggable_test.rb b/test/models/bubble/taggable_test.rb
deleted file mode 100644
index b189337aa..000000000
--- a/test/models/bubble/taggable_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "test_helper"
-
-class Bubble::TaggableTest < ActiveSupport::TestCase
-  setup do
-    @bubble = bubbles(:logo)
-  end
-
-  test "toggle tag" do
-    assert_difference -> { @bubble.tags.count }, 1 do
-      @bubble.toggle_tag_with "ruby"
-    end
-
-    assert_equal "ruby", @bubble.tags.last.title
-
-    assert_difference -> { @bubble.tags.count }, -1 do
-      @bubble.toggle_tag_with "ruby"
-    end
-  end
-end
diff --git a/test/models/bubble/watchable_test.rb b/test/models/bubble/watchable_test.rb
deleted file mode 100644
index aa33b75d2..000000000
--- a/test/models/bubble/watchable_test.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require "test_helper"
-
-class Bubble::WatchableTest < ActiveSupport::TestCase
-  setup do
-    Watch.destroy_all
-    Access.all.update!(involvement: :access_only)
-  end
-
-  test "watched_by?" do
-    assert_not bubbles(:logo).watched_by?(users(:kevin))
-
-    bubbles(:logo).watch_by users(:kevin)
-    assert bubbles(:logo).watched_by?(users(:kevin))
-
-    bubbles(:logo).unwatch_by users(:kevin)
-    assert_not bubbles(:logo).watched_by?(users(:kevin))
-  end
-
-  test "watched_by? when notifications are set on the bucket" do
-    buckets(:writebook).access_for(users(:kevin)).watching!
-    assert bubbles(:text).watched_by?(users(:kevin))
-
-    bubbles(:logo).unwatch_by users(:kevin)
-    assert_not bubbles(:logo).watched_by?(users(:kevin))
-  end
-
-  test "bubbles are initially watched by their creator" do
-    bubble = buckets(:writebook).bubbles.create!(creator: users(:kevin))
-
-    assert bubble.watched_by?(users(:kevin))
-  end
-
-  test "watchers_and_subscribers" do
-    buckets(:writebook).access_for(users(:kevin)).watching!
-    buckets(:writebook).access_for(users(:jz)).everything!
-
-    bubbles(:logo).watch_by users(:kevin)
-    bubbles(:logo).unwatch_by users(:jz)
-    bubbles(:logo).watch_by users(:david)
-
-    assert_equal [ users(:kevin), users(:david) ].sort, bubbles(:logo).watchers_and_subscribers.sort
-  end
-end
diff --git a/test/models/bubble_test.rb b/test/models/bubble_test.rb
deleted file mode 100644
index 80d8b2978..000000000
--- a/test/models/bubble_test.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-require "test_helper"
-
-class BubbleTest < ActiveSupport::TestCase
-  setup do
-    Current.session = sessions(:david)
-  end
-
-  test "capturing messages" do
-    assert_difference "bubbles(:logo).messages.comments.count", +1 do
-      bubbles(:logo).capture Comment.new(body: "Agreed.")
-    end
-
-    assert_equal "Agreed.", bubbles(:logo).messages.comments.last.messageable.body.to_plain_text.chomp
-  end
-
-  test "boosting" do
-    assert_changes -> { bubbles(:logo).activity_score } do
-      assert_difference -> { bubbles(:logo).boosts_count }, +1 do
-        bubbles(:logo).boost!(bubbles(:logo).boosts_count+ 1)
-      end
-    end
-  end
-
-  test "assignment states" do
-    assert bubbles(:logo).assigned_to?(users(:kevin))
-    assert_not bubbles(:logo).assigned_to?(users(:david))
-  end
-
-  test "assignment toggling" do
-    assert bubbles(:logo).assigned_to?(users(:kevin))
-
-    assert_difference({ "bubbles(:logo).assignees.count" => -1, "Event.count" => +1 }) do
-      bubbles(:logo).toggle_assignment users(:kevin)
-    end
-    assert_not bubbles(:logo).assigned_to?(users(:kevin))
-    assert_equal "unassigned", Event.last.action
-    assert_equal [ users(:kevin) ], Event.last.assignees
-
-    assert_difference %w[ bubbles(:logo).assignees.count Event.count ], +1 do
-      bubbles(:logo).toggle_assignment users(:kevin)
-    end
-    assert bubbles(:logo).assigned_to?(users(:kevin))
-    assert_equal "assigned", Event.last.action
-    assert_equal [ users(:kevin) ], Event.last.assignees
-  end
-
-  test "tagged states" do
-    assert bubbles(:logo).tagged_with?(tags(:web))
-    assert_not bubbles(:logo).tagged_with?(tags(:mobile))
-  end
-
-  test "tag toggling" do
-    assert bubbles(:logo).tagged_with?(tags(:web))
-
-    assert_difference "bubbles(:logo).taggings.count", -1 do
-      bubbles(:logo).toggle_tag_with tags(:web).title
-    end
-    assert_not bubbles(:logo).tagged_with?(tags(:web))
-
-    assert_difference "bubbles(:logo).taggings.count", +1 do
-      bubbles(:logo).toggle_tag_with tags(:web).title
-    end
-    assert bubbles(:logo).tagged_with?(tags(:web))
-
-    assert_difference %w[ bubbles(:logo).taggings.count accounts("37s").tags.count ], +1 do
-      bubbles(:logo).toggle_tag_with "prioritized"
-    end
-    assert_equal "prioritized", bubbles(:logo).taggings.last.tag.title
-  end
-
-  test "searchable by title" do
-    bubble = buckets(:writebook).bubbles.create! title: "Insufficient haggis", creator: users(:kevin)
-
-    assert_includes Bubble.search("haggis"), bubble
-  end
-
-  test "ordering by comments" do
-    assert_equal bubbles(:logo, :layout, :shipping, :text), Bubble.ordered_by_comments
-  end
-
-  test "ordering by boosts" do
-    bubbles(:layout).update! boosts_count: 1_000
-    assert_equal bubbles(:layout, :logo, :shipping, :text), Bubble.ordered_by_boosts
-  end
-
-  test "popped" do
-    assert_equal [ bubbles(:shipping) ], Bubble.popped
-  end
-
-  test "active" do
-    assert_equal bubbles(:logo, :layout, :text), Bubble.active
-  end
-
-  test "unassigned" do
-    assert_equal bubbles(:shipping, :text), Bubble.unassigned
-  end
-
-  test "assigned to" do
-    assert_equal bubbles(:logo, :layout), Bubble.assigned_to(users(:jz))
-  end
-
-  test "assigned by" do
-    assert_equal bubbles(:layout, :logo), Bubble.assigned_by(users(:david))
-  end
-
-  test "in bucket" do
-    new_bucket = accounts("37s").buckets.create! name: "New Bucket", creator: users(:david)
-    assert_equal bubbles(:logo, :shipping, :layout, :text), Bubble.in_bucket(buckets(:writebook))
-    assert_empty Bubble.in_bucket(new_bucket)
-  end
-
-  test "tagged with" do
-    assert_equal bubbles(:layout, :text), Bubble.tagged_with(tags(:mobile))
-  end
-
-  test "mentioning" do
-    bubble = buckets(:writebook).bubbles.create! title: "Insufficient haggis", creator: users(:kevin)
-    bubbles(:logo).capture Comment.new(body: "I hate haggis")
-    bubbles(:text).capture Comment.new(body: "I love haggis")
-
-    assert_equal [ bubble, bubbles(:logo), bubbles(:text) ].sort, Bubble.mentioning("haggis").sort
-  end
-
-  test "cache key includes the bucket name" do
-    bubble = bubbles(:logo)
-    cache_v1_key = bubble.cache_key
-
-    bubble.bucket.touch
-    assert_equal cache_v1_key, bubble.reload.cache_key, "general bucket touching should not affect the bubble's cache key"
-
-    bubble.bucket.update! name: "Good ideas"
-    assert_not_equal cache_v1_key, bubble.reload.cache_key, "changing the name of the bucket should invalidate the cache"
-  end
-
-  test "cache key includes the tenant name" do
-    bubble = bubbles(:logo)
-
-    assert_includes bubble.cache_key, ApplicationRecord.current_tenant, "cache key must always include the tenant"
-  end
-
-  test "cache key gracefully handles a nil bucket" do
-    bubble = bubbles(:logo)
-    bubble.update_column :bucket_id, Bucket.last.id + 1
-
-    assert_nothing_raised { bubble.reload.cache_key }
-  end
-end
diff --git a/test/models/bucket_test.rb b/test/models/bucket_test.rb
deleted file mode 100644
index 761cfdb76..000000000
--- a/test/models/bucket_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require "test_helper"
-
-class BucketTest < ActiveSupport::TestCase
-  test "revising access" do
-    buckets(:writebook).update! all_access: false
-
-    buckets(:writebook).accesses.revise granted: users(:david, :jz), revoked: users(:kevin)
-    assert_equal users(:david, :jz), buckets(:writebook).users
-
-    buckets(:writebook).accesses.grant_to users(:kevin)
-    assert_includes buckets(:writebook).users.reload, users(:kevin)
-
-    buckets(:writebook).accesses.revoke_from users(:kevin)
-    assert_not_includes buckets(:writebook).users.reload, users(:kevin)
-  end
-
-  test "grants access to everyone after creation" do
-    bucket = Current.set(session: sessions(:david)) do
-      accounts("37s").buckets.create! name: "New bucket", all_access: true
-    end
-    assert_equal accounts("37s").users, bucket.users
-  end
-
-  test "grants access to everyone after update" do
-    bucket = Current.set(session: sessions(:david)) do
-      accounts("37s").buckets.create! name: "New bucket"
-    end
-    assert_equal [ users(:david) ], bucket.users
-
-    bucket.update! all_access: true
-    assert_equal accounts("37s").users, bucket.users.reload
-  end
-end
diff --git a/test/models/card/assignable_test.rb b/test/models/card/assignable_test.rb
new file mode 100644
index 000000000..9d0c1f1c5
--- /dev/null
+++ b/test/models/card/assignable_test.rb
@@ -0,0 +1,15 @@
+require "test_helper"
+
+class Card::AssignableTest < ActiveSupport::TestCase
+  test "assigning a user makes them watch the card" do
+    assert_not cards(:layout).assigned_to?(users(:kevin))
+    cards(:layout).unwatch_by users(:kevin)
+
+    with_current_user(:jz) do
+      cards(:layout).toggle_assignment(users(:kevin))
+    end
+
+    assert cards(:layout).assigned_to?(users(:kevin))
+    assert cards(:layout).watched_by?(users(:kevin))
+  end
+end
diff --git a/test/models/card/closeable_test.rb b/test/models/card/closeable_test.rb
new file mode 100644
index 000000000..64b1aa773
--- /dev/null
+++ b/test/models/card/closeable_test.rb
@@ -0,0 +1,31 @@
+require "test_helper"
+
+class Card::CloseableTest < ActiveSupport::TestCase
+  test "closed scope" do
+    assert_equal [ cards(:shipping) ], Card.closed
+    assert_not_includes Card.active, cards(:shipping)
+  end
+
+  test "popping" do
+    assert_not cards(:logo).closed?
+
+    cards(:logo).closure!(user: users(:kevin))
+
+    assert cards(:logo).closed?
+    assert_equal users(:kevin), cards(:logo).closed_by
+  end
+
+  test "auto_closure_all_due" do
+    cards(:logo, :shipping).each(&:reconsider)
+
+    cards(:logo).update!(last_active_at: 1.day.ago - Card::Closeable::AUTO_CLOSURE_AFTER)
+    cards(:shipping).update!(last_active_at: 1.day.from_now - Card::Closeable::AUTO_CLOSURE_AFTER)
+
+    assert_difference -> { Card.closed.count }, +1 do
+      Card.auto_closure_all_due
+    end
+
+    assert cards(:logo).reload.closed?
+    assert_not cards(:shipping).reload.closed?
+  end
+end
diff --git a/test/models/card/commentable_test.rb b/test/models/card/commentable_test.rb
new file mode 100644
index 000000000..5af8d6f37
--- /dev/null
+++ b/test/models/card/commentable_test.rb
@@ -0,0 +1,14 @@
+require "test_helper"
+
+class Card::CommentableTest < ActiveSupport::TestCase
+  test "creating a comment on a card makes the creator watch the card" do
+    collections(:writebook).access_for(users(:kevin)).access_only!
+    assert_not cards(:text).watched_by?(users(:kevin))
+
+    with_current_user(:kevin) do
+      cards(:text).capture Comment.new(body: "This sounds interesting!")
+    end
+
+    assert cards(:text).watched_by?(users(:kevin))
+  end
+end
diff --git a/test/models/card/engageable_test.rb b/test/models/card/engageable_test.rb
new file mode 100644
index 000000000..d07e35f90
--- /dev/null
+++ b/test/models/card/engageable_test.rb
@@ -0,0 +1,63 @@
+require "test_helper"
+
+class Card::EngageableTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+  end
+
+  test "check the engagement status of a card" do
+    assert cards(:logo).doing?
+    assert_not cards(:text).doing?
+
+    assert_not cards(:logo).considering?
+    assert cards(:text).considering?
+  end
+
+  test "change the engagement" do
+    assert_changes -> { cards(:text).reload.doing? }, to: true do
+      cards(:text).engage
+    end
+
+    assert_changes -> { cards(:logo).reload.doing? }, to: false do
+      cards(:logo).reconsider
+    end
+  end
+
+  test "engaging with closed cards" do
+    cards(:text).closure!
+
+    assert_not cards(:text).considering?
+    assert_not cards(:text).doing?
+
+    cards(:text).engage
+    assert_not cards(:text).reload.closed?
+    assert cards(:text).doing?
+
+    cards(:text).closure!
+    cards(:text).reconsider
+    assert_not cards(:text).reload.closed?
+    assert cards(:text).considering?
+  end
+
+  test "scopes" do
+    assert_includes Card.doing, cards(:logo)
+    assert_not_includes Card.doing, cards(:text)
+
+    assert_includes Card.considering, cards(:text)
+    assert_not_includes Card.considering, cards(:logo)
+  end
+
+  test "auto_reconsider_all_stagnated" do
+    cards(:logo, :shipping).each(&:engage)
+
+    cards(:logo).update!(last_active_at: 1.day.ago - Card::Engageable::STAGNATED_AFTER)
+    cards(:shipping).update!(last_active_at: 1.day.from_now - Card::Engageable::STAGNATED_AFTER)
+
+    assert_difference -> { Card.considering.count }, +1 do
+      Card.auto_reconsider_all_stagnated
+    end
+
+    assert cards(:shipping).reload.doing?
+    assert cards(:logo).reload.considering?
+  end
+end
diff --git a/test/models/card/eventable_test.rb b/test/models/card/eventable_test.rb
new file mode 100644
index 000000000..bac798df9
--- /dev/null
+++ b/test/models/card/eventable_test.rb
@@ -0,0 +1,21 @@
+require "test_helper"
+
+class Card::EventableTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+  end
+
+  test "new cards get the current time as the last activity time" do
+    freeze_time
+
+    card = collections(:writebook).cards.create!(title: "Some card card", creator: users(:david))
+    assert_equal Time.current, card.last_active_at
+  end
+
+  test "tracking events update the last activity time" do
+    travel_to Time.current
+
+    cards(:logo).closure!
+    assert_equal Time.current, cards(:logo).last_active_at
+  end
+end
diff --git a/test/models/card/messages_test.rb b/test/models/card/messages_test.rb
new file mode 100644
index 000000000..08ade7f0f
--- /dev/null
+++ b/test/models/card/messages_test.rb
@@ -0,0 +1,46 @@
+require "test_helper"
+
+class Card::MessagesTest < ActiveSupport::TestCase
+  test "creating a card does not create a message by default" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New"
+
+    assert_empty card.messages
+  end
+
+  test "creating a card with an initial draft comment" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    assert_equal 1, card.messages.count
+    assert_equal "This is a comment", card.draft_comment.strip
+  end
+
+  test "updating the draft comment" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    card.update! draft_comment: "This is an updated comment"
+
+    assert_equal 1, card.messages.count
+    assert_equal "This is an updated comment", card.draft_comment.strip
+  end
+
+  test "setting the draft comment to be blank removes it" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    card.update! draft_comment: " "
+
+    assert card.messages.first.nil?
+  end
+
+  test "omitting the draft comment does not remove it" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "New",
+      draft_comment: "This is a comment"
+
+    card.update! title: "Newer"
+
+    assert_equal 1, card.messages.count
+    assert_equal "This is a comment", card.draft_comment.strip
+  end
+end
diff --git a/test/models/card/scorable_test.rb b/test/models/card/scorable_test.rb
new file mode 100644
index 000000000..25ba7e9f9
--- /dev/null
+++ b/test/models/card/scorable_test.rb
@@ -0,0 +1,90 @@
+require "test_helper"
+
+class Card::ScorableTest < ActiveSupport::TestCase
+  test "a card has a score that increases with activity" do
+    card = cards(:logo)
+
+    score = card.activity_score
+    assert_operator score, :>, 0
+
+    with_current_user :kevin do
+      card.capture Comment.create(body: "This is exciting!")
+    end
+
+    assert_operator card.activity_score, :>, score
+  end
+
+  test "commenting on a card boosts its score more than boosting it" do
+    card = cards(:logo)
+    card.rescore
+
+    comment_change = capture_change -> { card.activity_score } do
+      with_current_user :kevin do
+        card.capture Comment.create(body: "This is exciting!")
+      end
+    end
+
+    boost_change = capture_change -> { card.activity_score } do
+      with_current_user :kevin do
+        card.boost!
+      end
+    end
+
+    assert_operator comment_change, :>, boost_change
+  end
+
+  test "recent activity counts more than older activity in the ordering" do
+    with_current_user :kevin do
+      travel_to 5.days.ago
+      card_old = collections(:writebook).cards.create! status: :published, title: "old"
+      card_mid = collections(:writebook).cards.create! status: :published, title: "mid"
+      card_new = collections(:writebook).cards.create! status: :published, title: "new"
+
+      card_old.boost!
+      card_old.boost!
+
+      travel_back
+      travel_to 2.days.ago
+      card_mid.boost!
+
+      travel_back
+      card_new.boost!
+
+      assert_equal %w[ new mid old ], Card.where(id: [ card_old, card_mid, card_new ]).ordered_by_activity.map(&:title)
+    end
+  end
+
+  test "items with old activity are more stale than those with none, or with new activity" do
+    with_current_user :kevin do
+      travel_to 20.days.ago
+      card_old = collections(:writebook).cards.create! status: :published, title: "old"
+      card_new = collections(:writebook).cards.create! status: :published, title: "new"
+      card_none = collections(:writebook).cards.create! status: :published, title: "none"
+
+      card_old.boost!
+      card_old.boost!
+
+      travel_back
+      travel_to 2.days.ago
+      card_new.boost!
+      card_new.boost!
+
+      travel_back
+
+      assert_equal %w[ old new none ], Card.where(id: [ card_none, card_old, card_new ]).ordered_by_staleness.map(&:title)
+
+      card_old.boost!
+
+      assert_equal %w[ new old none ], Card.where(id: [ card_none, card_old, card_new ]).ordered_by_staleness.map(&:title)
+    end
+  end
+
+  test "cards with no activity have a valid activity_score_order" do
+    card = Card.create! collection: collections(:writebook), creator: users(:kevin)
+
+    card.rescore
+
+    assert card.activity_score.zero?
+    assert_not card.activity_score_order.infinite?
+  end
+end
diff --git a/test/models/card/searchable_test.rb b/test/models/card/searchable_test.rb
new file mode 100644
index 000000000..a0415739a
--- /dev/null
+++ b/test/models/card/searchable_test.rb
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class Card::SearchableTest < ActiveSupport::TestCase
+  setup do
+    Card.all.each(&:reindex)
+    Comment.all.each(&:reindex)
+  end
+
+  test "searching by title" do
+    assert_includes Card.mentioning("layout is broken"), cards(:layout)
+  end
+
+  test "searching by comment" do
+    assert_includes Card.mentioning("overflowing"), cards(:layout)
+  end
+
+  test "sanitizing search query" do
+    assert_includes Card.mentioning("broken \""), cards(:layout)
+  end
+
+  test "a search with no valid terms returns empty results" do
+    assert_empty Card.mentioning("\"")
+  end
+end
diff --git a/test/models/card/statuses_test.rb b/test/models/card/statuses_test.rb
new file mode 100644
index 000000000..4f0c54312
--- /dev/null
+++ b/test/models/card/statuses_test.rb
@@ -0,0 +1,61 @@
+require "test_helper"
+
+class Card::StatusesTest < ActiveSupport::TestCase
+  test "cards start out in a `creating` state" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "Newly created card"
+
+    assert card.creating?
+    assert_not_includes Card.published_or_drafted_by(users(:kevin)), card
+    assert_not_includes Card.published_or_drafted_by(users(:jz)), card
+  end
+
+  test "cards are only visible to the creator when drafted" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "Drafted Card"
+    card.drafted!
+
+    assert_includes Card.published_or_drafted_by(users(:kevin)), card
+    assert_not_includes Card.published_or_drafted_by(users(:jz)), card
+  end
+
+  test "cards are visible to everyone when published" do
+    card = collections(:writebook).cards.create! creator: users(:kevin), title: "Published Card"
+    card.published!
+
+    assert_includes Card.published_or_drafted_by(users(:kevin)), card
+    assert_includes Card.published_or_drafted_by(users(:jz)), card
+  end
+
+  test "can_recover_abandoned_creation?" do
+    card = collections(:writebook).cards.create! creator: users(:kevin)
+    unsaved_card = collections(:writebook).cards.new creator: users(:kevin)
+
+    assert_not unsaved_card.can_recover_abandoned_creation?
+
+    card.update!(title: "Something worth keeping")
+    assert unsaved_card.can_recover_abandoned_creation?
+  end
+
+  test "recover_abandoned_creation" do
+    card_edited = collections(:writebook).cards.create! creator: users(:kevin)
+    card_edited.update!(title: "Something worth keeping")
+
+    card_not_edited = collections(:writebook).cards.create! creator: users(:kevin)
+
+    assert card_not_edited.can_recover_abandoned_creation?
+
+    assert_equal card_edited, card_not_edited.recover_abandoned_creation
+
+    assert_raises(ActiveRecord::RecordNotFound) { card_not_edited.reload }
+  end
+
+  test "remove_abandoned_creations" do
+    card_old = collections(:writebook).cards.create! creator: users(:kevin), updated_at: 2.days.ago
+    card_recent = collections(:writebook).cards.create! creator: users(:kevin)
+
+    assert_equal 2, Card.creating.count
+
+    Card.remove_abandoned_creations
+
+    assert_equal [ card_recent ], Card.creating
+  end
+end
diff --git a/test/models/card/taggable_test.rb b/test/models/card/taggable_test.rb
new file mode 100644
index 000000000..5d054af14
--- /dev/null
+++ b/test/models/card/taggable_test.rb
@@ -0,0 +1,19 @@
+require "test_helper"
+
+class Card::TaggableTest < ActiveSupport::TestCase
+  setup do
+    @card = cards(:logo)
+  end
+
+  test "toggle tag" do
+    assert_difference -> { @card.tags.count }, 1 do
+      @card.toggle_tag_with "ruby"
+    end
+
+    assert_equal "ruby", @card.tags.last.title
+
+    assert_difference -> { @card.tags.count }, -1 do
+      @card.toggle_tag_with "ruby"
+    end
+  end
+end
diff --git a/test/models/card/watchable_test.rb b/test/models/card/watchable_test.rb
new file mode 100644
index 000000000..a2aa6e103
--- /dev/null
+++ b/test/models/card/watchable_test.rb
@@ -0,0 +1,43 @@
+require "test_helper"
+
+class Card::WatchableTest < ActiveSupport::TestCase
+  setup do
+    Watch.destroy_all
+    Access.all.update!(involvement: :access_only)
+  end
+
+  test "watched_by?" do
+    assert_not cards(:logo).watched_by?(users(:kevin))
+
+    cards(:logo).watch_by users(:kevin)
+    assert cards(:logo).watched_by?(users(:kevin))
+
+    cards(:logo).unwatch_by users(:kevin)
+    assert_not cards(:logo).watched_by?(users(:kevin))
+  end
+
+  test "watched_by? when notifications are set on the collection" do
+    collections(:writebook).access_for(users(:kevin)).watching!
+    assert cards(:text).watched_by?(users(:kevin))
+
+    cards(:logo).unwatch_by users(:kevin)
+    assert_not cards(:logo).watched_by?(users(:kevin))
+  end
+
+  test "cards are initially watched by their creator" do
+    card = collections(:writebook).cards.create!(creator: users(:kevin))
+
+    assert card.watched_by?(users(:kevin))
+  end
+
+  test "watchers_and_subscribers" do
+    collections(:writebook).access_for(users(:kevin)).watching!
+    collections(:writebook).access_for(users(:jz)).everything!
+
+    cards(:logo).watch_by users(:kevin)
+    cards(:logo).unwatch_by users(:jz)
+    cards(:logo).watch_by users(:david)
+
+    assert_equal [ users(:kevin), users(:david) ].sort, cards(:logo).watchers_and_subscribers.sort
+  end
+end
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
new file mode 100644
index 000000000..ea1aaa062
--- /dev/null
+++ b/test/models/card_test.rb
@@ -0,0 +1,147 @@
+require "test_helper"
+
+class CardTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+  end
+
+  test "capturing messages" do
+    assert_difference "cards(:logo).messages.comments.count", +1 do
+      cards(:logo).capture Comment.new(body: "Agreed.")
+    end
+
+    assert_equal "Agreed.", cards(:logo).messages.comments.last.messageable.body.to_plain_text.chomp
+  end
+
+  test "boosting" do
+    assert_changes -> { cards(:logo).activity_score } do
+      assert_difference -> { cards(:logo).boosts_count }, +1 do
+        cards(:logo).boost!(cards(:logo).boosts_count+ 1)
+      end
+    end
+  end
+
+  test "assignment states" do
+    assert cards(:logo).assigned_to?(users(:kevin))
+    assert_not cards(:logo).assigned_to?(users(:david))
+  end
+
+  test "assignment toggling" do
+    assert cards(:logo).assigned_to?(users(:kevin))
+
+    assert_difference({ "cards(:logo).assignees.count" => -1, "Event.count" => +1 }) do
+      cards(:logo).toggle_assignment users(:kevin)
+    end
+    assert_not cards(:logo).assigned_to?(users(:kevin))
+    assert_equal "unassigned", Event.last.action
+    assert_equal [ users(:kevin) ], Event.last.assignees
+
+    assert_difference %w[ cards(:logo).assignees.count Event.count ], +1 do
+      cards(:logo).toggle_assignment users(:kevin)
+    end
+    assert cards(:logo).assigned_to?(users(:kevin))
+    assert_equal "assigned", Event.last.action
+    assert_equal [ users(:kevin) ], Event.last.assignees
+  end
+
+  test "tagged states" do
+    assert cards(:logo).tagged_with?(tags(:web))
+    assert_not cards(:logo).tagged_with?(tags(:mobile))
+  end
+
+  test "tag toggling" do
+    assert cards(:logo).tagged_with?(tags(:web))
+
+    assert_difference "cards(:logo).taggings.count", -1 do
+      cards(:logo).toggle_tag_with tags(:web).title
+    end
+    assert_not cards(:logo).tagged_with?(tags(:web))
+
+    assert_difference "cards(:logo).taggings.count", +1 do
+      cards(:logo).toggle_tag_with tags(:web).title
+    end
+    assert cards(:logo).tagged_with?(tags(:web))
+
+    assert_difference %w[ cards(:logo).taggings.count accounts("37s").tags.count ], +1 do
+      cards(:logo).toggle_tag_with "prioritized"
+    end
+    assert_equal "prioritized", cards(:logo).taggings.last.tag.title
+  end
+
+  test "searchable by title" do
+    card = collections(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin)
+
+    assert_includes Card.search("haggis"), card
+  end
+
+  test "ordering by comments" do
+    assert_equal cards(:logo, :layout, :shipping, :text), Card.ordered_by_comments
+  end
+
+  test "ordering by boosts" do
+    cards(:layout).update! boosts_count: 1_000
+    assert_equal cards(:layout, :logo, :shipping, :text), Card.ordered_by_boosts
+  end
+
+  test "closed" do
+    assert_equal [ cards(:shipping) ], Card.closed
+  end
+
+  test "active" do
+    assert_equal cards(:logo, :layout, :text), Card.active
+  end
+
+  test "unassigned" do
+    assert_equal cards(:shipping, :text), Card.unassigned
+  end
+
+  test "assigned to" do
+    assert_equal cards(:logo, :layout), Card.assigned_to(users(:jz))
+  end
+
+  test "assigned by" do
+    assert_equal cards(:layout, :logo), Card.assigned_by(users(:david))
+  end
+
+  test "in collection" do
+    new_collection = accounts("37s").collections.create! name: "New Collection", creator: users(:david)
+    assert_equal cards(:logo, :shipping, :layout, :text), Card.in_collection(collections(:writebook))
+    assert_empty Card.in_collection(new_collection)
+  end
+
+  test "tagged with" do
+    assert_equal cards(:layout, :text), Card.tagged_with(tags(:mobile))
+  end
+
+  test "mentioning" do
+    card = collections(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin)
+    cards(:logo).capture Comment.new(body: "I hate haggis")
+    cards(:text).capture Comment.new(body: "I love haggis")
+
+    assert_equal [ card, cards(:logo), cards(:text) ].sort, Card.mentioning("haggis").sort
+  end
+
+  test "cache key includes the collection name" do
+    card = cards(:logo)
+    cache_v1_key = card.cache_key
+
+    card.collection.touch
+    assert_equal cache_v1_key, card.reload.cache_key, "general collection touching should not affect the card's cache key"
+
+    card.collection.update! name: "Good ideas"
+    assert_not_equal cache_v1_key, card.reload.cache_key, "changing the name of the collection should invalidate the cache"
+  end
+
+  test "cache key includes the tenant name" do
+    card = cards(:logo)
+
+    assert_includes card.cache_key, ApplicationRecord.current_tenant, "cache key must always include the tenant"
+  end
+
+  test "cache key gracefully handles a nil collection" do
+    card = cards(:logo)
+    card.update_column :collection_id, Collection.last.id + 1
+
+    assert_nothing_raised { card.reload.cache_key }
+  end
+end
diff --git a/test/models/collection_test.rb b/test/models/collection_test.rb
new file mode 100644
index 000000000..526834305
--- /dev/null
+++ b/test/models/collection_test.rb
@@ -0,0 +1,33 @@
+require "test_helper"
+
+class CollectionTest < ActiveSupport::TestCase
+  test "revising access" do
+    collections(:writebook).update! all_access: false
+
+    collections(:writebook).accesses.revise granted: users(:david, :jz), revoked: users(:kevin)
+    assert_equal users(:david, :jz), collections(:writebook).users
+
+    collections(:writebook).accesses.grant_to users(:kevin)
+    assert_includes collections(:writebook).users.reload, users(:kevin)
+
+    collections(:writebook).accesses.revoke_from users(:kevin)
+    assert_not_includes collections(:writebook).users.reload, users(:kevin)
+  end
+
+  test "grants access to everyone after creation" do
+    collection = Current.set(session: sessions(:david)) do
+      accounts("37s").collections.create! name: "New collection", all_access: true
+    end
+    assert_equal accounts("37s").users, collection.users
+  end
+
+  test "grants access to everyone after update" do
+    collection = Current.set(session: sessions(:david)) do
+      accounts("37s").collections.create! name: "New collection"
+    end
+    assert_equal [ users(:david) ], collection.users
+
+    collection.update! all_access: true
+    assert_equal accounts("37s").users, collection.users.reload
+  end
+end
diff --git a/test/models/comment_test.rb b/test/models/comment_test.rb
index c7fcacff3..dfe2cee06 100644
--- a/test/models/comment_test.rb
+++ b/test/models/comment_test.rb
@@ -6,59 +6,59 @@ class CommentTest < ActiveSupport::TestCase
   end
 
   test "searchable by body" do
-    message = bubbles(:logo).capture Comment.new(body: "I'd prefer something more rustic")
+    message = cards(:logo).capture Comment.new(body: "I'd prefer something more rustic")
 
     assert_includes Comment.search("something rustic"), message.comment
   end
 
-  test "updating bubble counter" do
-    assert_difference -> { bubbles(:logo).comments_count } do
-      assert_changes -> { bubbles(:logo).activity_score } do
-        bubbles(:logo).capture Comment.new(body: "I'd prefer something more rustic")
+  test "updating card counter" do
+    assert_difference -> { cards(:logo).comments_count } do
+      assert_changes -> { cards(:logo).activity_score } do
+        cards(:logo).capture Comment.new(body: "I'd prefer something more rustic")
       end
     end
 
-    assert_difference -> { bubbles(:logo).comments_count }, -1 do
-      assert_changes -> { bubbles(:logo).activity_score } do
-        bubbles(:logo).messages.comments.last.destroy
+    assert_difference -> { cards(:logo).comments_count }, -1 do
+      assert_changes -> { cards(:logo).activity_score } do
+        cards(:logo).messages.comments.last.destroy
       end
     end
   end
 
-  test "first_by_author_on_bubble?" do
-    assert_not Comment.new.first_by_author_on_bubble?
+  test "first_by_author_on_card?" do
+    assert_not Comment.new.first_by_author_on_card?
 
     with_current_user :david do
-      comment = Comment.new.tap { |c| bubbles(:logo).capture c }
-      assert comment.first_by_author_on_bubble?
+      comment = Comment.new.tap { |c| cards(:logo).capture c }
+      assert comment.first_by_author_on_card?
 
-      comment = Comment.new.tap { |c| bubbles(:logo).capture c }
-      assert_not comment.first_by_author_on_bubble?
+      comment = Comment.new.tap { |c| cards(:logo).capture c }
+      assert_not comment.first_by_author_on_card?
     end
 
     with_current_user :kevin do
-      comment = Comment.new.tap { |c| bubbles(:logo).capture c }
-      assert_not comment.first_by_author_on_bubble?
+      comment = Comment.new.tap { |c| cards(:logo).capture c }
+      assert_not comment.first_by_author_on_card?
     end
   end
 
   test "follows_comment_by_another_author?" do
     assert_not Comment.new.follows_comment_by_another_author?
 
-    bubble = buckets(:writebook).bubbles.create!
+    card = collections(:writebook).cards.create!
 
     with_current_user :david do
-      comment = Comment.new.tap { |c| bubble.capture c }
+      comment = Comment.new.tap { |c| card.capture c }
       assert_not comment.follows_comment_by_another_author?
     end
 
     with_current_user :kevin do
-      comment = Comment.new.tap { |c| bubble.capture c }
+      comment = Comment.new.tap { |c| card.capture c }
       assert comment.follows_comment_by_another_author?
     end
 
     with_current_user :david do
-      comment = Comment.new.tap { |c| bubble.capture c }
+      comment = Comment.new.tap { |c| card.capture c }
       assert comment.follows_comment_by_another_author?
     end
   end
diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index 1cf117dc4..73f4f4ee2 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -1,46 +1,46 @@
 require "test_helper"
 
 class FilterTest < ActiveSupport::TestCase
-  test "bubbles" do
+  test "cards" do
     Current.set session: sessions(:david) do
-      @new_bucket = accounts("37s").buckets.create! name: "Inaccessible Bucket"
-      @new_bubble = @new_bucket.bubbles.create!
-      @new_bubble.update!(stage: workflow_stages(:qa_triage))
+      @new_collection = accounts("37s").collections.create! name: "Inaccessible Collection"
+      @new_card = @new_collection.cards.create!
+      @new_card.update!(stage: workflow_stages(:qa_triage))
 
-      bubbles(:layout).capture Comment.new(body: "I hate haggis")
-      bubbles(:logo).capture Comment.new(body: "I love haggis")
-      bubbles(:logo).update(stage: workflow_stages(:qa_triage))
+      cards(:layout).capture Comment.new(body: "I hate haggis")
+      cards(:logo).capture Comment.new(body: "I love haggis")
+      cards(:logo).update(stage: workflow_stages(:qa_triage))
     end
 
-    assert_not_includes users(:kevin).filters.new.bubbles, @new_bubble
+    assert_not_includes users(:kevin).filters.new.cards, @new_card
 
     filter = users(:david).filters.new indexed_by: "most_discussed", assignee_ids: [ users(:jz).id ], tag_ids: [ tags(:mobile).id ]
-    assert_equal [ bubbles(:layout) ], filter.bubbles
+    assert_equal [ cards(:layout) ], filter.cards
 
     filter = users(:david).filters.new creator_ids: [ users(:david).id ], tag_ids: [ tags(:mobile).id ]
-    assert_equal [ bubbles(:layout) ], filter.bubbles
+    assert_equal [ cards(:layout) ], filter.cards
 
     filter = users(:david).filters.new stage_ids: [ workflow_stages(:qa_triage).id ]
-    assert_equal [ bubbles(:logo), @new_bubble ], filter.bubbles
+    assert_equal [ cards(:logo), @new_card ], filter.cards
 
-    filter = users(:david).filters.new assignment_status: "unassigned", bucket_ids: [ @new_bucket.id ]
-    assert_equal [ @new_bubble ], filter.bubbles
+    filter = users(:david).filters.new assignment_status: "unassigned", collection_ids: [ @new_collection.id ]
+    assert_equal [ @new_card ], filter.cards
 
     filter = users(:david).filters.new terms: [ "haggis" ]
-    assert_equal bubbles(:logo, :layout).sort, filter.bubbles.sort
+    assert_equal cards(:logo, :layout).sort, filter.cards.sort
 
     filter = users(:david).filters.new terms: [ "haggis", "love" ]
-    assert_equal [ bubbles(:logo) ], filter.bubbles
+    assert_equal [ cards(:logo) ], filter.cards
 
-    filter = users(:david).filters.new indexed_by: "popped"
-    assert_equal [ bubbles(:shipping) ], filter.bubbles
+    filter = users(:david).filters.new indexed_by: "closed"
+    assert_equal [ cards(:shipping) ], filter.cards
   end
 
-  test "can't see bubbles in buckets that aren't accessible" do
-    buckets(:writebook).update! all_access: false
-    buckets(:writebook).accesses.revoke_from users(:david)
+  test "can't see cards in collections that aren't accessible" do
+    collections(:writebook).update! all_access: false
+    collections(:writebook).accesses.revoke_from users(:david)
 
-    assert_empty users(:david).filters.new(bucket_ids: [ buckets(:writebook).id ]).bubbles
+    assert_empty users(:david).filters.new(collection_ids: [ collections(:writebook).id ]).cards
   end
 
   test "remembering equivalent filters" do
@@ -61,14 +61,14 @@ class FilterTest < ActiveSupport::TestCase
   end
 
   test "turning into params" do
-    filter = users(:david).filters.new indexed_by: "most_active", tag_ids: "", assignee_ids: [ users(:jz).id ], bucket_ids: [ buckets(:writebook).id ]
-    expected = { assignee_ids: [ users(:jz).id ], bucket_ids: [ buckets(:writebook).id ] }
+    filter = users(:david).filters.new indexed_by: "most_active", tag_ids: "", assignee_ids: [ users(:jz).id ], collection_ids: [ collections(:writebook).id ]
+    expected = { assignee_ids: [ users(:jz).id ], collection_ids: [ collections(:writebook).id ] }
     assert_equal expected, filter.as_params
   end
 
   test "cacheability" do
     assert_not filters(:jz_assignments).cacheable?
-    assert users(:david).filters.create!(bucket_ids: [ buckets(:writebook).id ]).cacheable?
+    assert users(:david).filters.create!(collection_ids: [ collections(:writebook).id ]).cacheable?
   end
 
   test "terms" do
@@ -77,12 +77,12 @@ class FilterTest < ActiveSupport::TestCase
   end
 
   test "resource removal" do
-    filter = users(:david).filters.create! tag_ids: [ tags(:mobile).id ], bucket_ids: [ buckets(:writebook).id ]
+    filter = users(:david).filters.create! tag_ids: [ tags(:mobile).id ], collection_ids: [ collections(:writebook).id ]
 
     assert_includes filter.as_params[:tag_ids], tags(:mobile).id
     assert_includes filter.tags, tags(:mobile)
-    assert_includes filter.as_params[:bucket_ids], buckets(:writebook).id
-    assert_includes filter.buckets, buckets(:writebook)
+    assert_includes filter.as_params[:collection_ids], collections(:writebook).id
+    assert_includes filter.collections, collections(:writebook)
 
     assert_changes "filter.reload.updated_at" do
       tags(:mobile).destroy!
@@ -90,13 +90,13 @@ class FilterTest < ActiveSupport::TestCase
     assert_nil filter.reload.as_params[:tag_ids]
 
     assert_changes "Filter.exists?(filter.id)" do
-      buckets(:writebook).destroy!
+      collections(:writebook).destroy!
     end
   end
 
   test "duplicate filters are removed after a resource is destroyed" do
-    users(:david).filters.create! tag_ids: [ tags(:mobile).id ], bucket_ids: [ buckets(:writebook).id ]
-    users(:david).filters.create! tag_ids: [ tags(:mobile).id, tags(:web).id ], bucket_ids: [ buckets(:writebook).id ]
+    users(:david).filters.create! tag_ids: [ tags(:mobile).id ], collection_ids: [ collections(:writebook).id ]
+    users(:david).filters.create! tag_ids: [ tags(:mobile).id, tags(:web).id ], collection_ids: [ collections(:writebook).id ]
 
     assert_difference "Filter.count", -1 do
       tags(:web).destroy!
@@ -109,7 +109,7 @@ class FilterTest < ActiveSupport::TestCase
     filters(:jz_assignments).update!(stages: workflow_stages(:qa_triage, :qa_in_progress))
     assert_equal "Most discussed, tagged #mobile, assigned to JZ, and staged in Triage or In progress ", filters(:jz_assignments).summary
 
-    filters(:jz_assignments).update!(stages: [], assignees: [], tags: [], buckets: [ buckets(:writebook) ])
+    filters(:jz_assignments).update!(stages: [], assignees: [], tags: [], collections: [ collections(:writebook) ])
     assert_equal "Most discussed in Writebook", filters(:jz_assignments).summary
 
     filters(:jz_assignments).update!(indexed_by: "stalled")
@@ -134,9 +134,9 @@ class FilterTest < ActiveSupport::TestCase
 
   test "get a clone with some changed params" do
     seed_filter = users(:david).filters.new indexed_by: "active", terms: [ "haggis" ]
-    filter = seed_filter.with(indexed_by: "popped")
+    filter = seed_filter.with(indexed_by: "closed")
 
-    assert filter.indexed_by.popped?
+    assert filter.indexed_by.closed?
     assert_equal [ "haggis" ], filter.terms
   end
 end
diff --git a/test/models/notifier_test.rb b/test/models/notifier_test.rb
index 49050b20a..7f2c7b5ac 100644
--- a/test/models/notifier_test.rb
+++ b/test/models/notifier_test.rb
@@ -14,7 +14,7 @@ class NotifierTest < ActiveSupport::TestCase
   end
 
   test "generate does not create notifications if the event was system-generated" do
-    bubbles(:logo).drafted!
+    cards(:logo).drafted!
     events(:logo_published).update!(creator: accounts("37s").users.system)
 
     assert_no_difference -> { Notification.count } do
@@ -29,7 +29,7 @@ class NotifierTest < ActiveSupport::TestCase
   end
 
   test "does not create a notification for access-only users" do
-    buckets(:writebook).access_for(users(:kevin)).access_only!
+    collections(:writebook).access_for(users(:kevin)).access_only!
 
     notifications = Notifier.for(events(:layout_commented)).generate
 
@@ -42,15 +42,15 @@ class NotifierTest < ActiveSupport::TestCase
     assert_equal users(:kevin, :jz).sort, notifications.map(&:user).sort
   end
 
-  test "links to the bubble" do
+  test "links to the card" do
     Notifier.for(events(:logo_published)).generate
 
-    assert_equal bubbles(:logo), Notification.last.resource
+    assert_equal cards(:logo), Notification.last.resource
   end
 
   test "assignment events only create a notification for the assignee" do
-    buckets(:writebook).access_for(users(:jz)).watching!
-    buckets(:writebook).access_for(users(:kevin)).everything!
+    collections(:writebook).access_for(users(:jz)).watching!
+    collections(:writebook).access_for(users(:kevin)).everything!
 
     notifications = Notifier.for(events(:logo_assignment_jz)).generate
 
@@ -58,7 +58,7 @@ class NotifierTest < ActiveSupport::TestCase
   end
 
   test "assignment events do not notify users who are access-only for the collection" do
-    buckets(:writebook).access_for(users(:jz)).access_only!
+    collections(:writebook).access_for(users(:jz)).access_only!
 
     notifications = Notifier.for(events(:logo_assignment_jz)).generate
 
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 166191c9b..9a24c9dcd 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -13,7 +13,7 @@ class UserTest < ActiveSupport::TestCase
     assert_equal user, User.authenticate_by(email_address: "victor@hey.com", password: "secret123456")
   end
 
-  test "creation gives access to all_access buckets" do
+  test "creation gives access to all_access collections" do
     user = User.create! \
       account: accounts("37s"),
       role: "member",
@@ -21,7 +21,7 @@ class UserTest < ActiveSupport::TestCase
       email_address: "victor@hey.com",
       password: "secret123456"
 
-    assert_equal [ buckets(:writebook) ], user.buckets
+    assert_equal [ collections(:writebook) ], user.collections
   end
 
   test "deactivate" do

From 6f00e1a79a9989772553bf80570e642ee0b97cdf Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 9 Apr 2025 14:53:46 +0200
Subject: [PATCH 2/7] Reorganize templates to remove cards/cards redundancy

---
 app/views/cards/assignments/create.turbo_stream.erb       | 2 +-
 app/views/cards/cards/mini/_tags.html.erb                 | 1 -
 app/views/cards/cards/perma/_meta.html.erb                | 3 ---
 app/views/cards/cards/perma/_people.html.erb              | 3 ---
 app/views/cards/cards/preview/_assignees.html.erb         | 1 -
 app/views/cards/cards/preview/_meta.html.erb              | 3 ---
 app/views/cards/cards/preview/_people.html.erb            | 3 ---
 app/views/cards/{cards => display}/_mini.html.erb         | 4 ++--
 app/views/cards/{cards => display}/_perma.html.erb        | 8 ++++----
 app/views/cards/{cards => display}/_preview.html.erb      | 8 ++++----
 .../cards/{cards => display}/common/_assignees.html.erb   | 0
 .../cards/{cards => display}/common/_background.html.erb  | 0
 app/views/cards/{cards => display}/common/_meta.html.erb  | 0
 .../cards/{cards => display}/common/_people.html.erb      | 0
 .../cards/{cards => display}/mini/_assignees.html.erb     | 0
 app/views/cards/display/mini/_tags.html.erb               | 1 +
 .../cards/{cards => display}/perma/_assignees.html.erb    | 2 +-
 app/views/cards/{cards => display}/perma/_boosts.html.erb | 0
 app/views/cards/display/perma/_meta.html.erb              | 3 +++
 app/views/cards/display/perma/_people.html.erb            | 3 +++
 app/views/cards/{cards => display}/perma/_tags.html.erb   | 0
 app/views/cards/display/preview/_assignees.html.erb       | 1 +
 .../cards/{cards => display}/preview/_boosts.html.erb     | 0
 app/views/cards/display/preview/_meta.html.erb            | 3 +++
 app/views/cards/display/preview/_people.html.erb          | 3 +++
 .../cards/{cards => display}/preview/_stages.html.erb     | 0
 app/views/cards/{cards => display}/preview/_tags.html.erb | 0
 app/views/cards/index.html.erb                            | 6 +++---
 .../cards/index/{cards => engagement}/_closed.html.erb    | 2 +-
 .../index/{cards => engagement}/_considering.html.erb     | 2 +-
 .../cards/index/{cards => engagement}/_doing.html.erb     | 2 +-
 app/views/cards/show.html.erb                             | 2 +-
 app/views/cards/taggings/create.turbo_stream.erb          | 2 +-
 33 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 app/views/cards/cards/mini/_tags.html.erb
 delete mode 100644 app/views/cards/cards/perma/_meta.html.erb
 delete mode 100644 app/views/cards/cards/perma/_people.html.erb
 delete mode 100644 app/views/cards/cards/preview/_assignees.html.erb
 delete mode 100644 app/views/cards/cards/preview/_meta.html.erb
 delete mode 100644 app/views/cards/cards/preview/_people.html.erb
 rename app/views/cards/{cards => display}/_mini.html.erb (84%)
 rename app/views/cards/{cards => display}/_perma.html.erb (88%)
 rename app/views/cards/{cards => display}/_preview.html.erb (81%)
 rename app/views/cards/{cards => display}/common/_assignees.html.erb (100%)
 rename app/views/cards/{cards => display}/common/_background.html.erb (100%)
 rename app/views/cards/{cards => display}/common/_meta.html.erb (100%)
 rename app/views/cards/{cards => display}/common/_people.html.erb (100%)
 rename app/views/cards/{cards => display}/mini/_assignees.html.erb (100%)
 create mode 100644 app/views/cards/display/mini/_tags.html.erb
 rename app/views/cards/{cards => display}/perma/_assignees.html.erb (59%)
 rename app/views/cards/{cards => display}/perma/_boosts.html.erb (100%)
 create mode 100644 app/views/cards/display/perma/_meta.html.erb
 create mode 100644 app/views/cards/display/perma/_people.html.erb
 rename app/views/cards/{cards => display}/perma/_tags.html.erb (100%)
 create mode 100644 app/views/cards/display/preview/_assignees.html.erb
 rename app/views/cards/{cards => display}/preview/_boosts.html.erb (100%)
 create mode 100644 app/views/cards/display/preview/_meta.html.erb
 create mode 100644 app/views/cards/display/preview/_people.html.erb
 rename app/views/cards/{cards => display}/preview/_stages.html.erb (100%)
 rename app/views/cards/{cards => display}/preview/_tags.html.erb (100%)
 rename app/views/cards/index/{cards => engagement}/_closed.html.erb (75%)
 rename app/views/cards/index/{cards => engagement}/_considering.html.erb (79%)
 rename app/views/cards/index/{cards => engagement}/_doing.html.erb (86%)

diff --git a/app/views/cards/assignments/create.turbo_stream.erb b/app/views/cards/assignments/create.turbo_stream.erb
index db92a0e18..d66721e4b 100644
--- a/app/views/cards/assignments/create.turbo_stream.erb
+++ b/app/views/cards/assignments/create.turbo_stream.erb
@@ -1 +1 @@
-<%= turbo_stream.replace([ @card, :assignees ], partial: "cards/cards/perma/assignees", locals: { card: @card }) %>
+<%= turbo_stream.replace([ @card, :assignees ], partial: "cards/display/perma/assignees", locals: { card: @card }) %>
diff --git a/app/views/cards/cards/mini/_tags.html.erb b/app/views/cards/cards/mini/_tags.html.erb
deleted file mode 100644
index 5d85c261b..000000000
--- a/app/views/cards/cards/mini/_tags.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render "cards/cards/preview/tags", card: card %>
diff --git a/app/views/cards/cards/perma/_meta.html.erb b/app/views/cards/cards/perma/_meta.html.erb
deleted file mode 100644
index ffd524d83..000000000
--- a/app/views/cards/cards/perma/_meta.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "cards/cards/common/meta", card: card do %>
-  <%= render "cards/cards/perma/boosts", card: card %>
-<% end %>
diff --git a/app/views/cards/cards/perma/_people.html.erb b/app/views/cards/cards/perma/_people.html.erb
deleted file mode 100644
index c35da116b..000000000
--- a/app/views/cards/cards/perma/_people.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "cards/cards/common/people", card: card do%>
-  <%= render "cards/cards/perma/assignees", card: card %>
-<% end %>
diff --git a/app/views/cards/cards/preview/_assignees.html.erb b/app/views/cards/cards/preview/_assignees.html.erb
deleted file mode 100644
index 5f4ced1ff..000000000
--- a/app/views/cards/cards/preview/_assignees.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render "cards/cards/common/assignees", card: card  %>
diff --git a/app/views/cards/cards/preview/_meta.html.erb b/app/views/cards/cards/preview/_meta.html.erb
deleted file mode 100644
index c2b2d1fdf..000000000
--- a/app/views/cards/cards/preview/_meta.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "cards/cards/common/meta", card: card do %>
-  <%= render "cards/cards/preview/boosts", card: card %>
-<% end %>
diff --git a/app/views/cards/cards/preview/_people.html.erb b/app/views/cards/cards/preview/_people.html.erb
deleted file mode 100644
index 3647b9089..000000000
--- a/app/views/cards/cards/preview/_people.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "cards/cards/common/people", card: card do%>
-  <%= render "cards/cards/preview/assignees", card: card %>
-<% end %>
diff --git a/app/views/cards/cards/_mini.html.erb b/app/views/cards/display/_mini.html.erb
similarity index 84%
rename from app/views/cards/cards/_mini.html.erb
rename to app/views/cards/display/_mini.html.erb
index 01eeffd2c..2487b335c 100644
--- a/app/views/cards/cards/_mini.html.erb
+++ b/app/views/cards/display/_mini.html.erb
@@ -11,8 +11,8 @@
     </div>
 
     <div class="card__stuff flex align-center gap">
-      <%= render "cards/cards/mini/assignees", card: card %>
-      <div class="overflow-ellipsis"><%= render "cards/cards/mini/tags", card: card %></div>
+      <%= render "cards/display/mini/assignees", card: card %>
+      <div class="overflow-ellipsis"><%= render "cards/display/mini/tags", card: card %></div>
     </div>
   </div>
 
diff --git a/app/views/cards/cards/_perma.html.erb b/app/views/cards/display/_perma.html.erb
similarity index 88%
rename from app/views/cards/cards/_perma.html.erb
rename to app/views/cards/display/_perma.html.erb
index faf4c0451..8cd5f3d9b 100644
--- a/app/views/cards/cards/_perma.html.erb
+++ b/app/views/cards/display/_perma.html.erb
@@ -6,7 +6,7 @@
       <%= link_to card.collection.name, cards_path(collection_ids: [card.collection]),
             class: "card__collection txt-uppercase overflow-ellipsis txt-reversed" %>
 
-      <%= render "cards/cards/perma/tags", card: card %>
+      <%= render "cards/display/perma/tags", card: card %>
     </header>
 
     <div class="card__body flex gap full-width flex-item-grow">
@@ -35,10 +35,10 @@
     </div>
 
     <footer class="card__footer full-width flex align-start gap">
-      <%= render "cards/cards/perma/people", card: card %>
-      <%= render "cards/cards/perma/meta", card: card %>
+      <%= render "cards/display/perma/people", card: card %>
+      <%= render "cards/display/perma/meta", card: card %>
     </footer>
 
-    <%= render "cards/cards/common/background", card: card %>
+    <%= render "cards/display/common/background", card: card %>
   </article>
 <% end %>
diff --git a/app/views/cards/cards/_preview.html.erb b/app/views/cards/display/_preview.html.erb
similarity index 81%
rename from app/views/cards/cards/_preview.html.erb
rename to app/views/cards/display/_preview.html.erb
index 1eab911ff..d442626d3 100644
--- a/app/views/cards/cards/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -4,7 +4,7 @@
     id="<%= dom_id(card, :ticket) %>">
     <header class="card__header flex align-center gap min-width">
       <span class="card__collection txt-uppercase overflow-ellipsis txt-reversed"><%= card.collection.name %></span>
-      <%= render "cards/cards/preview/tags", card: card %>
+      <%= render "cards/display/preview/tags", card: card %>
     </header>
 
     <div class="card__body flex gap full-width flex-item-grow">
@@ -22,10 +22,10 @@
     </div>
 
     <footer class="card__footer full-width flex align-start gap">
-      <%= render "cards/cards/preview/people", card: card %>
-      <%= render "cards/cards/preview/meta", card: card %>
+      <%= render "cards/display/preview/people", card: card %>
+      <%= render "cards/display/preview/meta", card: card %>
     </footer>
 
-    <%= render "cards/cards/common/background", card: card %>
+    <%= render "cards/display/common/background", card: card %>
   </article>
 <% end %>
diff --git a/app/views/cards/cards/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
similarity index 100%
rename from app/views/cards/cards/common/_assignees.html.erb
rename to app/views/cards/display/common/_assignees.html.erb
diff --git a/app/views/cards/cards/common/_background.html.erb b/app/views/cards/display/common/_background.html.erb
similarity index 100%
rename from app/views/cards/cards/common/_background.html.erb
rename to app/views/cards/display/common/_background.html.erb
diff --git a/app/views/cards/cards/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
similarity index 100%
rename from app/views/cards/cards/common/_meta.html.erb
rename to app/views/cards/display/common/_meta.html.erb
diff --git a/app/views/cards/cards/common/_people.html.erb b/app/views/cards/display/common/_people.html.erb
similarity index 100%
rename from app/views/cards/cards/common/_people.html.erb
rename to app/views/cards/display/common/_people.html.erb
diff --git a/app/views/cards/cards/mini/_assignees.html.erb b/app/views/cards/display/mini/_assignees.html.erb
similarity index 100%
rename from app/views/cards/cards/mini/_assignees.html.erb
rename to app/views/cards/display/mini/_assignees.html.erb
diff --git a/app/views/cards/display/mini/_tags.html.erb b/app/views/cards/display/mini/_tags.html.erb
new file mode 100644
index 000000000..0db55060b
--- /dev/null
+++ b/app/views/cards/display/mini/_tags.html.erb
@@ -0,0 +1 @@
+<%= render "cards/display/preview/tags", card: card %>
diff --git a/app/views/cards/cards/perma/_assignees.html.erb b/app/views/cards/display/perma/_assignees.html.erb
similarity index 59%
rename from app/views/cards/cards/perma/_assignees.html.erb
rename to app/views/cards/display/perma/_assignees.html.erb
index 8872d66d3..1c530263e 100644
--- a/app/views/cards/cards/perma/_assignees.html.erb
+++ b/app/views/cards/display/perma/_assignees.html.erb
@@ -1,3 +1,3 @@
-<%= render "cards/cards/common/assignees", card: card do %>
+<%= render "cards/display/common/assignees", card: card do %>
   <%= turbo_frame_tag card, :assignment, src: new_card_assignment_path(card) %>
 <% end %>
diff --git a/app/views/cards/cards/perma/_boosts.html.erb b/app/views/cards/display/perma/_boosts.html.erb
similarity index 100%
rename from app/views/cards/cards/perma/_boosts.html.erb
rename to app/views/cards/display/perma/_boosts.html.erb
diff --git a/app/views/cards/display/perma/_meta.html.erb b/app/views/cards/display/perma/_meta.html.erb
new file mode 100644
index 000000000..6b68b2233
--- /dev/null
+++ b/app/views/cards/display/perma/_meta.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/display/common/meta", card: card do %>
+  <%= render "cards/display/perma/boosts", card: card %>
+<% end %>
diff --git a/app/views/cards/display/perma/_people.html.erb b/app/views/cards/display/perma/_people.html.erb
new file mode 100644
index 000000000..257e112b5
--- /dev/null
+++ b/app/views/cards/display/perma/_people.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/display/common/people", card: card do%>
+  <%= render "cards/display/perma/assignees", card: card %>
+<% end %>
diff --git a/app/views/cards/cards/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
similarity index 100%
rename from app/views/cards/cards/perma/_tags.html.erb
rename to app/views/cards/display/perma/_tags.html.erb
diff --git a/app/views/cards/display/preview/_assignees.html.erb b/app/views/cards/display/preview/_assignees.html.erb
new file mode 100644
index 000000000..3a4655224
--- /dev/null
+++ b/app/views/cards/display/preview/_assignees.html.erb
@@ -0,0 +1 @@
+<%= render "cards/display/common/assignees", card: card  %>
diff --git a/app/views/cards/cards/preview/_boosts.html.erb b/app/views/cards/display/preview/_boosts.html.erb
similarity index 100%
rename from app/views/cards/cards/preview/_boosts.html.erb
rename to app/views/cards/display/preview/_boosts.html.erb
diff --git a/app/views/cards/display/preview/_meta.html.erb b/app/views/cards/display/preview/_meta.html.erb
new file mode 100644
index 000000000..9fd0ec88a
--- /dev/null
+++ b/app/views/cards/display/preview/_meta.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/display/common/meta", card: card do %>
+  <%= render "cards/display/preview/boosts", card: card %>
+<% end %>
diff --git a/app/views/cards/display/preview/_people.html.erb b/app/views/cards/display/preview/_people.html.erb
new file mode 100644
index 000000000..08319d327
--- /dev/null
+++ b/app/views/cards/display/preview/_people.html.erb
@@ -0,0 +1,3 @@
+<%= render "cards/display/common/people", card: card do%>
+  <%= render "cards/display/preview/assignees", card: card %>
+<% end %>
diff --git a/app/views/cards/cards/preview/_stages.html.erb b/app/views/cards/display/preview/_stages.html.erb
similarity index 100%
rename from app/views/cards/cards/preview/_stages.html.erb
rename to app/views/cards/display/preview/_stages.html.erb
diff --git a/app/views/cards/cards/preview/_tags.html.erb b/app/views/cards/display/preview/_tags.html.erb
similarity index 100%
rename from app/views/cards/cards/preview/_tags.html.erb
rename to app/views/cards/display/preview/_tags.html.erb
diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb
index 2b0b035b0..b8c80ab1d 100644
--- a/app/views/cards/index.html.erb
+++ b/app/views/cards/index.html.erb
@@ -7,8 +7,8 @@
 <% end %>
 
 <div class="cards--columns">
-  <%= render "cards/index/cards/considering", cards: @considering_cards %>
-  <%= render "cards/index/cards/doing", cards: @doing_cards, filter: @filter %>
+  <%= render "cards/index/engagement/considering", cards: @considering_cards %>
+  <%= render "cards/index/engagement/doing", cards: @doing_cards, filter: @filter %>
 </div>
 
-<%= render "cards/index/cards/closed", cards: @closed_cards, filter: @filter %>
+<%= render "cards/index/engagement/closed", cards: @closed_cards, filter: @filter %>
diff --git a/app/views/cards/index/cards/_closed.html.erb b/app/views/cards/index/engagement/_closed.html.erb
similarity index 75%
rename from app/views/cards/index/cards/_closed.html.erb
rename to app/views/cards/index/engagement/_closed.html.erb
index 7c53916dd..ee86e23b6 100644
--- a/app/views/cards/index/cards/_closed.html.erb
+++ b/app/views/cards/index/engagement/_closed.html.erb
@@ -5,7 +5,7 @@
 
   <section class="cards--grid">
     <% if cards.any? %>
-      <%= render partial: "cards/cards/preview", collection: cards, as: :card, cached: true %>
+      <%= render partial: "cards/display/preview", collection: cards, as: :card, cached: true %>
     <% else %>
       <p class="txt-medium translucent">Nothing here</p>
     <% end %>
diff --git a/app/views/cards/index/cards/_considering.html.erb b/app/views/cards/index/engagement/_considering.html.erb
similarity index 79%
rename from app/views/cards/index/cards/_considering.html.erb
rename to app/views/cards/index/engagement/_considering.html.erb
index 9f184eb63..58f02a7f3 100644
--- a/app/views/cards/index/cards/_considering.html.erb
+++ b/app/views/cards/index/engagement/_considering.html.erb
@@ -4,7 +4,7 @@
   </h2>
 
   <% if cards.any? %>
-    <%= render partial: "cards/cards/mini", collection: cards, as: :card, cached: true %>
+    <%= render partial: "cards/display/mini", collection: cards, as: :card, cached: true %>
   <% else %>
     <p class="txt-medium translucent">Nothing here</p>
   <% end %>
diff --git a/app/views/cards/index/cards/_doing.html.erb b/app/views/cards/index/engagement/_doing.html.erb
similarity index 86%
rename from app/views/cards/index/cards/_doing.html.erb
rename to app/views/cards/index/engagement/_doing.html.erb
index 644ac5f63..57fc1aff9 100644
--- a/app/views/cards/index/cards/_doing.html.erb
+++ b/app/views/cards/index/engagement/_doing.html.erb
@@ -8,7 +8,7 @@
   <% end %>
 
   <% if cards.any? %>
-    <%= render partial: "cards/cards/preview", collection: cards, as: :card, cached: true %>
+    <%= render partial: "cards/display/preview", collection: cards, as: :card, cached: true %>
   <% else %>
     <p class="txt-medium translucent">Nothing here</p>
   <% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index e00ca579e..3fc163784 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -52,7 +52,7 @@
 
 <div data-controller="beacon" data-beacon-url-value="<%= card_reading_url(@card) %>">
   <div class="card__container position-relative <%= "card__container--pointing" unless @card.published? %>" style="--card-color: <%= @card.color %>;">
-    <%= render "cards/cards/perma", card: @card %>
+    <%= render "cards/display/perma", card: @card %>
 
     <div class="card__actions flex flex-column gap-half">
       <button class="car__star-button btn">
diff --git a/app/views/cards/taggings/create.turbo_stream.erb b/app/views/cards/taggings/create.turbo_stream.erb
index 770fa5882..f1775e2f8 100644
--- a/app/views/cards/taggings/create.turbo_stream.erb
+++ b/app/views/cards/taggings/create.turbo_stream.erb
@@ -1 +1 @@
-<%= turbo_stream.replace([ @card, :tags ], partial: "cards/cards/perma/tags", locals: { card: @card }) %>
+<%= turbo_stream.replace([ @card, :tags ], partial: "cards/display/perma/tags", locals: { card: @card }) %>

From 221bbb324769018e241cf53c06c656023dc27ced Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 9 Apr 2025 14:56:59 +0200
Subject: [PATCH 3/7] Fix renames that the scripts missed

---
 app/controllers/cards/closures_controller.rb           |  4 ++--
 app/javascript/controllers/card_size_controller.js     |  6 +++---
 ...losure_all_due_job.rb => auto_close_all_due_job.rb} |  4 ++--
 app/models/card/closeable.rb                           | 10 +++++-----
 app/models/card/engageable.rb                          |  4 ++--
 app/views/cards/_closure_toggle.html.erb               |  2 +-
 app/views/cards/display/common/_meta.html.erb          |  2 +-
 config/recurring.yml                                   |  4 ++--
 script/closureulate/collections_and_cards.rb           |  8 ++++----
 test/models/card/closeable_test.rb                     |  6 +++---
 test/models/card/engageable_test.rb                    |  4 ++--
 test/models/card/eventable_test.rb                     |  2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)
 rename app/jobs/card/{auto_closure_all_due_job.rb => auto_close_all_due_job.rb} (57%)

diff --git a/app/controllers/cards/closures_controller.rb b/app/controllers/cards/closures_controller.rb
index a62955228..3682552ee 100644
--- a/app/controllers/cards/closures_controller.rb
+++ b/app/controllers/cards/closures_controller.rb
@@ -2,12 +2,12 @@ class Cards::ClosuresController < ApplicationController
   include CardScoped
 
   def create
-    @card.closure!(user: Current.user, reason: params[:reason])
+    @card.close(user: Current.user, reason: params[:reason])
     redirect_to @card
   end
 
   def destroy
-    @card.unpop
+    @card.reopen
     redirect_to @card
   end
 end
diff --git a/app/javascript/controllers/card_size_controller.js b/app/javascript/controllers/card_size_controller.js
index b673e910d..e688358da 100644
--- a/app/javascript/controllers/card_size_controller.js
+++ b/app/javascript/controllers/card_size_controller.js
@@ -13,7 +13,7 @@ export default class extends Controller {
     const [ min, max ] = this.#getScoreRange()
 
     this.cardTargets.forEach(card => {
-      const score = this.#currentBubbleScore(card)
+      const score = this.#currentCardScore(card)
       const idx = Math.round((score - min) / (max - min) * (SIZES.length - 1))
 
       card.style.setProperty("--card-size", `var(--card-size-${SIZES[idx]})`)
@@ -24,7 +24,7 @@ export default class extends Controller {
     var min = 0, max = 1;
 
     this.cardTargets.forEach(card => {
-      const score = this.#currentBubbleScore(card)
+      const score = this.#currentCardScore(card)
 
       min = Math.min(min, score)
       max = Math.max(max, score)
@@ -33,7 +33,7 @@ export default class extends Controller {
     return [ min, max ]
   }
 
-  #currentBubbleScore(el) {
+  #currentCardScore(el) {
     const score = el.dataset.activityScore
     const scoreAt = el.dataset.activityScoreAt
     const daysAgo = (Date.now() / 1000 - scoreAt) / (60 * 60 * 24)
diff --git a/app/jobs/card/auto_closure_all_due_job.rb b/app/jobs/card/auto_close_all_due_job.rb
similarity index 57%
rename from app/jobs/card/auto_closure_all_due_job.rb
rename to app/jobs/card/auto_close_all_due_job.rb
index 0bf063c2b..6cb4f646b 100644
--- a/app/jobs/card/auto_closure_all_due_job.rb
+++ b/app/jobs/card/auto_close_all_due_job.rb
@@ -1,9 +1,9 @@
-class Card::AutoPopAllDueJob < ApplicationJob
+class Card::AutoCloseAllDueJob < ApplicationJob
   queue_as :default
 
   def perform
     ApplicationRecord.with_each_tenant do |tenant|
-      Card.auto_closure_all_due
+      Card.auto_close_all_due
     end
   end
 end
diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index e82df5a60..bcc41308a 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -14,14 +14,14 @@ module Card::Closeable
   end
 
   class_methods do
-    def auto_closure_all_due
+    def auto_close_all_due
       due_to_be_closed.find_each do |card|
-        card.closure!(user: card.collection.account.users.system, reason: "Closed")
+        card.close(user: card.collection.account.users.system, reason: "Closed")
       end
     end
   end
 
-  def auto_closure_at
+  def auto_close_at
     last_active_at + AUTO_CLOSURE_AFTER if last_active_at
   end
 
@@ -41,7 +41,7 @@ module Card::Closeable
     closure&.created_at
   end
 
-  def closure!(user: Current.user, reason: Account::ClosureReasons::FALLBACK_LABEL)
+  def close(user: Current.user, reason: Account::ClosureReasons::FALLBACK_LABEL)
     unless closed?
       transaction do
         create_closure! user: user, reason: reason
@@ -50,7 +50,7 @@ module Card::Closeable
     end
   end
 
-  def unpop
+  def reopen
     closure&.destroy
   end
 end
diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb
index c16cd986a..aac48232c 100644
--- a/app/models/card/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -35,7 +35,7 @@ module Card::Engageable
   def engage
     unless doing?
       transaction do
-        unpop
+        reopen
         create_engagement!
       end
     end
@@ -43,7 +43,7 @@ module Card::Engageable
 
   def reconsider
     transaction do
-      unpop
+      reopen
       engagement&.destroy
     end
   end
diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb
index 4f08560eb..5ec96e39f 100644
--- a/app/views/cards/_closure_toggle.html.erb
+++ b/app/views/cards/_closure_toggle.html.erb
@@ -27,7 +27,7 @@
       <% if card.doing? %>
         Returns to <em>Considering</em> if no activity <%= local_datetime_tag(card.auto_reconsider_at, style: :indays) -%>.
       <% else %>
-        Auto-closes if no activity <%= local_datetime_tag(card.auto_closure_at, style: :indays) -%>.
+        Auto-closes if no activity <%= local_datetime_tag(card.auto_close_at, style: :indays) -%>.
       <% end %>
     </span>
   <% end %>
diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index b17e27e46..ef15e4f9d 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -8,7 +8,7 @@
 
     <% if card.creating? %>
       <span class="pad-inline overflow-ellipsis">Expires
-        <%= local_datetime_tag(card.auto_closure_at, style: :indays) %>
+        <%= local_datetime_tag(card.auto_close_at, style: :indays) %>
       </span>
     <% else %>
       <span class="pad-inline overflow-ellipsis">Added
diff --git a/config/recurring.yml b/config/recurring.yml
index 210967d29..492e20247 100644
--- a/config/recurring.yml
+++ b/config/recurring.yml
@@ -1,6 +1,6 @@
 production:
-  auto_closure_all_due:
-    class: Card::AutoPopAllDueJob
+  auto_close_all_due:
+    class: Card::AutoCloseAllDueJob
     schedule: every hour
   auto_reconsider_all_inactive:
     class: Card::AutoReconsiderAllStagnatedJob
diff --git a/script/closureulate/collections_and_cards.rb b/script/closureulate/collections_and_cards.rb
index c405390f1..ced0792a8 100644
--- a/script/closureulate/collections_and_cards.rb
+++ b/script/closureulate/collections_and_cards.rb
@@ -1,7 +1,7 @@
 require_relative "../../config/environment"
 
-BUCKETS_COUNT = 100
-BUBBLES_PER_COLLECTION = 50
+COLLECTIONS_COUNT = 100
+CARDS_PER_COLLECTION = 50
 
 ApplicationRecord.current_tenant = "development-tenant"
 account = Account.first
@@ -9,9 +9,9 @@ user = account.users.first
 Current.session = user.sessions.last
 workflow = account.workflows.first
 
-BUCKETS_COUNT.times do |collection_index|
+COLLECTIONS_COUNT.times do |collection_index|
   collection = account.collections.create!(name: "Collection #{collection_index}", creator: user, workflow: workflow)
-  BUBBLES_PER_COLLECTION.times do |card_index|
+  CARDS_PER_COLLECTION.times do |card_index|
     collection.cards.create!(title: "Card #{card_index}", creator: user, status: :published)
   end
 end
diff --git a/test/models/card/closeable_test.rb b/test/models/card/closeable_test.rb
index 64b1aa773..8cfee3e8b 100644
--- a/test/models/card/closeable_test.rb
+++ b/test/models/card/closeable_test.rb
@@ -9,20 +9,20 @@ class Card::CloseableTest < ActiveSupport::TestCase
   test "popping" do
     assert_not cards(:logo).closed?
 
-    cards(:logo).closure!(user: users(:kevin))
+    cards(:logo).close(user: users(:kevin))
 
     assert cards(:logo).closed?
     assert_equal users(:kevin), cards(:logo).closed_by
   end
 
-  test "auto_closure_all_due" do
+  test "auto_close_all_due" do
     cards(:logo, :shipping).each(&:reconsider)
 
     cards(:logo).update!(last_active_at: 1.day.ago - Card::Closeable::AUTO_CLOSURE_AFTER)
     cards(:shipping).update!(last_active_at: 1.day.from_now - Card::Closeable::AUTO_CLOSURE_AFTER)
 
     assert_difference -> { Card.closed.count }, +1 do
-      Card.auto_closure_all_due
+      Card.auto_close_all_due
     end
 
     assert cards(:logo).reload.closed?
diff --git a/test/models/card/engageable_test.rb b/test/models/card/engageable_test.rb
index d07e35f90..a0b041689 100644
--- a/test/models/card/engageable_test.rb
+++ b/test/models/card/engageable_test.rb
@@ -24,7 +24,7 @@ class Card::EngageableTest < ActiveSupport::TestCase
   end
 
   test "engaging with closed cards" do
-    cards(:text).closure!
+    cards(:text).close
 
     assert_not cards(:text).considering?
     assert_not cards(:text).doing?
@@ -33,7 +33,7 @@ class Card::EngageableTest < ActiveSupport::TestCase
     assert_not cards(:text).reload.closed?
     assert cards(:text).doing?
 
-    cards(:text).closure!
+    cards(:text).close
     cards(:text).reconsider
     assert_not cards(:text).reload.closed?
     assert cards(:text).considering?
diff --git a/test/models/card/eventable_test.rb b/test/models/card/eventable_test.rb
index bac798df9..2eb0a7f35 100644
--- a/test/models/card/eventable_test.rb
+++ b/test/models/card/eventable_test.rb
@@ -15,7 +15,7 @@ class Card::EventableTest < ActiveSupport::TestCase
   test "tracking events update the last activity time" do
     travel_to Time.current
 
-    cards(:logo).closure!
+    cards(:logo).close
     assert_equal Time.current, cards(:logo).last_active_at
   end
 end

From 61a476eacacf40b4eb68ebf294347cb3f63f207a Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 9 Apr 2025 15:02:38 +0200
Subject: [PATCH 4/7] Remove bubbles.css

---
 app/assets/stylesheets/bubbles.css | 493 -----------------------------
 1 file changed, 493 deletions(-)
 delete mode 100644 app/assets/stylesheets/bubbles.css

diff --git a/app/assets/stylesheets/bubbles.css b/app/assets/stylesheets/bubbles.css
deleted file mode 100644
index 509cb62d0..000000000
--- a/app/assets/stylesheets/bubbles.css
+++ /dev/null
@@ -1,493 +0,0 @@
-:root {
-  --bubble-shape: 54% 46% 61% 39% / 57% 49% 51% 43%;
-  --bubble-shift: 10deg;
-  --bubble-size-one: 14cqi;
-  --bubble-size-two: 16cqi;
-  --bubble-size-three: 18cqi;
-  --bubble-size-four: 20cqi;
-  --bubble-size-five: 22cqi;
-}
-
-@layer components {
-  .bubbles {
-    --column-gap: 2cqi;
-    --row-gap: 1cqi;
-
-    margin-block: clamp(var(--block-space), 3%, calc(var(--block-space) * 2));
-
-    > * {
-      flex-shrink: 1;
-    }
-  }
-
-  .something-to-rename {
-    --bubble-background: radial-gradient(circle at center, color(from var(--bubble-color) srgb r g b / 0.25), color(from var(--bubble-color) srgb r g b / 0.05));
-    --bubble-border-width: 0.2rem;
-    --hover-size: 0;
-
-    aspect-ratio: 1;
-    block-size: var(--bubble-size);
-    color: var(--bubble-color, currentColor);
-    container-type: inline-size;
-    display: grid;
-    place-items: center;
-    position: relative;
-    transition: 0.2s ease;
-
-    .bubbles & {
-      &:nth-child(1)  { order: 5; }
-      &:nth-child(2)  { order: 3; }
-      &:nth-child(3)  { order: 3; }
-      &:nth-child(4)  { order: 7; }
-      &:nth-child(5)  { order: 9; }
-      &:nth-child(6)  { order: 5; }
-      &:nth-child(7)  { order: 4; }
-      &:nth-child(8)  { order: 9; }
-      &:nth-child(9)  { order: 3; }
-      &:nth-child(10) { order: 7; }
-      &:nth-of-type(n+6) {
-        align-self: start;
-      }
-    }
-
-    [data-turbo-preview] & { animation: none; }
-
-    > * {
-      grid-area: 1/1;
-    }
-
-    .bubble__perma & {
-      --bubble-border-width: 0.3rem;
-      --bubble-size: 40dvh !important;
-
-      z-index: 1;
-    }
-  }
-  .bubble__detail {
-    --bubble-border-color: color-mix(in srgb, var(--bubble-color) 30%, var(--color-bg));
-    --bubble-border-width: 0.15em;
-
-    aspect-ratio: 1;
-    background: var(--color-bg);
-    block-size: auto;
-    border: var(--bubble-border-width) solid var(--bubble-border-color);
-    border-radius: var(--bubble-shape);
-    display: flex;
-    font-size: 5cqi;
-    font-weight: 800;
-    line-height: 1;
-    max-inline-size: 18ch;
-    padding: 1em;
-    place-content: center;
-    place-items: center;
-    position: absolute;
-    scale: 1;
-    text-overflow: ellipsis;
-    transform: none;
-    transition: transform 200ms ease-out;
-    white-space: nowrap;
-    z-index: 1;
-
-    a {
-      color: var(--bubble-color);
-    }
-
-    &.bubble__assignee {
-      font-size: 4.5cqi;
-      inset: 8em auto auto -1.7em;
-      padding: 0.2em;
-
-      + & {
-        inset: 4em auto auto -1em;
-
-        + & {
-          inset: 1em auto auto 2em;
-        }
-      }
-
-      .avatar {
-        border-radius: var(--bubble-shape);
-      }
-
-      @media (hover: hover) {
-        .bubbles .something-to-rename:not(.popped):hover & {
-          transform: translate(0, -1rem);
-        }
-
-        .bubbles .something-to-rename:not(.popped):hover & + & {
-          transform: translate(1rem, -1rem);
-        }
-
-        .bubbles .something-to-rename:not(.popped):hover & + & + & {
-          transform: translate(1.5rem, -0.5rem);;
-        }
-      }
-
-      .assignee__name {
-        display: none;
-
-        .bubble__perma & {
-          color: var(--bubble-color);
-          display: inline-block;
-          font-size: 0.9em;
-          font-weight: normal;
-          inline-size: 15ch;
-          inset: 0.3em 3.6em auto auto;
-          position: absolute;
-          text-align: end;
-          white-space: normal;
-        }
-      }
-    }
-
-    &.bubble__comments {
-      --arrow-size: 1.5em;
-      --border-size: var(--bubble-border-width);
-
-      aspect-ratio: 9/6;
-      inset: auto auto 2em -1em;
-
-      &::before {
-        aspect-ratio: 2;
-        background: var(--bubble-border-color);
-        clip-path: polygon(50% 100%, 100% 0, 0 0);
-        inline-size: var(--arrow-size);
-        content: "";
-        display: block;
-        inset-block-end: auto;
-        inset-block-start: 94%;
-        inset-inline-start: 66%;
-        position: absolute;
-        transform: translateX(-50%) rotate(-20deg);
-      }
-
-      &::after {
-        aspect-ratio: 2;
-        background: var(--color-bg);
-        clip-path: polygon(50% 100%, 100% 0, 0 0);
-        inline-size: var(--arrow-size);
-        content: "";
-        display: block;
-        inset-block-end: auto;
-        inset-block-start: calc(94% - var(--border-size) * 1.5);
-        inset-inline-start: 64%;
-        position: absolute;
-        transform: translateX(-50%) rotate(-20deg);
-      }
-
-      @media (hover: hover) {
-        .bubbles .something-to-rename:not(.popped):hover & {
-          transform: translate(-0.5rem, -2rem);
-        }
-      }
-    }
-
-    &.bubble__date {
-      --rotation: -45deg;
-
-      aspect-ratio: 5/7;
-      cursor: pointer;
-      inset: 1cqb 1cqi auto auto;
-      transform: rotate(var(--rotation));
-
-      .bubble__date-text {
-        transform: rotate(calc(var(--rotation) * -1));
-      }
-
-      @media (hover: hover) {
-        .bubbles .something-to-rename:not(.popped):hover & {
-          transform: rotate(calc(var(--rotation) + var(--bubble-shift) * 1)) translate(0rem, 0.5rem);
-        }
-      }
-    }
-
-    @media (hover: hover) {
-      .bubbles .something-to-rename:not(.popped):hover & {
-        transform: translate(1rem, 1rem);
-      }
-
-      .bubbles .something-to-rename:not(.popped):hover & + & {
-        transform: translate(0, -1rem);
-      }
-
-      .bubbles .something-to-rename:not(.popped):hover & + & + & {
-        transform: translate(-1rem, -1rem);
-      }
-    }
-  }
-
-  .bubble__image {
-    border: none;
-    border-radius: var(--bubble-shape);
-    block-size: 100cqi;
-    inline-size: 100cqi;
-    overflow: hidden;
-    pointer-events: none;
-    transform: rotate(var(--bubble-rotate)) scale(0.92);
-    transition: 0.2s ease;
-
-    @media (hover: hover) {
-      .bubbles .something-to-rename:not(.popped):hover & {
-        transform: rotate(calc(var(--bubble-rotate) + var(--bubble-shift))) scale(0.9);
-      }
-    }
-
-    img {
-      block-size: 100cqi;
-      inline-size: 100cqi;
-      max-inline-size: none;
-      object-fit: cover;
-      transform: rotate(calc(var(--bubble-rotate) * -1)) scale(1.1);
-
-      &:is([src=""]) {
-        display: none;
-      }
-    }
-
-    :is(.bubbles, .bubbles-list) .bubble--wobble & {
-      animation: wobble-img 1200ms normal forwards ease-out;
-    }
-  }
-
-  .bubble__link {
-    content: "";
-    inset: 0;
-    position: absolute;
-    z-index: -1;
-
-    .bubbles & {
-      z-index: 1;
-    }
-  }
-
-  .bubbles-list {
-    --bubble-border-width: 0.15rem;
-    --bubble-shift: 15deg;
-    --bubble-size: 1.8em;
-    --divider-offset: 1.2em;
-    --hover-size: 0;
-
-    margin-inline: auto;
-
-    @media (min-width: 150ch) {
-      margin-inline: var(--tray-size);
-    }
-
-    .something-to-rename {
-      order: 0;
-    }
-
-    .bubble__title-link {
-      color: var(--color-txt);
-      text-decoration: none;
-    }
-
-    ul {
-      li {
-        border-radius: 0;
-        list-style: none;
-        padding: 0.5em var(--inline-space);
-        position: relative;
-        transition: background-color 200ms ease-out;
-      }
-
-      &:not(.dragging) {
-        li {
-          @media (hover: hover) {
-            &:hover {
-              background-color: color(from var(--bubble-color) srgb r g b / 0.15);
-              border: 0;
-            }
-          }
-        }
-      }
-    }
-
-    .avatar {
-      --avatar-size: 1.1em;
-
-      > * {
-        font-size: 0.5em;
-      }
-    }
-  }
-
-  .bubble__title-text {
-    font-weight: 700;
-    flex-grow: 1;
-    letter-spacing: -0.015em;
-    white-space: nowrap;
-
-    .drafted & {
-      color: color(from var(--color-ink) srgb r g b / 0.5);
-    }
-
-    &::after {
-      border-block-end: 1px dotted var(--color-subtle-dark);
-      content: "";
-      flex-grow: 1;
-      margin-block-end: 0.25em;
-    }
-  }
-
-  .bubble__tags {
-    --row-gap: 0;
-
-    font-size: var(--text-small);
-    margin-block-start: 0.3cqb;
-    max-block-size: 4lh;
-    max-inline-size: 75cqi;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    .bubble__perma & {
-      font-size: var(--text-medium);
-    }
-  }
-
-  .bubble__tag {
-    font-weight: 700;
-    max-inline-size: 75cqi;
-  }
-
-  .bubble__title {
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    margin: auto;
-    max-block-size: 90cqi;
-    max-inline-size: 70cqi;
-
-    .bubbles & {
-      pointer-events: none;
-    }
-
-    a {
-      color: var(--splat-color);
-
-      &.bubble__title-rendered {
-        -webkit-line-clamp: var(--lines, 4);
-        -webkit-box-orient: vertical;
-        display: -webkit-box;
-        font-size: 9cqi;
-        font-weight: 800;
-        line-height: 1.2;
-        overflow: hidden;
-        text-overflow: clip;
-        white-space: normal;
-      }
-    }
-
-    /*textarea {*/
-    /*  --input-color: var(--bubble-color);*/
-    /*  --input-border-radius: 0;*/
-
-    /*  font-size: 9cqi;*/
-    /*  font-weight: 800;*/
-    /*  line-height: 1.2;*/
-
-    /*  &::selection {*/
-    /*    background-color: var(--bubble-color);*/
-    /*    color: var(--color-ink-reversed);*/
-    /*  }*/
-    /*}*/
-
-    @media (hover: hover) {
-      .something-to-rename:has(.bubble__image img:not([src=""])):hover & {
-        color: var(--color-ink-reversed);
-        text-shadow: 0 0 0.2em var(--bubble-color), 0 0 0.2em var(--bubble-color), 0 0 0.2em var(--bubble-color);
-        position: relative;
-        z-index: 1;
-      }
-    }
-  }
-
-  .bubble__shape {
-    background: var(--bubble-background);
-    block-size: var(--bubble-size, 1.2em);
-    border-color: var(--bubble-border-color, color-mix(in srgb, var(--bubble-color) 15%, var(--color-bg)));
-    border-radius: var(--bubble-shape);
-    border-style: var(--bubble-border-style, solid);
-    border-width: 1px;
-    inline-size: var(--bubble-size, 1.2em);
-    pointer-events: none;
-    position: relative;
-    transform: rotate(var(--bubble-rotate));
-    transition: 200ms ease-out;
-    z-index: 0;
-
-    @media (prefers-color-scheme: dark) {
-      --bubble-background: radial-gradient(circle at center, color(from var(--bubble-color) srgb r g b / 0.45), color(from var(--bubble-color) srgb r g b / 0.15));
-      --bubble-border-color: color-mix(in srgb, var(--bubble-color) 30%, var(--color-bg));
-    }
-
-    .something-to-rename & {
-      --bubble-size: 100%;
-    }
-
-    .drafted & {
-      --bubble-border-style: dashed;
-    }
-
-    :is(.bubbles, .bubbles-list) .bubble--wobble & {
-      animation: wobble 1200ms normal forwards ease-out;
-    }
-
-    .bubble--wobble:nth-child(even) & {
-      animation-name: wobble-alt;
-      animation-duration: 900ms;
-    }
-
-    .popped & {
-      display: none;
-    }
-
-    .event &,
-    .bucket &,
-    .bubbles-list & {
-      --bubble-background: color-mix(in srgb, var(--bubble-color) 30%, var(--color-bg));
-      --bubble-border-color: color-mix(in srgb, var(--bubble-color) 40%, var(--color-bg))
-    }
-  }
-
-  .bubble__actions-container {
-    background-color: color-mix(in srgb, var(--bubble-color) 20%, var(--color-bg));
-    margin-block-start: -0.7em;
-    position: relative;
-    z-index: 1;
-
-    .btn--plain {
-      --btn-color: var(--bubble-color);
-
-      text-decoration: underline;
-    }
-
-    .bubble__pop-message {
-      color: var(--bubble-color);
-    }
-  }
-
-  .bubble__splat {
-    display: none;
-    pointer-events: none;
-    transform: rotate(var(--bubble-rotate));
-
-    .popped & {
-      display: block;
-      fill: color-mix(in srgb, var(--bubble-color) 20%, var(--color-bg));
-      position: absolute;
-      scale: 130%;
-      z-index: -1;
-    }
-
-    .bubbles-list & {
-      block-size: var(--bubble-size);
-      fill: color-mix(in srgb, var(--bubble-color) 35%, var(--color-bg));
-      inline-size: var(--bubble-size);
-      position: relative;
-      scale: 1;
-      z-index: 0;
-    }
-  }
-}

From b035c8506e3287000f62c274d3c4834a863f509f Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 9 Apr 2025 15:10:48 +0200
Subject: [PATCH 5/7] Fix issues with styling card__ components

---
 app/assets/stylesheets/cards.css               | 16 ++++++++--------
 app/views/cards/_closure_toggle.html.erb       |  6 +++---
 app/views/cards/_comments.html.erb             |  2 +-
 app/views/cards/_date.html.erb                 |  2 +-
 app/views/cards/display/_mini.html.erb         |  2 +-
 app/views/cards/display/_perma.html.erb        |  2 +-
 app/views/cards/display/_preview.html.erb      |  2 +-
 app/views/cards/display/perma/_tags.html.erb   |  2 +-
 app/views/cards/display/preview/_tags.html.erb |  4 ++--
 app/views/cards/show.html.erb                  |  2 +-
 app/views/collections/_collection.html.erb     |  2 +-
 app/views/filters/_filter.html.erb             |  2 +-
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 294f6cd0b..366fdb6e3 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -29,7 +29,7 @@
       padding: calc(var(--block-space) * 1.5) var(--block-space);
       margin: var(--block-space) auto calc(var(--block-space) * 1.5);
 
-      .something-to-rename__title {
+      .card__title {
         margin-block-start: 0.1em;
         min-block-size: 0;
       }
@@ -52,7 +52,7 @@
         margin-block-start: -0.2em;
       }
 
-      .something-to-rename__tags {
+      .card__tags {
         font-size: var(--text-small);
       }
     }
@@ -111,7 +111,7 @@
     inset: var(--actions-block-inset) calc(var(--actions-inline-inset) * -1) auto auto;
   }
 
-  .something-to-rename__actions-container {
+  .card__actions-container {
     --border-radius: 1em;
 
     background-color: var(--color-bg);
@@ -136,7 +136,7 @@
       text-decoration: underline;
     }
 
-    .something-to-rename__closure-message {
+    .card__closure-message {
       color: var(--card-color);
     }
   }
@@ -374,7 +374,7 @@
     }
   }
 
-  .something-to-rename__link {
+  .card__link {
     --hover-size: 0;
 
     content: "";
@@ -416,16 +416,16 @@
     flex: 1 1 25%;
   }
 
-  .something-to-rename__tag {
+  .card__tag {
     color: var(--card-color);
     font-weight: 700;
   }
 
-  .something-to-rename__tags {
+  .card__tags {
     color: var(--card-color);
   }
 
-  .something-to-rename__title {
+  .card__title {
     --hover-size: 0;
     --input-border-radius: 0;
 
diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb
index 5ec96e39f..46cf6e6ff 100644
--- a/app/views/cards/_closure_toggle.html.erb
+++ b/app/views/cards/_closure_toggle.html.erb
@@ -1,6 +1,6 @@
-<div class="something-to-rename__actions-container center border-radius flex-inline align-center justify-center gap" style="--card-color: <%= @card.color %>">
+<div class="card__actions-container center border-radius flex-inline align-center justify-center gap" style="--card-color: <%= @card.color %>">
   <% if card.closed? %>
-    <span class="something-to-rename__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
+    <span class="card__closure-message">Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>.</span>
     <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>
       <span>Un-do</span>
     <% end %>
@@ -23,7 +23,7 @@
       </dialog>
     </div>
 
-    <span class="something-to-rename__closure-message">
+    <span class="card__closure-message">
       <% if card.doing? %>
         Returns to <em>Considering</em> if no activity <%= local_datetime_tag(card.auto_reconsider_at, style: :indays) -%>.
       <% else %>
diff --git a/app/views/cards/_comments.html.erb b/app/views/cards/_comments.html.erb
index 793f0c592..fd4829974 100644
--- a/app/views/cards/_comments.html.erb
+++ b/app/views/cards/_comments.html.erb
@@ -1,5 +1,5 @@
 <% if card.messages.comments.any? %>
-  <div class="something-to-rename__detail card__comments">
+  <div class="card__detail card__comments">
     <span aria-hidden="true"><%= card.messages.comments.count %></span>
     <span class="for-screen-reader"><%= pluralize(card.messages.comments.count, "comment") %></span>
   </div>
diff --git a/app/views/cards/_date.html.erb b/app/views/cards/_date.html.erb
index a1aa5e283..cc19afe32 100644
--- a/app/views/cards/_date.html.erb
+++ b/app/views/cards/_date.html.erb
@@ -1,6 +1,6 @@
 <% if card.due_on.present? %>
   <%= form_with model: card, url: collection_card_path(card.collection, card), data: { controller: "form" } do |form| %>
-    <label class="something-to-rename__detail something-to-rename__date">
+    <label class="card__detail card__date">
       <span class="for-screen-reader">Change the due date</span>
       <span class="card__date-text"><%= html_escape card.due_on.strftime("%b <br> %d").html_safe %></span>
       <%= form.date_field :due_on, class: "input input--hidden", data: { action: "change->form#submit click->form#showPicker" } %>
diff --git a/app/views/cards/display/_mini.html.erb b/app/views/cards/display/_mini.html.erb
index 2487b335c..0fd3892f0 100644
--- a/app/views/cards/display/_mini.html.erb
+++ b/app/views/cards/display/_mini.html.erb
@@ -2,7 +2,7 @@
   <%= avatar_image_tag card.creator, class: "avatar" %>
 
   <div class="card__body flex flex-column gap-half full-width flex-item-grow min-width max-width">
-    <h3 class="something-to-rename__title">
+    <h3 class="card__title">
       <%= card_title(card) %>
     </h3>
 
diff --git a/app/views/cards/display/_perma.html.erb b/app/views/cards/display/_perma.html.erb
index 8cd5f3d9b..4b205e33b 100644
--- a/app/views/cards/display/_perma.html.erb
+++ b/app/views/cards/display/_perma.html.erb
@@ -11,7 +11,7 @@
 
     <div class="card__body flex gap full-width flex-item-grow">
       <div class="card__body-header">
-        <h1 class="something-to-rename__title">
+        <h1 class="card__title">
           <% if card.published? %>
             <%= turbo_frame_tag card, :edit do %>
               <%= link_to card_title(card), edit_collection_card_path(card.collection, card), class: "card__title-link overflow-line-clamp" %>
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index d442626d3..035c72e58 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -9,7 +9,7 @@
 
     <div class="card__body flex gap full-width flex-item-grow">
       <div class="card__body-header">
-        <h1 class="something-to-rename__title">
+        <h1 class="card__title">
           <span class="card__title-link overflow-line-clamp"><%= card_title(card) %></span>
         </h1>
       </div>
diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
index b2dc3fea7..f600986c0 100644
--- a/app/views/cards/display/perma/_tags.html.erb
+++ b/app/views/cards/display/perma/_tags.html.erb
@@ -1,4 +1,4 @@
-<div id="<%= dom_id(card, :tags) %>" class="something-to-rename__tags flex align-center flex-item-grow min-width">
+<div id="<%= dom_id(card, :tags) %>" class="card__tags flex align-center flex-item-grow min-width">
   <div class="overflow-ellipsis">
     <% if card.tags.any? || card.creating? %>
       <span># </span>
diff --git a/app/views/cards/display/preview/_tags.html.erb b/app/views/cards/display/preview/_tags.html.erb
index b65a804ee..3283efed8 100644
--- a/app/views/cards/display/preview/_tags.html.erb
+++ b/app/views/cards/display/preview/_tags.html.erb
@@ -1,9 +1,9 @@
-<div class="something-to-rename__tags flex align-center flex-item-grow min-width">
+<div class="card__tags flex align-center flex-item-grow min-width">
   <div class="overflow-ellipsis">
     <% if card.tags.any?  %>
       <span># </span>
       <% card.tags.each_with_index do |tag, index| %>
-          <span class="something-to-rename__tag btn btn--plain min-width txt-uppercase fill-transparent overflow-ellipsis">
+          <span class="card__tag btn btn--plain min-width txt-uppercase fill-transparent overflow-ellipsis">
             <%= tag.title %>
           </span>
       <% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index 3fc163784..2bc13a4a3 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -23,7 +23,7 @@
     <%= link_to_home %>
     <%= link_to_back fallback_path: cards_path(collection_id: @card.collection) %>
 
-    <div class="something-to-rename__actions-container card__actions-container--top center flex align-center gap border-radius" style="--card-color: <%= @card.color %>;">
+    <div class="card__actions-container card__actions-container--top center flex align-center gap border-radius" style="--card-color: <%= @card.color %>;">
       <strong class="txt-uppercase">Considering</strong>
       <% if @card.doing? %>
         <%= form_with url: card_engagement_path(@card), method: :delete, data: { controller: "form" }, class: "flex" do %>
diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb
index 54c07b22f..fc36376ba 100644
--- a/app/views/collections/_collection.html.erb
+++ b/app/views/collections/_collection.html.erb
@@ -8,7 +8,7 @@
           data-card-size-target="card"
           data-activity-score="<%= card.activity_score %>"
           data-activity-score-at="<%= card.activity_score_at.to_i %>">
-          <span class="something-to-rename__shape"></span>
+          <span class="card__shape"></span>
         </div>
       <% end %>
     </div>
diff --git a/app/views/filters/_filter.html.erb b/app/views/filters/_filter.html.erb
index b8def1c6a..29e4a9862 100644
--- a/app/views/filters/_filter.html.erb
+++ b/app/views/filters/_filter.html.erb
@@ -9,7 +9,7 @@
             data-card-size-target="card"
             data-activity-score="<%= card.activity_score %>"
             data-activity-score-at="<%= card.activity_score_at.to_i %>">
-            <span class="something-to-rename__shape"></span>
+            <span class="card__shape"></span>
           </div>
         <% end %>
       </div>

From aa14cd41ec9e9d10e359fc79ad4ac86cbaf88c14 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 9 Apr 2025 15:15:17 +0200
Subject: [PATCH 6/7] Restore bubbles.css since some styles are used

---
 app/assets/stylesheets/bubbles.css | 493 +++++++++++++++++++++++++++++
 1 file changed, 493 insertions(+)
 create mode 100644 app/assets/stylesheets/bubbles.css

diff --git a/app/assets/stylesheets/bubbles.css b/app/assets/stylesheets/bubbles.css
new file mode 100644
index 000000000..509cb62d0
--- /dev/null
+++ b/app/assets/stylesheets/bubbles.css
@@ -0,0 +1,493 @@
+:root {
+  --bubble-shape: 54% 46% 61% 39% / 57% 49% 51% 43%;
+  --bubble-shift: 10deg;
+  --bubble-size-one: 14cqi;
+  --bubble-size-two: 16cqi;
+  --bubble-size-three: 18cqi;
+  --bubble-size-four: 20cqi;
+  --bubble-size-five: 22cqi;
+}
+
+@layer components {
+  .bubbles {
+    --column-gap: 2cqi;
+    --row-gap: 1cqi;
+
+    margin-block: clamp(var(--block-space), 3%, calc(var(--block-space) * 2));
+
+    > * {
+      flex-shrink: 1;
+    }
+  }
+
+  .something-to-rename {
+    --bubble-background: radial-gradient(circle at center, color(from var(--bubble-color) srgb r g b / 0.25), color(from var(--bubble-color) srgb r g b / 0.05));
+    --bubble-border-width: 0.2rem;
+    --hover-size: 0;
+
+    aspect-ratio: 1;
+    block-size: var(--bubble-size);
+    color: var(--bubble-color, currentColor);
+    container-type: inline-size;
+    display: grid;
+    place-items: center;
+    position: relative;
+    transition: 0.2s ease;
+
+    .bubbles & {
+      &:nth-child(1)  { order: 5; }
+      &:nth-child(2)  { order: 3; }
+      &:nth-child(3)  { order: 3; }
+      &:nth-child(4)  { order: 7; }
+      &:nth-child(5)  { order: 9; }
+      &:nth-child(6)  { order: 5; }
+      &:nth-child(7)  { order: 4; }
+      &:nth-child(8)  { order: 9; }
+      &:nth-child(9)  { order: 3; }
+      &:nth-child(10) { order: 7; }
+      &:nth-of-type(n+6) {
+        align-self: start;
+      }
+    }
+
+    [data-turbo-preview] & { animation: none; }
+
+    > * {
+      grid-area: 1/1;
+    }
+
+    .bubble__perma & {
+      --bubble-border-width: 0.3rem;
+      --bubble-size: 40dvh !important;
+
+      z-index: 1;
+    }
+  }
+  .bubble__detail {
+    --bubble-border-color: color-mix(in srgb, var(--bubble-color) 30%, var(--color-bg));
+    --bubble-border-width: 0.15em;
+
+    aspect-ratio: 1;
+    background: var(--color-bg);
+    block-size: auto;
+    border: var(--bubble-border-width) solid var(--bubble-border-color);
+    border-radius: var(--bubble-shape);
+    display: flex;
+    font-size: 5cqi;
+    font-weight: 800;
+    line-height: 1;
+    max-inline-size: 18ch;
+    padding: 1em;
+    place-content: center;
+    place-items: center;
+    position: absolute;
+    scale: 1;
+    text-overflow: ellipsis;
+    transform: none;
+    transition: transform 200ms ease-out;
+    white-space: nowrap;
+    z-index: 1;
+
+    a {
+      color: var(--bubble-color);
+    }
+
+    &.bubble__assignee {
+      font-size: 4.5cqi;
+      inset: 8em auto auto -1.7em;
+      padding: 0.2em;
+
+      + & {
+        inset: 4em auto auto -1em;
+
+        + & {
+          inset: 1em auto auto 2em;
+        }
+      }
+
+      .avatar {
+        border-radius: var(--bubble-shape);
+      }
+
+      @media (hover: hover) {
+        .bubbles .something-to-rename:not(.popped):hover & {
+          transform: translate(0, -1rem);
+        }
+
+        .bubbles .something-to-rename:not(.popped):hover & + & {
+          transform: translate(1rem, -1rem);
+        }
+
+        .bubbles .something-to-rename:not(.popped):hover & + & + & {
+          transform: translate(1.5rem, -0.5rem);;
+        }
+      }
+
+      .assignee__name {
+        display: none;
+
+        .bubble__perma & {
+          color: var(--bubble-color);
+          display: inline-block;
+          font-size: 0.9em;
+          font-weight: normal;
+          inline-size: 15ch;
+          inset: 0.3em 3.6em auto auto;
+          position: absolute;
+          text-align: end;
+          white-space: normal;
+        }
+      }
+    }
+
+    &.bubble__comments {
+      --arrow-size: 1.5em;
+      --border-size: var(--bubble-border-width);
+
+      aspect-ratio: 9/6;
+      inset: auto auto 2em -1em;
+
+      &::before {
+        aspect-ratio: 2;
+        background: var(--bubble-border-color);
+        clip-path: polygon(50% 100%, 100% 0, 0 0);
+        inline-size: var(--arrow-size);
+        content: "";
+        display: block;
+        inset-block-end: auto;
+        inset-block-start: 94%;
+        inset-inline-start: 66%;
+        position: absolute;
+        transform: translateX(-50%) rotate(-20deg);
+      }
+
+      &::after {
+        aspect-ratio: 2;
+        background: var(--color-bg);
+        clip-path: polygon(50% 100%, 100% 0, 0 0);
+        inline-size: var(--arrow-size);
+        content: "";
+        display: block;
+        inset-block-end: auto;
+        inset-block-start: calc(94% - var(--border-size) * 1.5);
+        inset-inline-start: 64%;
+        position: absolute;
+        transform: translateX(-50%) rotate(-20deg);
+      }
+
+      @media (hover: hover) {
+        .bubbles .something-to-rename:not(.popped):hover & {
+          transform: translate(-0.5rem, -2rem);
+        }
+      }
+    }
+
+    &.bubble__date {
+      --rotation: -45deg;
+
+      aspect-ratio: 5/7;
+      cursor: pointer;
+      inset: 1cqb 1cqi auto auto;
+      transform: rotate(var(--rotation));
+
+      .bubble__date-text {
+        transform: rotate(calc(var(--rotation) * -1));
+      }
+
+      @media (hover: hover) {
+        .bubbles .something-to-rename:not(.popped):hover & {
+          transform: rotate(calc(var(--rotation) + var(--bubble-shift) * 1)) translate(0rem, 0.5rem);
+        }
+      }
+    }
+
+    @media (hover: hover) {
+      .bubbles .something-to-rename:not(.popped):hover & {
+        transform: translate(1rem, 1rem);
+      }
+
+      .bubbles .something-to-rename:not(.popped):hover & + & {
+        transform: translate(0, -1rem);
+      }
+
+      .bubbles .something-to-rename:not(.popped):hover & + & + & {
+        transform: translate(-1rem, -1rem);
+      }
+    }
+  }
+
+  .bubble__image {
+    border: none;
+    border-radius: var(--bubble-shape);
+    block-size: 100cqi;
+    inline-size: 100cqi;
+    overflow: hidden;
+    pointer-events: none;
+    transform: rotate(var(--bubble-rotate)) scale(0.92);
+    transition: 0.2s ease;
+
+    @media (hover: hover) {
+      .bubbles .something-to-rename:not(.popped):hover & {
+        transform: rotate(calc(var(--bubble-rotate) + var(--bubble-shift))) scale(0.9);
+      }
+    }
+
+    img {
+      block-size: 100cqi;
+      inline-size: 100cqi;
+      max-inline-size: none;
+      object-fit: cover;
+      transform: rotate(calc(var(--bubble-rotate) * -1)) scale(1.1);
+
+      &:is([src=""]) {
+        display: none;
+      }
+    }
+
+    :is(.bubbles, .bubbles-list) .bubble--wobble & {
+      animation: wobble-img 1200ms normal forwards ease-out;
+    }
+  }
+
+  .bubble__link {
+    content: "";
+    inset: 0;
+    position: absolute;
+    z-index: -1;
+
+    .bubbles & {
+      z-index: 1;
+    }
+  }
+
+  .bubbles-list {
+    --bubble-border-width: 0.15rem;
+    --bubble-shift: 15deg;
+    --bubble-size: 1.8em;
+    --divider-offset: 1.2em;
+    --hover-size: 0;
+
+    margin-inline: auto;
+
+    @media (min-width: 150ch) {
+      margin-inline: var(--tray-size);
+    }
+
+    .something-to-rename {
+      order: 0;
+    }
+
+    .bubble__title-link {
+      color: var(--color-txt);
+      text-decoration: none;
+    }
+
+    ul {
+      li {
+        border-radius: 0;
+        list-style: none;
+        padding: 0.5em var(--inline-space);
+        position: relative;
+        transition: background-color 200ms ease-out;
+      }
+
+      &:not(.dragging) {
+        li {
+          @media (hover: hover) {
+            &:hover {
+              background-color: color(from var(--bubble-color) srgb r g b / 0.15);
+              border: 0;
+            }
+          }
+        }
+      }
+    }
+
+    .avatar {
+      --avatar-size: 1.1em;
+
+      > * {
+        font-size: 0.5em;
+      }
+    }
+  }
+
+  .bubble__title-text {
+    font-weight: 700;
+    flex-grow: 1;
+    letter-spacing: -0.015em;
+    white-space: nowrap;
+
+    .drafted & {
+      color: color(from var(--color-ink) srgb r g b / 0.5);
+    }
+
+    &::after {
+      border-block-end: 1px dotted var(--color-subtle-dark);
+      content: "";
+      flex-grow: 1;
+      margin-block-end: 0.25em;
+    }
+  }
+
+  .bubble__tags {
+    --row-gap: 0;
+
+    font-size: var(--text-small);
+    margin-block-start: 0.3cqb;
+    max-block-size: 4lh;
+    max-inline-size: 75cqi;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    .bubble__perma & {
+      font-size: var(--text-medium);
+    }
+  }
+
+  .bubble__tag {
+    font-weight: 700;
+    max-inline-size: 75cqi;
+  }
+
+  .bubble__title {
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: auto;
+    max-block-size: 90cqi;
+    max-inline-size: 70cqi;
+
+    .bubbles & {
+      pointer-events: none;
+    }
+
+    a {
+      color: var(--splat-color);
+
+      &.bubble__title-rendered {
+        -webkit-line-clamp: var(--lines, 4);
+        -webkit-box-orient: vertical;
+        display: -webkit-box;
+        font-size: 9cqi;
+        font-weight: 800;
+        line-height: 1.2;
+        overflow: hidden;
+        text-overflow: clip;
+        white-space: normal;
+      }
+    }
+
+    /*textarea {*/
+    /*  --input-color: var(--bubble-color);*/
+    /*  --input-border-radius: 0;*/
+
+    /*  font-size: 9cqi;*/
+    /*  font-weight: 800;*/
+    /*  line-height: 1.2;*/
+
+    /*  &::selection {*/
+    /*    background-color: var(--bubble-color);*/
+    /*    color: var(--color-ink-reversed);*/
+    /*  }*/
+    /*}*/
+
+    @media (hover: hover) {
+      .something-to-rename:has(.bubble__image img:not([src=""])):hover & {
+        color: var(--color-ink-reversed);
+        text-shadow: 0 0 0.2em var(--bubble-color), 0 0 0.2em var(--bubble-color), 0 0 0.2em var(--bubble-color);
+        position: relative;
+        z-index: 1;
+      }
+    }
+  }
+
+  .bubble__shape {
+    background: var(--bubble-background);
+    block-size: var(--bubble-size, 1.2em);
+    border-color: var(--bubble-border-color, color-mix(in srgb, var(--bubble-color) 15%, var(--color-bg)));
+    border-radius: var(--bubble-shape);
+    border-style: var(--bubble-border-style, solid);
+    border-width: 1px;
+    inline-size: var(--bubble-size, 1.2em);
+    pointer-events: none;
+    position: relative;
+    transform: rotate(var(--bubble-rotate));
+    transition: 200ms ease-out;
+    z-index: 0;
+
+    @media (prefers-color-scheme: dark) {
+      --bubble-background: radial-gradient(circle at center, color(from var(--bubble-color) srgb r g b / 0.45), color(from var(--bubble-color) srgb r g b / 0.15));
+      --bubble-border-color: color-mix(in srgb, var(--bubble-color) 30%, var(--color-bg));
+    }
+
+    .something-to-rename & {
+      --bubble-size: 100%;
+    }
+
+    .drafted & {
+      --bubble-border-style: dashed;
+    }
+
+    :is(.bubbles, .bubbles-list) .bubble--wobble & {
+      animation: wobble 1200ms normal forwards ease-out;
+    }
+
+    .bubble--wobble:nth-child(even) & {
+      animation-name: wobble-alt;
+      animation-duration: 900ms;
+    }
+
+    .popped & {
+      display: none;
+    }
+
+    .event &,
+    .bucket &,
+    .bubbles-list & {
+      --bubble-background: color-mix(in srgb, var(--bubble-color) 30%, var(--color-bg));
+      --bubble-border-color: color-mix(in srgb, var(--bubble-color) 40%, var(--color-bg))
+    }
+  }
+
+  .bubble__actions-container {
+    background-color: color-mix(in srgb, var(--bubble-color) 20%, var(--color-bg));
+    margin-block-start: -0.7em;
+    position: relative;
+    z-index: 1;
+
+    .btn--plain {
+      --btn-color: var(--bubble-color);
+
+      text-decoration: underline;
+    }
+
+    .bubble__pop-message {
+      color: var(--bubble-color);
+    }
+  }
+
+  .bubble__splat {
+    display: none;
+    pointer-events: none;
+    transform: rotate(var(--bubble-rotate));
+
+    .popped & {
+      display: block;
+      fill: color-mix(in srgb, var(--bubble-color) 20%, var(--color-bg));
+      position: absolute;
+      scale: 130%;
+      z-index: -1;
+    }
+
+    .bubbles-list & {
+      block-size: var(--bubble-size);
+      fill: color-mix(in srgb, var(--bubble-color) 35%, var(--color-bg));
+      inline-size: var(--bubble-size);
+      position: relative;
+      scale: 1;
+      z-index: 0;
+    }
+  }
+}

From 3c82c8ee90f96ce90464db35ad21724c1aa5af30 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Wed, 9 Apr 2025 16:04:18 +0200
Subject: [PATCH 7/7] Remove migration

---
 .../20250407093421_make_tag_titles_unique_per_account.rb     | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 db/migrate/20250407093421_make_tag_titles_unique_per_account.rb

diff --git a/db/migrate/20250407093421_make_tag_titles_unique_per_account.rb b/db/migrate/20250407093421_make_tag_titles_unique_per_account.rb
deleted file mode 100644
index bc9f17a7c..000000000
--- a/db/migrate/20250407093421_make_tag_titles_unique_per_account.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class MakeTagTitlesUniquePerAccount < ActiveRecord::Migration[8.1]
-  def change
-    add_index :tags, [ :account_id, :title ], unique: true
-  end
-end