Render pug blocks without a separate template

src/web/pug/guild.pug

@@ -1,5 +1,4 @@
 extends includes/template.pug
-include includes/default-roles-list.pug
 
 mixin badge-readonly
   .s-badge.s-badge__xs.s-badge__icon.s-badge__muted
@@ -113,15 +112,33 @@ block body
         .d-flex.fw-wrap.g4
           .s-tag.s-tag__md.fs-body1.s-tag__required @everyone
 
-          +default-roles-list(guild, guild_id)
+          block default-roles-list requires guild, guild_id
+            #default-roles-list(style="display: contents")
+              each roleID in select("role_default", "role_id", {guild_id}).pluck().all()
+                - let r = guild.roles.find(r => r.id === roleID)
+                if r
+                  .s-tag.s-tag__md.fs-body1= r.name
+                    span(id=`role-loading-${roleID}`)
+                    button(name="remove_role" value=roleID hx-post="api/default-roles" hx-trigger="click consume" hx-indicator=`#role-loading-${roleID}`).s-tag--dismiss
+                      != icons.Icons.IconClearSm
 
           button(type="button" popovertarget="role-add").s-btn__dropdown.s-tag.s-tag__md.fs-body1.p0
             .s-tag--dismiss.m1
               != icons.Icons.IconPlusSm
 
-          #role-add.s-popover(popover style="display: revert").ws2.px0.py4.bs-lg.overflow-visible
+          #role-add.s-popover(popover style="display: revert").ws2.px0.py4.bs-lg.overflow-visible.box-border.lh-sm
             .s-popover--arrow.s-popover--arrow__tc
-            +add-roles-menu(guild, guild_id)
+
+            block add-roles-menu requires guild, guild_id
+              ul.s-menu(role="menu" hx-swap-oob="true").overflow-y-auto.overflow-x-hidden#add-roles-menu
+                li.s-menu--title.d-flex(role="separator") Select role
+                  span#add-role-loading
+                each r in guild.roles.sort((a, b) => b.position - a.position)
+                  if r.id !== guild_id && !r.managed
+                    - let selected = !!select("role_default", "role_id", {guild_id, role_id: r.id}).get()
+                    li(role="menuitem")
+                      button(name="toggle_role" value=r.id class={"is-selected": selected}).s-block-link.s-block-link__left= r.name
+
         p.fc-light.mb0.mt8 Matrix users will start with these roles. If your main channels are gated by a role, use this to let Matrix users skip the gate.
 
     h3.mt32.fs-category Features