diff --git a/ADDON_REACT_INTEGRATION.md b/ADDON_REACT_INTEGRATION.md
new file mode 100644
index 0000000..b57665c
--- /dev/null
+++ b/ADDON_REACT_INTEGRATION.md
@@ -0,0 +1,499 @@
+# Addon React Integration - How It Works
+
+## The Question
+
+**"How can addon developers use React if we only ship built `app.js`?"**
+
+You're absolutely right to question this! Let me clarify the architecture.
+
+---
+
+## Current Misunderstanding
+
+**What I showed in examples:**
+```tsx
+// This WON'T work for external addons!
+import { addonLoader, addFilter } from '@woonoow/hooks';
+import { DestinationSearch } from './components/DestinationSearch';
+
+addonLoader.register({
+  id: 'rajaongkir-bridge',
+  init: () => {
+    addFilter('woonoow_order_form_after_shipping', (content) => {
+      return <DestinationSearch />; // ❌ Can't do this!
+    });
+  }
+});
+```
+
+**Problem:** External addons can't import React components because:
+1. They don't have access to our build pipeline
+2. They only get the compiled `app.js`
+3. React is bundled, not exposed
+
+---
+
+## Solution: Three Integration Levels
+
+### **Level 1: Vanilla JS/jQuery** (Basic)
+
+**For simple addons that just need to inject HTML/JS**
+
+```javascript
+// addon-bridge.js (vanilla JS, no build needed)
+(function() {
+  // Wait for WooNooW to load
+  window.addEventListener('woonoow:loaded', function() {
+    // Access WooNooW hooks
+    window.WooNooW.addFilter('woonoow_order_form_after_shipping', function(container, formData) {
+      // Inject HTML
+      const div = document.createElement('div');
+      div.innerHTML = `
+        <div class="rajaongkir-destination">
+          <label>Shipping Destination</label>
+          <select id="rajaongkir-dest">
+            <option>Select destination...</option>
+          </select>
+        </div>
+      `;
+      container.appendChild(div);
+      
+      // Add event listeners
+      document.getElementById('rajaongkir-dest').addEventListener('change', function(e) {
+        // Update WooNooW state
+        window.WooNooW.updateFormData({
+          shipping: {
+            ...formData.shipping,
+            destination_id: e.target.value
+          }
+        });
+      });
+      
+      return container;
+    });
+  });
+})();
+```
+
+**Pros:**
+- ✅ No build process needed
+- ✅ Works immediately
+- ✅ Easy for PHP developers
+- ✅ No dependencies
+
+**Cons:**
+- ❌ No React benefits
+- ❌ Manual DOM manipulation
+- ❌ No type safety
+
+---
+
+### **Level 2: Exposed React Runtime** (Recommended)
+
+**WooNooW exposes React on window for addons to use**
+
+#### WooNooW Core Setup:
+
+```typescript
+// admin-spa/src/main.tsx
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+
+// Expose React for addons
+window.WooNooW = {
+  React: React,
+  ReactDOM: ReactDOM,
+  hooks: {
+    addFilter: addFilter,
+    addAction: addAction,
+    // ... other hooks
+  },
+  components: {
+    // Expose common components
+    Button: Button,
+    Input: Input,
+    Select: Select,
+    // ... other UI components
+  }
+};
+```
+
+#### Addon Development (with build):
+
+```javascript
+// addon-bridge.js (built with Vite/Webpack)
+const { React, hooks, components } = window.WooNooW;
+const { addFilter } = hooks;
+const { Button, Select } = components;
+
+// Addon can now use React!
+function DestinationSearch({ value, onChange }) {
+  const [destinations, setDestinations] = React.useState([]);
+  const [loading, setLoading] = React.useState(false);
+  
+  React.useEffect(() => {
+    // Fetch destinations
+    fetch('/wp-json/rajaongkir/v1/destinations')
+      .then(res => res.json())
+      .then(data => setDestinations(data));
+  }, []);
+  
+  return React.createElement('div', { className: 'rajaongkir-search' },
+    React.createElement('label', null, 'Shipping Destination'),
+    React.createElement(Select, {
+      value: value,
+      onChange: onChange,
+      options: destinations,
+      loading: loading
+    })
+  );
+}
+
+// Register with WooNooW
+addFilter('woonoow_order_form_after_shipping', function(container, formData, setFormData) {
+  const root = ReactDOM.createRoot(container);
+  root.render(
+    React.createElement(DestinationSearch, {
+      value: formData.shipping?.destination_id,
+      onChange: (value) => setFormData({
+        ...formData,
+        shipping: { ...formData.shipping, destination_id: value }
+      })
+    })
+  );
+  return container;
+});
+```
+
+**Addon Build Setup:**
+
+```javascript
+// vite.config.js
+export default {
+  build: {
+    lib: {
+      entry: 'src/addon.js',
+      name: 'RajaongkirBridge',
+      fileName: 'addon'
+    },
+    rollupOptions: {
+      external: ['react', 'react-dom'], // Don't bundle React
+      output: {
+        globals: {
+          react: 'window.WooNooW.React',
+          'react-dom': 'window.WooNooW.ReactDOM'
+        }
+      }
+    }
+  }
+};
+```
+
+**Pros:**
+- ✅ Can use React
+- ✅ Access to WooNooW components
+- ✅ Better DX
+- ✅ Type safety (with TypeScript)
+
+**Cons:**
+- ❌ Requires build process
+- ❌ More complex setup
+
+---
+
+### **Level 3: Slot-Based Rendering** (Advanced)
+
+**WooNooW renders addon components via slots**
+
+#### WooNooW Core:
+
+```typescript
+// OrderForm.tsx
+function OrderForm() {
+  // ... form logic
+  
+  return (
+    <div>
+      {/* ... shipping fields ... */}
+      
+      {/* Slot for addons to inject */}
+      <AddonSlot 
+        name="order_form_after_shipping"
+        props={{ formData, setFormData }}
+      />
+    </div>
+  );
+}
+
+// AddonSlot.tsx
+function AddonSlot({ name, props }) {
+  const slots = useAddonSlots(name);
+  
+  return (
+    <>
+      {slots.map((slot, index) => (
+        <div key={index} data-addon-slot={slot.id}>
+          {slot.component(props)}
+        </div>
+      ))}
+    </>
+  );
+}
+```
+
+#### Addon Registration (PHP):
+
+```php
+// rajaongkir-bridge.php
+add_filter('woonoow/addon_slots', function($slots) {
+    $slots['order_form_after_shipping'][] = [
+        'id' => 'rajaongkir-destination',
+        'component' => 'RajaongkirDestination', // Component name
+        'script' => plugin_dir_url(__FILE__) . 'dist/addon.js',
+        'priority' => 10,
+    ];
+    return $slots;
+});
+```
+
+#### Addon Component (React with build):
+
+```typescript
+// addon/src/DestinationSearch.tsx
+import React, { useState, useEffect } from 'react';
+
+export function RajaongkirDestination({ formData, setFormData }) {
+  const [destinations, setDestinations] = useState([]);
+  
+  useEffect(() => {
+    fetch('/wp-json/rajaongkir/v1/destinations')
+      .then(res => res.json())
+      .then(setDestinations);
+  }, []);
+  
+  return (
+    <div className="rajaongkir-destination">
+      <label>Shipping Destination</label>
+      <select
+        value={formData.shipping?.destination_id || ''}
+        onChange={(e) => setFormData({
+          ...formData,
+          shipping: {
+            ...formData.shipping,
+            destination_id: e.target.value
+          }
+        })}
+      >
+        <option value="">Select destination...</option>
+        {destinations.map(dest => (
+          <option key={dest.id} value={dest.id}>
+            {dest.label}
+          </option>
+        ))}
+      </select>
+    </div>
+  );
+}
+
+// Export for WooNooW to load
+window.WooNooWAddons = window.WooNooWAddons || {};
+window.WooNooWAddons.RajaongkirDestination = RajaongkirDestination;
+```
+
+**Pros:**
+- ✅ Full React support
+- ✅ Type safety
+- ✅ Modern DX
+- ✅ Proper component lifecycle
+
+**Cons:**
+- ❌ Most complex
+- ❌ Requires build process
+- ❌ More WooNooW core complexity
+
+---
+
+## Recommended Approach: Level 2 (Exposed React)
+
+### Implementation in WooNooW Core:
+
+```typescript
+// admin-spa/src/main.tsx
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { QueryClient } from '@tanstack/react-query';
+
+// UI Components
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Select } from '@/components/ui/select';
+import { Label } from '@/components/ui/label';
+// ... other components
+
+// Hooks
+import { addFilter, addAction, applyFilters, doAction } from '@/lib/hooks';
+
+// Expose WooNooW API
+window.WooNooW = {
+  // React runtime
+  React: React,
+  ReactDOM: ReactDOM,
+  
+  // Hooks system
+  hooks: {
+    addFilter,
+    addAction,
+    applyFilters,
+    doAction,
+  },
+  
+  // UI Components (shadcn/ui)
+  components: {
+    Button,
+    Input,
+    Select,
+    Label,
+    // ... expose commonly used components
+  },
+  
+  // Utilities
+  utils: {
+    api: api, // API client
+    toast: toast, // Toast notifications
+  },
+  
+  // Version
+  version: '1.0.0',
+};
+
+// Emit loaded event
+window.dispatchEvent(new CustomEvent('woonoow:loaded'));
+```
+
+### Addon Developer Experience:
+
+#### Option 1: Vanilla JS (No Build)
+
+```javascript
+// addon.js
+(function() {
+  const { React, hooks, components } = window.WooNooW;
+  const { addFilter } = hooks;
+  const { Select } = components;
+  
+  addFilter('woonoow_order_form_after_shipping', function(container, props) {
+    // Use React.createElement (no JSX)
+    const element = React.createElement(Select, {
+      label: 'Destination',
+      options: [...],
+      value: props.formData.shipping?.destination_id,
+      onChange: (value) => props.setFormData({...})
+    });
+    
+    const root = ReactDOM.createRoot(container);
+    root.render(element);
+    
+    return container;
+  });
+})();
+```
+
+#### Option 2: With Build (JSX Support)
+
+```typescript
+// addon/src/index.tsx
+const { React, hooks, components } = window.WooNooW;
+const { addFilter } = hooks;
+const { Select } = components;
+
+function DestinationSearch({ formData, setFormData }) {
+  return (
+    <Select
+      label="Destination"
+      options={[...]}
+      value={formData.shipping?.destination_id}
+      onChange={(value) => setFormData({
+        ...formData,
+        shipping: { ...formData.shipping, destination_id: value }
+      })}
+    />
+  );
+}
+
+addFilter('woonoow_order_form_after_shipping', (container, props) => {
+  const root = ReactDOM.createRoot(container);
+  root.render(<DestinationSearch {...props} />);
+  return container;
+});
+```
+
+```javascript
+// vite.config.js
+export default {
+  build: {
+    lib: {
+      entry: 'src/index.tsx',
+      formats: ['iife'],
+      name: 'RajaongkirAddon'
+    },
+    rollupOptions: {
+      external: ['react', 'react-dom'],
+      output: {
+        globals: {
+          react: 'window.WooNooW.React',
+          'react-dom': 'window.WooNooW.ReactDOM'
+        }
+      }
+    }
+  }
+};
+```
+
+---
+
+## Documentation for Addon Developers
+
+### Quick Start Guide:
+
+```markdown
+# WooNooW Addon Development
+
+## Level 1: Vanilla JS (Easiest)
+
+No build process needed. Just use `window.WooNooW` API.
+
+## Level 2: React with Build (Recommended)
+
+1. Setup project:
+   npm init
+   npm install --save-dev vite @types/react
+
+2. Configure vite.config.js (see example above)
+
+3. Use WooNooW's React:
+   const { React } = window.WooNooW;
+
+4. Build:
+   npm run build
+
+5. Enqueue in WordPress:
+   wp_enqueue_script('my-addon', plugin_dir_url(__FILE__) . 'dist/addon.js', ['woonoow-admin'], '1.0.0', true);
+```
+
+---
+
+## Summary
+
+**Your concern was valid!** ✅
+
+**Solution:**
+1. ✅ Expose React on `window.WooNooW.React`
+2. ✅ Expose common components on `window.WooNooW.components`
+3. ✅ Addons can use vanilla JS (no build) or React (with build)
+4. ✅ Addons don't bundle React (use ours)
+5. ✅ Proper documentation for developers
+
+**Result:**
+- Simple addons: Vanilla JS, no build
+- Advanced addons: React with build, external React
+- Best of both worlds!
diff --git a/ARCHITECTURE_DECISION_CUSTOMER_SPA.md b/ARCHITECTURE_DECISION_CUSTOMER_SPA.md
new file mode 100644
index 0000000..c6f9e5d
--- /dev/null
+++ b/ARCHITECTURE_DECISION_CUSTOMER_SPA.md
@@ -0,0 +1,500 @@
+# Architecture Decision: Customer-SPA Placement
+
+## The Question
+
+Should `customer-spa` be:
+- **Option A:** Built into WooNooW core plugin (alongside `admin-spa`)
+- **Option B:** Separate WooNooW theme (standalone product)
+
+---
+
+## Option A: Customer-SPA in Core Plugin
+
+### Structure:
+```
+woonoow/
+├── admin-spa/          (Admin interface)
+├── customer-spa/       (Customer-facing: Cart, Checkout, My Account)
+├── includes/
+│   ├── Frontend/       (Customer frontend logic)
+│   └── Admin/          (Admin backend logic)
+└── woonoow.php
+```
+
+### Pros ✅
+
+#### 1. **Unified Product**
+- Single installation
+- Single license
+- Single update process
+- Easier for customers to understand
+
+#### 2. **Technical Cohesion**
+- Shared API endpoints
+- Shared authentication
+- Shared state management
+- Shared utilities and helpers
+
+#### 3. **Development Efficiency**
+- Shared components library
+- Shared TypeScript types
+- Shared build pipeline
+- Single codebase to maintain
+
+#### 4. **Market Positioning**
+- "Complete WooCommerce modernization"
+- Easier to sell as single product
+- Higher perceived value
+- Simpler pricing model
+
+#### 5. **User Experience**
+- Consistent design language
+- Seamless admin-to-frontend flow
+- Single settings interface
+- Unified branding
+
+### Cons ❌
+
+#### 1. **Plugin Size**
+- Larger download (~5-10MB)
+- More files to load
+- Potential performance concern
+
+#### 2. **Flexibility**
+- Users must use our frontend
+- Can't use with other themes easily
+- Less customization freedom
+
+#### 3. **Theme Compatibility**
+- May conflict with theme styles
+- Requires CSS isolation
+- More testing needed
+
+---
+
+## Option B: Customer-SPA as Theme
+
+### Structure:
+```
+woonoow/ (Plugin)
+├── admin-spa/          (Admin interface only)
+└── includes/
+    └── Admin/
+
+woonoow-theme/ (Theme)
+├── customer-spa/       (Customer-facing)
+├── templates/
+└── style.css
+```
+
+### Pros ✅
+
+#### 1. **WordPress Best Practices**
+- Themes handle frontend
+- Plugins handle functionality
+- Clear separation of concerns
+- Follows WP conventions
+
+#### 2. **Flexibility**
+- Users can choose theme
+- Can create child themes
+- Easier customization
+- Better for agencies
+
+#### 3. **Market Segmentation**
+- Sell plugin separately (~$99)
+- Sell theme separately (~$79)
+- Bundle discount (~$149)
+- More revenue potential
+
+#### 4. **Lighter Plugin**
+- Smaller plugin size
+- Faster admin load
+- Only admin functionality
+- Better performance
+
+#### 5. **Theme Ecosystem**
+- Can create multiple themes
+- Different industries (fashion, electronics, etc.)
+- Premium theme marketplace
+- More business opportunities
+
+### Cons ❌
+
+#### 1. **Complexity for Users**
+- Two products to install
+- Two licenses to manage
+- Two update processes
+- More confusing
+
+#### 2. **Technical Challenges**
+- API communication between plugin/theme
+- Version compatibility issues
+- More testing required
+- Harder to maintain
+
+#### 3. **Market Confusion**
+- "Do I need both?"
+- "Why separate products?"
+- Higher barrier to entry
+- More support questions
+
+#### 4. **Development Overhead**
+- Two repositories
+- Two build processes
+- Two release cycles
+- More maintenance
+
+---
+
+## Market Analysis
+
+### Target Market Segments:
+
+#### Segment 1: Small Business Owners (60%)
+**Needs:**
+- Simple, all-in-one solution
+- Easy to install and use
+- Don't care about technical details
+- Want "it just works"
+
+**Preference:** ✅ **Option A** (Core Plugin)
+- Single product easier to understand
+- Less technical knowledge required
+- Lower barrier to entry
+
+#### Segment 2: Agencies & Developers (30%)
+**Needs:**
+- Flexibility and customization
+- Can build custom themes
+- Want control over frontend
+- Multiple client sites
+
+**Preference:** ✅ **Option B** (Theme)
+- More flexibility
+- Can create custom themes
+- Better for white-label
+- Professional workflow
+
+#### Segment 3: Enterprise (10%)
+**Needs:**
+- Full control
+- Custom development
+- Scalability
+- Support
+
+**Preference:** 🤷 **Either works**
+- Will customize anyway
+- Have development team
+- Budget not a concern
+
+---
+
+## Competitor Analysis
+
+### Shopify
+- **All-in-one platform**
+- Admin + Frontend unified
+- Themes available but optional
+- Core experience complete
+
+**Lesson:** Users expect complete solution
+
+### WooCommerce
+- **Plugin + Theme separation**
+- Plugin = functionality
+- Theme = design
+- Standard WordPress approach
+
+**Lesson:** Separation is familiar to WP users
+
+### SureCart
+- **All-in-one plugin**
+- Handles admin + checkout
+- Works with any theme
+- Shortcode-based frontend
+
+**Lesson:** Plugin can handle both
+
+### NorthCommerce
+- **All-in-one plugin**
+- Complete replacement
+- Own frontend + admin
+- Theme-agnostic
+
+**Lesson:** Modern solutions are unified
+
+---
+
+## Technical Considerations
+
+### Performance
+
+**Option A (Core Plugin):**
+```
+Admin page load: 200KB (admin-spa)
+Customer page load: 300KB (customer-spa)
+Total plugin size: 8MB
+```
+
+**Option B (Theme):**
+```
+Admin page load: 200KB (admin-spa)
+Customer page load: 300KB (customer-spa from theme)
+Plugin size: 4MB
+Theme size: 4MB
+```
+
+**Winner:** Tie (same total load)
+
+### Maintenance
+
+**Option A:**
+- Single codebase
+- Single release
+- Easier version control
+- Less coordination
+
+**Option B:**
+- Two codebases
+- Coordinated releases
+- Version compatibility matrix
+- More complexity
+
+**Winner:** ✅ **Option A**
+
+### Flexibility
+
+**Option A:**
+- Users can disable customer-spa via settings
+- Can use with any theme (shortcodes)
+- Hybrid approach possible
+
+**Option B:**
+- Full theme control
+- Can create variations
+- Better for customization
+
+**Winner:** ✅ **Option B**
+
+---
+
+## Hybrid Approach (Recommended)
+
+### Best of Both Worlds:
+
+**WooNooW Plugin (Core):**
+```
+woonoow/
+├── admin-spa/              (Always active)
+├── customer-spa/           (Optional, can be disabled)
+├── includes/
+│   ├── Admin/
+│   └── Frontend/
+│       ├── Shortcodes/     (For any theme)
+│       └── SPA/            (Full SPA mode)
+└── woonoow.php
+```
+
+**Settings:**
+```php
+// WooNooW > Settings > Developer
+Frontend Mode:
+○ Disabled (use theme)
+● Shortcodes (hybrid - works with any theme)
+○ Full SPA (replace theme frontend)
+```
+
+**WooNooW Themes (Optional):**
+```
+woonoow-theme-storefront/   (Free, basic)
+woonoow-theme-fashion/      (Premium, $79)
+woonoow-theme-electronics/  (Premium, $79)
+```
+
+### How It Works:
+
+#### Mode 1: Disabled
+- Plugin only provides admin-spa
+- Theme handles all frontend
+- For users who want full theme control
+
+#### Mode 2: Shortcodes (Default)
+- Plugin provides cart/checkout/account components
+- Works with ANY theme
+- Hybrid approach (SSR + SPA islands)
+- Best compatibility
+
+#### Mode 3: Full SPA
+- Plugin takes over entire frontend
+- Theme only provides header/footer
+- Maximum performance
+- For performance-critical sites
+
+---
+
+## Revenue Model Comparison
+
+### Option A: Unified Plugin
+
+**Pricing:**
+- WooNooW Plugin: $149/year
+- Includes admin + customer SPA
+- All features
+
+**Projected Revenue (1000 customers):**
+- $149,000/year
+
+### Option B: Separate Products
+
+**Pricing:**
+- WooNooW Plugin (admin only): $99/year
+- WooNooW Theme: $79/year
+- Bundle: $149/year (save $29)
+
+**Projected Revenue (1000 customers):**
+- 60% buy bundle: $89,400
+- 30% buy plugin only: $29,700
+- 10% buy both separately: $17,800
+- **Total: $136,900/year**
+
+**Winner:** ✅ **Option A** ($12,100 more revenue)
+
+### Option C: Hybrid Approach
+
+**Pricing:**
+- WooNooW Plugin (includes basic customer-spa): $149/year
+- Premium Themes: $79/year each
+- Bundle (plugin + premium theme): $199/year
+
+**Projected Revenue (1000 customers):**
+- 70% plugin only: $104,300
+- 20% plugin + theme bundle: $39,800
+- 10% plugin + multiple themes: $20,000
+- **Total: $164,100/year**
+
+**Winner:** ✅ **Option C** ($27,200 more revenue!)
+
+---
+
+## Recommendation: Hybrid Approach (Option C)
+
+### Implementation:
+
+**Phase 1: Core Plugin with Customer-SPA**
+```
+woonoow/
+├── admin-spa/          ✅ Full admin interface
+├── customer-spa/       ✅ Basic cart/checkout/account
+│   ├── Cart.tsx
+│   ├── Checkout.tsx
+│   └── MyAccount.tsx
+└── includes/
+    ├── Admin/
+    └── Frontend/
+        ├── Shortcodes/  ✅ [woonoow_cart], [woonoow_checkout]
+        └── SPA/         ✅ Full SPA mode (optional)
+```
+
+**Phase 2: Premium Themes (Optional)**
+```
+woonoow-theme-fashion/
+├── customer-spa/       ✅ Enhanced components
+│   ├── ProductCard.tsx
+│   ├── CategoryGrid.tsx
+│   └── SearchBar.tsx
+└── templates/
+    ├── header.php
+    └── footer.php
+```
+
+### Benefits:
+
+✅ **For Users:**
+- Single product to start ($149)
+- Works with any theme (shortcodes)
+- Optional premium themes for better design
+- Flexible deployment
+
+✅ **For Us:**
+- Higher base revenue
+- Additional theme revenue
+- Easier to sell
+- Less support complexity
+
+✅ **For Developers:**
+- Can use basic customer-spa
+- Can build custom themes
+- Can extend with hooks
+- Maximum flexibility
+
+---
+
+## Decision Matrix
+
+| Criteria | Option A (Core) | Option B (Theme) | Option C (Hybrid) |
+|----------|----------------|------------------|-------------------|
+| **User Experience** | ⭐⭐⭐⭐⭐ Simple | ⭐⭐⭐ Complex | ⭐⭐⭐⭐ Flexible |
+| **Revenue Potential** | ⭐⭐⭐⭐ $149K | ⭐⭐⭐ $137K | ⭐⭐⭐⭐⭐ $164K |
+| **Development Effort** | ⭐⭐⭐⭐ Medium | ⭐⭐ High | ⭐⭐⭐ Medium-High |
+| **Maintenance** | ⭐⭐⭐⭐⭐ Easy | ⭐⭐ Hard | ⭐⭐⭐⭐ Moderate |
+| **Flexibility** | ⭐⭐⭐ Limited | ⭐⭐⭐⭐⭐ Maximum | ⭐⭐⭐⭐ High |
+| **Market Fit** | ⭐⭐⭐⭐ Good | ⭐⭐⭐ Okay | ⭐⭐⭐⭐⭐ Excellent |
+| **WP Best Practices** | ⭐⭐⭐ Okay | ⭐⭐⭐⭐⭐ Perfect | ⭐⭐⭐⭐ Good |
+
+---
+
+## Final Recommendation
+
+### ✅ **Option C: Hybrid Approach**
+
+**Implementation:**
+
+1. **WooNooW Plugin ($149/year):**
+   - Admin-SPA (full featured)
+   - Customer-SPA (basic cart/checkout/account)
+   - Shortcode mode (works with any theme)
+   - Full SPA mode (optional)
+
+2. **Premium Themes ($79/year each):**
+   - Enhanced customer-spa components
+   - Industry-specific designs
+   - Advanced features
+   - Professional layouts
+
+3. **Bundles:**
+   - Plugin + Theme: $199/year (save $29)
+   - Plugin + 3 Themes: $299/year (save $87)
+
+### Why This Works:
+
+✅ **60% of users** (small businesses) get complete solution in one plugin
+✅ **30% of users** (agencies) can build custom themes or buy premium
+✅ **10% of users** (enterprise) have maximum flexibility
+✅ **Higher revenue** potential with theme marketplace
+✅ **Easier to maintain** than fully separate products
+✅ **Better market positioning** than competitors
+
+### Next Steps:
+
+**Phase 1 (Current):** Build admin-spa ✅
+**Phase 2 (Next):** Build basic customer-spa in core plugin
+**Phase 3 (Future):** Launch premium theme marketplace
+
+---
+
+## Conclusion
+
+**Build customer-spa into WooNooW core plugin with:**
+- Shortcode mode (default, works with any theme)
+- Full SPA mode (optional, for performance)
+- Premium themes as separate products (optional)
+
+**This gives us:**
+- Best user experience
+- Highest revenue potential
+- Maximum flexibility
+- Sustainable business model
+- Competitive advantage
+
+**Decision: Option C (Hybrid Approach)** ✅
diff --git a/admin-spa/src/components/ui/color-picker.tsx b/admin-spa/src/components/ui/color-picker.tsx
new file mode 100644
index 0000000..7d695c9
--- /dev/null
+++ b/admin-spa/src/components/ui/color-picker.tsx
@@ -0,0 +1,168 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { Input } from './input';
+import { Button } from './button';
+import { Popover, PopoverContent, PopoverTrigger } from './popover';
+import { cn } from '@/lib/utils';
+
+interface ColorPickerProps {
+  value: string;
+  onChange: (color: string) => void;
+  label?: string;
+  description?: string;
+  presets?: string[];
+  className?: string;
+}
+
+const DEFAULT_PRESETS = [
+  '#3b82f6', // blue
+  '#8b5cf6', // purple
+  '#10b981', // green
+  '#f59e0b', // amber
+  '#ef4444', // red
+  '#ec4899', // pink
+  '#06b6d4', // cyan
+  '#6366f1', // indigo
+];
+
+export function ColorPicker({
+  value,
+  onChange,
+  label,
+  description,
+  presets = DEFAULT_PRESETS,
+  className,
+}: ColorPickerProps) {
+  const [inputValue, setInputValue] = useState(value);
+  const [open, setOpen] = useState(false);
+  const colorInputRef = useRef<HTMLInputElement>(null);
+
+  // Sync input value when prop changes
+  useEffect(() => {
+    setInputValue(value);
+  }, [value]);
+
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const newValue = e.target.value;
+    setInputValue(newValue);
+    
+    // Only update if valid hex color
+    if (/^#[0-9A-F]{6}$/i.test(newValue)) {
+      onChange(newValue);
+    }
+  };
+
+  const handleInputBlur = () => {
+    // Validate and fix format on blur
+    let color = inputValue.trim();
+    
+    // Add # if missing
+    if (!color.startsWith('#')) {
+      color = '#' + color;
+    }
+    
+    // Validate hex format
+    if (/^#[0-9A-F]{6}$/i.test(color)) {
+      setInputValue(color);
+      onChange(color);
+    } else {
+      // Revert to last valid value
+      setInputValue(value);
+    }
+  };
+
+  const handleColorInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const newColor = e.target.value;
+    setInputValue(newColor);
+    onChange(newColor);
+  };
+
+  const handlePresetClick = (color: string) => {
+    setInputValue(color);
+    onChange(color);
+    setOpen(false);
+  };
+
+  return (
+    <div className={cn('space-y-2', className)}>
+      {label && (
+        <label className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+          {label}
+        </label>
+      )}
+      
+      {description && (
+        <p className="text-sm text-muted-foreground">{description}</p>
+      )}
+
+      <div className="flex gap-2">
+        {/* Color preview and picker */}
+        <Popover open={open} onOpenChange={setOpen}>
+          <PopoverTrigger asChild>
+            <Button
+              type="button"
+              variant="outline"
+              className="w-12 h-10 p-0 border-2"
+              style={{ backgroundColor: value }}
+            >
+              <span className="sr-only">Pick color</span>
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent className="w-64 p-4" align="start">
+            <div className="space-y-4">
+              {/* Native color picker */}
+              <div>
+                <label className="text-sm font-medium mb-2 block">
+                  Pick a color
+                </label>
+                <input
+                  ref={colorInputRef}
+                  type="color"
+                  value={value}
+                  onChange={handleColorInputChange}
+                  className="w-full h-10 rounded cursor-pointer"
+                />
+              </div>
+
+              {/* Preset colors */}
+              {presets.length > 0 && (
+                <div>
+                  <label className="text-sm font-medium mb-2 block">
+                    Presets
+                  </label>
+                  <div className="grid grid-cols-4 gap-2">
+                    {presets.map((preset) => (
+                      <button
+                        key={preset}
+                        type="button"
+                        className={cn(
+                          'w-full h-10 rounded border-2 transition-all',
+                          value === preset
+                            ? 'border-primary ring-2 ring-primary/20'
+                            : 'border-transparent hover:border-muted-foreground/25'
+                        )}
+                        style={{ backgroundColor: preset }}
+                        onClick={() => handlePresetClick(preset)}
+                        title={preset}
+                      />
+                    ))}
+                  </div>
+                </div>
+              )}
+            </div>
+          </PopoverContent>
+        </Popover>
+
+        {/* Hex input */}
+        <Input
+          type="text"
+          value={inputValue}
+          onChange={handleInputChange}
+          onBlur={handleInputBlur}
+          placeholder="#3b82f6"
+          className="flex-1 font-mono"
+          maxLength={7}
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/admin-spa/src/components/ui/image-upload.tsx b/admin-spa/src/components/ui/image-upload.tsx
new file mode 100644
index 0000000..48caa12
--- /dev/null
+++ b/admin-spa/src/components/ui/image-upload.tsx
@@ -0,0 +1,194 @@
+import React, { useState, useRef } from 'react';
+import { Upload, X, Image as ImageIcon } from 'lucide-react';
+import { Button } from './button';
+import { cn } from '@/lib/utils';
+
+interface ImageUploadProps {
+  value?: string;
+  onChange: (url: string) => void;
+  onRemove?: () => void;
+  label?: string;
+  description?: string;
+  accept?: string;
+  maxSize?: number; // in MB
+  className?: string;
+}
+
+export function ImageUpload({
+  value,
+  onChange,
+  onRemove,
+  label,
+  description,
+  accept = 'image/*',
+  maxSize = 2,
+  className,
+}: ImageUploadProps) {
+  const [isDragging, setIsDragging] = useState(false);
+  const [isUploading, setIsUploading] = useState(false);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const handleDragOver = (e: React.DragEvent) => {
+    e.preventDefault();
+    setIsDragging(true);
+  };
+
+  const handleDragLeave = () => {
+    setIsDragging(false);
+  };
+
+  const handleDrop = (e: React.DragEvent) => {
+    e.preventDefault();
+    setIsDragging(false);
+    
+    const files = Array.from(e.dataTransfer.files);
+    if (files.length > 0) {
+      handleFile(files[0]);
+    }
+  };
+
+  const handleFileSelect = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const files = e.target.files;
+    if (files && files.length > 0) {
+      handleFile(files[0]);
+    }
+  };
+
+  const handleFile = async (file: File) => {
+    // Validate file type
+    if (!file.type.startsWith('image/')) {
+      alert('Please select an image file');
+      return;
+    }
+
+    // Validate file size
+    if (file.size > maxSize * 1024 * 1024) {
+      alert(`File size must be less than ${maxSize}MB`);
+      return;
+    }
+
+    setIsUploading(true);
+
+    try {
+      // Create FormData
+      const formData = new FormData();
+      formData.append('file', file);
+
+      // Upload to WordPress media library
+      const response = await fetch('/wp-json/wp/v2/media', {
+        method: 'POST',
+        headers: {
+          'X-WP-Nonce': (window as any).wpApiSettings?.nonce || '',
+        },
+        body: formData,
+      });
+
+      if (!response.ok) {
+        throw new Error('Upload failed');
+      }
+
+      const data = await response.json();
+      onChange(data.source_url);
+    } catch (error) {
+      console.error('Upload error:', error);
+      alert('Failed to upload image');
+    } finally {
+      setIsUploading(false);
+    }
+  };
+
+  const handleRemove = () => {
+    if (onRemove) {
+      onRemove();
+    } else {
+      onChange('');
+    }
+  };
+
+  const handleClick = () => {
+    fileInputRef.current?.click();
+  };
+
+  return (
+    <div className={cn('space-y-2', className)}>
+      {label && (
+        <label className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+          {label}
+        </label>
+      )}
+      
+      {description && (
+        <p className="text-sm text-muted-foreground">{description}</p>
+      )}
+
+      <div className="space-y-4">
+        {value ? (
+          // Preview
+          <div className="relative inline-block">
+            <img
+              src={value}
+              alt="Preview"
+              className="max-w-full h-auto max-h-48 rounded-lg border"
+            />
+            <Button
+              type="button"
+              variant="destructive"
+              size="icon"
+              className="absolute top-2 right-2"
+              onClick={handleRemove}
+            >
+              <X className="h-4 w-4" />
+            </Button>
+          </div>
+        ) : (
+          // Upload area
+          <div
+            className={cn(
+              'border-2 border-dashed rounded-lg p-8 text-center cursor-pointer transition-colors',
+              isDragging
+                ? 'border-primary bg-primary/5'
+                : 'border-muted-foreground/25 hover:border-primary/50',
+              isUploading && 'opacity-50 cursor-not-allowed'
+            )}
+            onDragOver={handleDragOver}
+            onDragLeave={handleDragLeave}
+            onDrop={handleDrop}
+            onClick={handleClick}
+          >
+            <input
+              ref={fileInputRef}
+              type="file"
+              accept={accept}
+              onChange={handleFileSelect}
+              className="hidden"
+              disabled={isUploading}
+            />
+
+            <div className="flex flex-col items-center gap-2">
+              {isUploading ? (
+                <>
+                  <div className="h-12 w-12 rounded-full border-4 border-primary border-t-transparent animate-spin" />
+                  <p className="text-sm text-muted-foreground">Uploading...</p>
+                </>
+              ) : (
+                <>
+                  <div className="h-12 w-12 rounded-full bg-muted flex items-center justify-center">
+                    <Upload className="h-6 w-6 text-muted-foreground" />
+                  </div>
+                  <div className="space-y-1">
+                    <p className="text-sm font-medium">
+                      Drop image here or click to upload
+                    </p>
+                    <p className="text-xs text-muted-foreground">
+                      Max size: {maxSize}MB
+                    </p>
+                  </div>
+                </>
+              )}
+            </div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/admin-spa/src/routes/Settings/Store.tsx b/admin-spa/src/routes/Settings/Store.tsx
index 60bdd35..34d80be 100644
--- a/admin-spa/src/routes/Settings/Store.tsx
+++ b/admin-spa/src/routes/Settings/Store.tsx
@@ -7,6 +7,9 @@ import { SettingsSection } from './components/SettingsSection';
 import { Input } from '@/components/ui/input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { SearchableSelect } from '@/components/ui/searchable-select';
+import { ImageUpload } from '@/components/ui/image-upload';
+import { ColorPicker } from '@/components/ui/color-picker';
+import { Button } from '@/components/ui/button';
 import { toast } from 'sonner';
 import flagsData from '@/data/flags.json';
 
@@ -38,6 +41,13 @@ interface StoreSettings {
   timezone: string;
   weightUnit: string;
   dimensionUnit: string;
+  // Branding
+  storeLogo: string;
+  storeIcon: string;
+  storeTagline: string;
+  primaryColor: string;
+  accentColor: string;
+  errorColor: string;
 }
 
 export default function StoreDetailsPage() {
@@ -60,6 +70,12 @@ export default function StoreDetailsPage() {
     timezone: 'Asia/Jakarta',
     weightUnit: 'kg',
     dimensionUnit: 'cm',
+    storeLogo: '',
+    storeIcon: '',
+    storeTagline: '',
+    primaryColor: '#3b82f6',
+    accentColor: '#10b981',
+    errorColor: '#ef4444',
   });
 
   // Fetch store settings
@@ -110,6 +126,12 @@ export default function StoreDetailsPage() {
       timezone: storeData.timezone || 'Asia/Jakarta',
       weightUnit: storeData.weight_unit || 'kg',
       dimensionUnit: storeData.dimension_unit || 'cm',
+      storeLogo: storeData.store_logo || '',
+      storeIcon: storeData.store_icon || '',
+      storeTagline: storeData.store_tagline || '',
+      primaryColor: storeData.primary_color || '#3b82f6',
+      accentColor: storeData.accent_color || '#10b981',
+      errorColor: storeData.error_color || '#ef4444',
     };
   }, [storeData]);
 
@@ -140,6 +162,12 @@ export default function StoreDetailsPage() {
       timezone: data.timezone,
       weight_unit: data.weightUnit,
       dimension_unit: data.dimensionUnit,
+      store_logo: data.storeLogo,
+      store_icon: data.storeIcon,
+      store_tagline: data.storeTagline,
+      primary_color: data.primaryColor,
+      accent_color: data.accentColor,
+      error_color: data.errorColor,
     }),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['store-settings'] });
