diff --git a/static/components/direct-messages/direct-messages.html b/static/components/direct-messages/direct-messages.html
index e4d45af..b6b90d6 100644
--- a/static/components/direct-messages/direct-messages.html
+++ b/static/components/direct-messages/direct-messages.html
@@ -6,7 +6,7 @@
           <h6 class="text-subtitle1 q-my-none">Messages</h6>
         </div>
         <div class="col-4">
-          <q-badge v-if="unreadMessages" color="green"><span v-text="unreadMessages"></span>&nbsp; new</q-badge>
+          <q-badge v-if="unreadMessages" color="primary" outline><span v-text="unreadMessages"></span>&nbsp; new</q-badge>
         </div>
         <div class="col-6">
           <q-btn v-if="activePublicKey" @click="showClientOrders" unelevated outline class="float-right">Client
@@ -26,7 +26,7 @@
           </q-select>
         </div>
         <div class="col-2">
-          <q-btn label="Add" color="green" class="float-right q-mt-md" @click="showAddPublicKey = true">
+          <q-btn label="Add" color="primary" class="float-right q-mt-md" @click="showAddPublicKey = true">
             <q-tooltip>
               Add a public key to chat with
             </q-tooltip>
diff --git a/static/components/order-list/order-list.html b/static/components/order-list/order-list.html
index 5ff9f88..44feb44 100644
--- a/static/components/order-list/order-list.html
+++ b/static/components/order-list/order-list.html
@@ -33,7 +33,7 @@
         <template v-slot:body="props">
           <q-tr :props="props">
             <q-td auto-width>
-              <q-btn size="sm" color="accent" round dense @click="props.row.expanded= !props.row.expanded"
+              <q-btn size="sm" color="primary" round dense @click="props.row.expanded= !props.row.expanded"
                 :icon="props.row.expanded? 'remove' : 'add'" />
             </q-td>
 
diff --git a/static/components/stall-details/stall-details.html b/static/components/stall-details/stall-details.html
index 7346611..1a16461 100644
--- a/static/components/stall-details/stall-details.html
+++ b/static/components/stall-details/stall-details.html
@@ -55,10 +55,10 @@
       </div>
       <div class="row items-center q-mt-xl">
         <div class="col-6 q-pr-lg">
-          <q-btn unelevated color="secondary" class="float-left" @click="updateStall()">Update Stall</q-btn>
+          <q-btn  outline unelevated class="float-left"  color="primary" @click="updateStall()">Update Stall</q-btn>
         </div>
         <div class="col-6">
-          <q-btn unelevated color="pink" icon="cancel" class="float-right" @click="deleteStall()">Delete Stall</q-btn>
+          <q-btn outline unelevated icon="cancel" class="float-right" @click="deleteStall()">Delete Stall</q-btn>
         </div>
       </div>
     </q-tab-panel>
@@ -67,7 +67,7 @@
         <div class="row items-center no-wrap q-mb-md">
           <div class="col-3 q-pr-lg">
 
-            <q-btn-dropdown @click="showNewProductDialog()" unelevated split color="green" class="float-left"
+            <q-btn-dropdown @click="showNewProductDialog()"  outline unelevated split class="float-left"  color="primary"
               label="New Product">
               <q-item @click="showNewProductDialog()" clickable v-close-popup>
                 <q-item-section>
@@ -95,10 +95,10 @@
               <template v-slot:body="props">
                 <q-tr :props="props">
                   <q-td auto-width>
-                    <q-btn size="sm" color="pink" dense @click="deleteProduct(props.row.id)" icon="delete" />
+                    <q-btn size="sm" color="grey" dense @click="deleteProduct(props.row.id)" icon="delete" />
                   </q-td>
                   <q-td auto-width>
-                    <q-btn size="sm" color="accent" dense @click="editProduct(props.row)" icon="edit" />
+                    <q-btn size="sm" color="primary" dense @click="editProduct(props.row)" icon="edit" />
                   </q-td>
 
                   <q-td key="id" :props="props"> {{props.row.id}} </q-td>
diff --git a/static/components/stall-list/stall-list.html b/static/components/stall-list/stall-list.html
index c364eb2..8981355 100644
--- a/static/components/stall-list/stall-list.html
+++ b/static/components/stall-list/stall-list.html
@@ -2,7 +2,7 @@
   <div class="row items-center no-wrap q-mb-md">
     <div class="col q-pr-lg">
 
-      <q-btn-dropdown @click="openCreateStallDialog()" unelevated split color="green" class="float-left"
+      <q-btn-dropdown @click="openCreateStallDialog()" outline unelevated split class="float-left" color="primary"
         label="New Stall (Store)">
         <q-item @click="openCreateStallDialog()" clickable v-close-popup>
           <q-item-section>
@@ -30,7 +30,7 @@
     <template v-slot:body="props">
       <q-tr :props="props">
         <q-td auto-width>
-          <q-btn size="sm" color="accent" round dense @click="props.row.expanded= !props.row.expanded"
+          <q-btn size="sm" color="primary" round dense @click="props.row.expanded= !props.row.expanded"
             :icon="props.row.expanded? 'remove' : 'add'" />
         </q-td>
 
diff --git a/templates/nostrmarket/index.html b/templates/nostrmarket/index.html
index 6e9edd2..c39eb32 100644
--- a/templates/nostrmarket/index.html
+++ b/templates/nostrmarket/index.html
@@ -6,7 +6,7 @@
       <q-card>
         <q-card-section>
           <div class="row">
-            <div class="col-3">
+            <div class="col-4">
               <merchant-details
                 :merchant-id="merchant.id"
                 :inkey="g.user.wallets[0].inkey"
@@ -15,17 +15,17 @@
                 @merchant-deleted="handleMerchantDeleted"
               ></merchant-details>
             </div>
-            <div class="col-2">
+            <div class="col-6">
               <q-toggle
               @input="toggleMerchantState()"
               size="md"
               checked-icon="check"
               v-model="merchant.config.active"
-              color="green"
+              color="primary"
               unchecked-icon="clear"
-            /> <span v-text="merchant.config.active ? 'Active': 'Deactivated'"></span>
+              class="float-left"
+            /> <span v-text="merchant.config.active ? 'Accepting Orders': 'Orders Paused'"></span>
             </div>
-            <div class="col-5"></div>
             <div class="col-2">
               <shipping-zones
                 :inkey="g.user.wallets[0].inkey"
@@ -148,7 +148,8 @@
         <q-card-section class="q-pa-md">
           <q-btn
             label="Restart Nostr Connection"
-            color="pink"
+            color="grey"
+            outline
             @click="restartNostrConnection"
           >
             <q-tooltip>