@@ -250,6 +278,85 @@ export default function StoreDetailsPage() {
             placeholder="+62 812 3456 7890"
           />
         </SettingsSection>
+
+        <SettingsSection
+          label="Store tagline"
+          description="A short tagline or slogan for your store"
+          htmlFor="storeTagline"
+        >
+          <Input
+            id="storeTagline"
+            value={settings.storeTagline}
+            onChange={(e) => updateSetting('storeTagline', e.target.value)}
+            placeholder="Quality products, delivered fast"
+          />
+        </SettingsSection>
+
+        <SettingsSection label="Store logo" description="Recommended: 200x60px PNG with transparent background">
+          <ImageUpload
+            value={settings.storeLogo}
+            onChange={(url) => updateSetting('storeLogo', url)}
+            onRemove={() => updateSetting('storeLogo', '')}
+            maxSize={2}
+          />
+        </SettingsSection>
+
+        <SettingsSection label="Store icon" description="Favicon for browser tabs (32x32px)">
+          <ImageUpload
+            value={settings.storeIcon}
+            onChange={(url) => updateSetting('storeIcon', url)}
+            onRemove={() => updateSetting('storeIcon', '')}
+            maxSize={1}
+          />
+        </SettingsSection>
+      </SettingsCard>
+
+      {/* Brand Colors */}
+      <SettingsCard
+        title="Brand Colors"
+        description="Customize your admin interface colors"
+      >
+        <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+          <ColorPicker
+            label="Primary Color"
+            description="Main brand color"
+            value={settings.primaryColor}
+            onChange={(color) => updateSetting('primaryColor', color)}
+          />
+
+          <ColorPicker
+            label="Accent Color"
+            description="Success and highlights"
+            value={settings.accentColor}
+            onChange={(color) => updateSetting('accentColor', color)}
+          />
+
+          <ColorPicker
+            label="Error Color"
+            description="Errors and warnings"
+            value={settings.errorColor}
+            onChange={(color) => updateSetting('errorColor', color)}
+          />
+        </div>
+
+        <div className="flex items-center gap-2 mt-4 pt-4 border-t">
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => {
+              updateSetting('primaryColor', '#3b82f6');
+              updateSetting('accentColor', '#10b981');
+              updateSetting('errorColor', '#ef4444');
+              toast.success('Colors reset to default');
+            }}
+          >
+            Reset to Default
+          </Button>
+          <p className="text-sm text-muted-foreground">
+            Changes apply after saving
+          </p>
+        </div>
       </SettingsCard>
 
       {/* Store Address */}