diff --git a/.env.example b/.env.example
index d9c2521..69cef98 100644
--- a/.env.example
+++ b/.env.example
@@ -10,7 +10,7 @@
 PROJECT_NAME=jama
 
 # Image version to run (set by build.sh, or use 'latest')
-JAMA_VERSION=0.9.15
+JAMA_VERSION=0.9.16
 
 # App port — the host port Docker maps to the container
 PORT=3000
diff --git a/backend/package.json b/backend/package.json
index 6995f75..b897f61 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jama-backend",
-  "version": "0.9.15",
+  "version": "0.9.16",
   "description": "TeamChat backend server",
   "main": "src/index.js",
   "scripts": {
diff --git a/build.sh b/build.sh
index f7fe532..3a0ba63 100644
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,7 @@
 # ─────────────────────────────────────────────────────────────
 set -euo pipefail
 
-VERSION="${1:-0.9.15}"
+VERSION="${1:-0.9.16}"
 ACTION="${2:-}"
 REGISTRY="${REGISTRY:-}"
 IMAGE_NAME="jama"
diff --git a/frontend/package.json b/frontend/package.json
index 5d9313f..e322eb5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jama-frontend",
-  "version": "0.9.15",
+  "version": "0.9.16",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/frontend/src/components/BrandingModal.jsx b/frontend/src/components/BrandingModal.jsx
index caee937..97dbee5 100644
--- a/frontend/src/components/BrandingModal.jsx
+++ b/frontend/src/components/BrandingModal.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { api } from '../utils/api.js';
 import { useToast } from '../contexts/ToastContext.jsx';
 
@@ -6,46 +6,124 @@ const DEFAULT_TITLE_COLOR  = '#1a73e8';
 const DEFAULT_PUBLIC_COLOR = '#1a73e8';
 const DEFAULT_DM_COLOR     = '#a142f4';
 
-function ColorSwatch({ color, title }) {
+const COLOUR_SUGGESTIONS = [
+  '#1a73e8','#a142f4','#e53935','#34a853','#fa7b17',
+  '#00897b','#e91e8c','#0097a7','#5c6bc0','#f4511e',
+  '#616161','#795548','#00acc1','#43a047','#fdd835',
+];
+
+// A single colour picker card: shows suggestions by default, Custom button opens native picker
+function ColourPicker({ label, description, value, onChange, preview }) {
+  const [mode, setMode] = useState('suggestions'); // 'suggestions' | 'custom'
+  const inputRef = useRef(null);
+
+  const handleCustomClick = () => {
+    setMode('custom');
+    // Open native colour picker immediately after switching
+    setTimeout(() => inputRef.current?.click(), 50);
+  };
+
   return (
-    <div style={{
-      width: 32, height: 32, borderRadius: 8,
-      background: color,
-      border: '2px solid var(--border)',
-      flexShrink: 0,
-      boxShadow: '0 1px 4px rgba(0,0,0,0.15)',
-    }} title={title} />
+    <div>
+      <div className="settings-section-label">{label}</div>
+      {description && (
+        <p style={{ fontSize: 12, color: 'var(--text-tertiary)', marginBottom: 12 }}>{description}</p>
+      )}
+
+      {/* Current colour preview */}
+      <div style={{ display: 'flex', alignItems: 'center', gap: 10, marginBottom: 14 }}>
+        {preview
+          ? preview(value)
+          : <div style={{ width: 36, height: 36, borderRadius: 8, background: value, border: '2px solid var(--border)', flexShrink: 0 }} />
+        }
+        <span style={{ fontSize: 13, color: 'var(--text-secondary)', fontFamily: 'monospace' }}>{value}</span>
+      </div>
+
+      {mode === 'suggestions' && (
+        <>
+          {/* Suggestion swatches */}
+          <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, marginBottom: 12 }}>
+            {COLOUR_SUGGESTIONS.map(hex => (
+              <button
+                key={hex}
+                onClick={() => onChange(hex)}
+                style={{
+                  width: 32, height: 32, borderRadius: 8,
+                  background: hex, border: hex === value ? '3px solid var(--text-primary)' : '2px solid var(--border)',
+                  cursor: 'pointer', flexShrink: 0,
+                  boxShadow: hex === value ? '0 0 0 2px var(--surface), 0 0 0 4px var(--text-primary)' : 'none',
+                  transition: 'box-shadow 0.15s',
+                }}
+                title={hex}
+              />
+            ))}
+          </div>
+          {/* Custom button — styled to match suggestion swatches row */}
+          <button
+            className="btn btn-secondary btn-sm"
+            onClick={handleCustomClick}
+          >
+            Custom
+          </button>
+        </>
+      )}
+
+      {mode === 'custom' && (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+          <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
+            <input
+              ref={inputRef}
+              type="color"
+              value={value}
+              onChange={e => onChange(e.target.value)}
+              style={{
+                width: 56, height: 44, padding: 2,
+                borderRadius: 8, border: '1px solid var(--border)',
+                cursor: 'pointer', background: 'none',
+              }}
+            />
+            <span style={{ fontSize: 13, color: 'var(--text-secondary)', fontFamily: 'monospace' }}>{value}</span>
+          </div>
+          {/* Back button — same style as Custom button */}
+          <div>
+            <button
+              className="btn btn-secondary btn-sm"
+              onClick={() => setMode('suggestions')}
+            >
+              Back
+            </button>
+          </div>
+        </div>
+      )}
+    </div>
   );
 }
 
 export default function BrandingModal({ onClose }) {
   const toast = useToast();
-  const [tab, setTab] = useState('general'); // 'general' | 'colors'
+  const [tab, setTab] = useState('general'); // 'general' | 'colours'
   const [settings, setSettings] = useState({});
   const [appName, setAppName] = useState('');
   const [loading, setLoading] = useState(false);
   const [resetting, setResetting] = useState(false);
   const [showResetConfirm, setShowResetConfirm] = useState(false);
 
-  // Color state
-  const [colorTitle, setColorTitle]         = useState(DEFAULT_TITLE_COLOR);
-  const [colorPublic, setColorPublic]       = useState(DEFAULT_PUBLIC_COLOR);
-  const [colorDm, setColorDm]               = useState(DEFAULT_DM_COLOR);
-  const [savingColors, setSavingColors]     = useState(false);
+  const [colourTitle, setColourTitle]   = useState(DEFAULT_TITLE_COLOR);
+  const [colourPublic, setColourPublic] = useState(DEFAULT_PUBLIC_COLOR);
+  const [colourDm, setColourDm]         = useState(DEFAULT_DM_COLOR);
+  const [savingColours, setSavingColours] = useState(false);
 
   useEffect(() => {
     api.getSettings().then(({ settings }) => {
       setSettings(settings);
       setAppName(settings.app_name || 'jama');
-      setColorTitle(settings.color_title || DEFAULT_TITLE_COLOR);
-      setColorPublic(settings.color_avatar_public || DEFAULT_PUBLIC_COLOR);
-      setColorDm(settings.color_avatar_dm || DEFAULT_DM_COLOR);
+      setColourTitle(settings.color_title || DEFAULT_TITLE_COLOR);
+      setColourPublic(settings.color_avatar_public || DEFAULT_PUBLIC_COLOR);
+      setColourDm(settings.color_avatar_dm || DEFAULT_DM_COLOR);
     }).catch(() => {});
   }, []);
 
-  const notifySidebarRefresh = () => {
-    window.dispatchEvent(new Event('jama:settings-changed'));
-  };
+  const notifySidebarRefresh = () => window.dispatchEvent(new Event('jama:settings-changed'));
 
   const handleSaveName = async () => {
     if (!appName.trim()) return;
@@ -76,26 +154,26 @@ export default function BrandingModal({ onClose }) {
     }
   };
 
-  const handleSaveColors = async () => {
-    setSavingColors(true);
+  const handleSaveColours = async () => {
+    setSavingColours(true);
     try {
       await api.updateColors({
-        colorTitle,
-        colorAvatarPublic: colorPublic,
-        colorAvatarDm: colorDm,
+        colorTitle: colourTitle,
+        colorAvatarPublic: colourPublic,
+        colorAvatarDm: colourDm,
       });
       setSettings(prev => ({
         ...prev,
-        color_title: colorTitle,
-        color_avatar_public: colorPublic,
-        color_avatar_dm: colorDm,
+        color_title: colourTitle,
+        color_avatar_public: colourPublic,
+        color_avatar_dm: colourDm,
       }));
-      toast('Colors updated', 'success');
+      toast('Colours updated', 'success');
       notifySidebarRefresh();
     } catch (e) {
       toast(e.message, 'error');
     } finally {
-      setSavingColors(false);
+      setSavingColours(false);
     }
   };
 
@@ -106,9 +184,9 @@ export default function BrandingModal({ onClose }) {
       const { settings: fresh } = await api.getSettings();
       setSettings(fresh);
       setAppName(fresh.app_name || 'jama');
-      setColorTitle(DEFAULT_TITLE_COLOR);
-      setColorPublic(DEFAULT_PUBLIC_COLOR);
-      setColorDm(DEFAULT_DM_COLOR);
+      setColourTitle(DEFAULT_TITLE_COLOR);
+      setColourPublic(DEFAULT_PUBLIC_COLOR);
+      setColourDm(DEFAULT_DM_COLOR);
       toast('Settings reset to defaults', 'success');
       notifySidebarRefresh();
       setShowResetConfirm(false);
@@ -132,7 +210,7 @@ export default function BrandingModal({ onClose }) {
         {/* Tabs */}
         <div className="flex gap-2" style={{ marginBottom: 24 }}>
           <button className={`btn btn-sm ${tab === 'general' ? 'btn-primary' : 'btn-secondary'}`} onClick={() => setTab('general')}>General</button>
-          <button className={`btn btn-sm ${tab === 'colors' ? 'btn-primary' : 'btn-secondary'}`} onClick={() => setTab('colors')}>Colors</button>
+          <button className={`btn btn-sm ${tab === 'colours' ? 'btn-primary' : 'btn-secondary'}`} onClick={() => setTab('colours')}>Colours</button>
         </div>
 
         {tab === 'general' && (
@@ -146,11 +224,7 @@ export default function BrandingModal({ onClose }) {
                   border: '1px solid var(--border)', overflow: 'hidden', display: 'flex',
                   alignItems: 'center', justifyContent: 'center', flexShrink: 0
                 }}>
-                  <img
-                    src={settings.logo_url || '/icons/jama.png'}
-                    alt="logo"
-                    style={{ width: '100%', height: '100%', objectFit: 'contain' }}
-                  />
+                  <img src={settings.logo_url || '/icons/jama.png'} alt="logo" style={{ width: '100%', height: '100%', objectFit: 'contain' }} />
                 </div>
                 <div>
                   <label className="btn btn-secondary btn-sm" style={{ cursor: 'pointer', display: 'inline-block' }}>
@@ -169,25 +243,18 @@ export default function BrandingModal({ onClose }) {
               <div className="settings-section-label">App Name</div>
               <div style={{ display: 'flex', gap: 8 }}>
                 <input className="input flex-1" value={appName} onChange={e => setAppName(e.target.value)} onKeyDown={e => e.key === 'Enter' && handleSaveName()} />
-                <button className="btn btn-primary btn-sm" onClick={handleSaveName} disabled={loading}>
-                  {loading ? '...' : 'Save'}
-                </button>
+                <button className="btn btn-primary btn-sm" onClick={handleSaveName} disabled={loading}>{loading ? '...' : 'Save'}</button>
               </div>
             </div>
 
-            {/* Reset + Version */}
+            {/* Reset */}
             <div style={{ marginBottom: settings.pw_reset_active === 'true' ? 16 : 0 }}>
               <div className="settings-section-label">Reset</div>
               <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12 }}>
                 {!showResetConfirm ? (
-                  <button className="btn btn-secondary btn-sm" onClick={() => setShowResetConfirm(true)}>
-                    Reset All to Defaults
-                  </button>
+                  <button className="btn btn-secondary btn-sm" onClick={() => setShowResetConfirm(true)}>Reset All to Defaults</button>
                 ) : (
-                  <div style={{
-                    background: '#fce8e6', border: '1px solid #f5c6c2',
-                    borderRadius: 'var(--radius)', padding: '12px 14px'
-                  }}>
+                  <div style={{ background: '#fce8e6', border: '1px solid #f5c6c2', borderRadius: 'var(--radius)', padding: '12px 14px' }}>
                     <p style={{ fontSize: 13, color: 'var(--error)', marginBottom: 12 }}>
                       This will reset the app name, logo and all colours to their install defaults. This cannot be undone.
                     </p>
@@ -200,9 +267,7 @@ export default function BrandingModal({ onClose }) {
                   </div>
                 )}
                 {settings.app_version && (
-                  <span style={{ fontSize: 11, color: 'var(--text-tertiary)', whiteSpace: 'nowrap' }}>
-                    v{settings.app_version}
-                  </span>
+                  <span style={{ fontSize: 11, color: 'var(--text-tertiary)', whiteSpace: 'nowrap' }}>v{settings.app_version}</span>
                 )}
               </div>
             </div>
@@ -216,74 +281,50 @@ export default function BrandingModal({ onClose }) {
           </>
         )}
 
-        {tab === 'colors' && (
+        {tab === 'colours' && (
           <div className="flex-col gap-3">
-            {/* App Title Color */}
-            <div>
-              <div className="settings-section-label">App Title Color</div>
-              <p style={{ fontSize: 12, color: 'var(--text-tertiary)', marginBottom: 10 }}>
-                The color of the app name shown in the top bar.
-              </p>
-              <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
-                <input
-                  type="color"
-                  value={colorTitle}
-                  onChange={e => setColorTitle(e.target.value)}
-                  style={{ width: 48, height: 40, padding: 2, borderRadius: 8, border: '1px solid var(--border)', cursor: 'pointer', background: 'none' }}
-                />
-                <ColorSwatch color={colorTitle} title="Title color preview" />
-                <span style={{ fontSize: 13, color: 'var(--text-secondary)', fontFamily: 'monospace' }}>{colorTitle}</span>
-                <button className="btn btn-secondary btn-sm" style={{ marginLeft: 'auto' }} onClick={() => setColorTitle(DEFAULT_TITLE_COLOR)}>Reset</button>
-              </div>
+            <ColourPicker
+              label="App Title Colour"
+              description="The colour of the app name shown in the top bar."
+              value={colourTitle}
+              onChange={setColourTitle}
+            />
+
+            <div style={{ borderTop: '1px solid var(--border)', paddingTop: 20 }}>
+              <ColourPicker
+                label="Public Message Avatar Colour"
+                description="Background colour for public channel icons (users without a custom avatar)."
+                value={colourPublic}
+                onChange={setColourPublic}
+                preview={(val) => (
+                  <div style={{
+                    width: 36, height: 36, borderRadius: '50%', background: val,
+                    display: 'flex', alignItems: 'center', justifyContent: 'center',
+                    color: 'white', fontWeight: 700, fontSize: 15, flexShrink: 0,
+                  }}>A</div>
+                )}
+              />
             </div>
 
             <div style={{ borderTop: '1px solid var(--border)', paddingTop: 20 }}>
-              <div className="settings-section-label">Public Message Avatar Color</div>
-              <p style={{ fontSize: 12, color: 'var(--text-tertiary)', marginBottom: 10 }}>
-                Background color for public channel avatars (users without a custom avatar).
-              </p>
-              <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
-                <input
-                  type="color"
-                  value={colorPublic}
-                  onChange={e => setColorPublic(e.target.value)}
-                  style={{ width: 48, height: 40, padding: 2, borderRadius: 8, border: '1px solid var(--border)', cursor: 'pointer', background: 'none' }}
-                />
-                <div style={{
-                  width: 36, height: 36, borderRadius: '50%', background: colorPublic,
-                  display: 'flex', alignItems: 'center', justifyContent: 'center',
-                  color: 'white', fontWeight: 700, fontSize: 15, flexShrink: 0,
-                }}>A</div>
-                <span style={{ fontSize: 13, color: 'var(--text-secondary)', fontFamily: 'monospace' }}>{colorPublic}</span>
-                <button className="btn btn-secondary btn-sm" style={{ marginLeft: 'auto' }} onClick={() => setColorPublic(DEFAULT_PUBLIC_COLOR)}>Reset</button>
-              </div>
+              <ColourPicker
+                label="Direct Message Avatar Colour"
+                description="Background colour for private group and direct message icons (users without a custom avatar)."
+                value={colourDm}
+                onChange={setColourDm}
+                preview={(val) => (
+                  <div style={{
+                    width: 36, height: 36, borderRadius: '50%', background: val,
+                    display: 'flex', alignItems: 'center', justifyContent: 'center',
+                    color: 'white', fontWeight: 700, fontSize: 15, flexShrink: 0,
+                  }}>B</div>
+                )}
+              />
             </div>
 
             <div style={{ borderTop: '1px solid var(--border)', paddingTop: 20 }}>
-              <div className="settings-section-label">Direct Message Avatar Color</div>
-              <p style={{ fontSize: 12, color: 'var(--text-tertiary)', marginBottom: 10 }}>
-                Background color for private group and direct message avatars (users without a custom avatar).
-              </p>
-              <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
-                <input
-                  type="color"
-                  value={colorDm}
-                  onChange={e => setColorDm(e.target.value)}
-                  style={{ width: 48, height: 40, padding: 2, borderRadius: 8, border: '1px solid var(--border)', cursor: 'pointer', background: 'none' }}
-                />
-                <div style={{
-                  width: 36, height: 36, borderRadius: '50%', background: colorDm,
-                  display: 'flex', alignItems: 'center', justifyContent: 'center',
-                  color: 'white', fontWeight: 700, fontSize: 15, flexShrink: 0,
-                }}>B</div>
-                <span style={{ fontSize: 13, color: 'var(--text-secondary)', fontFamily: 'monospace' }}>{colorDm}</span>
-                <button className="btn btn-secondary btn-sm" style={{ marginLeft: 'auto' }} onClick={() => setColorDm(DEFAULT_DM_COLOR)}>Reset</button>
-              </div>
-            </div>
-
-            <div style={{ borderTop: '1px solid var(--border)', paddingTop: 20 }}>
-              <button className="btn btn-primary" onClick={handleSaveColors} disabled={savingColors}>
-                {savingColors ? 'Saving...' : 'Save Colors'}
+              <button className="btn btn-primary" onClick={handleSaveColours} disabled={savingColours}>
+                {savingColours ? 'Saving...' : 'Save Colours'}
               </button>
             </div>
           </div>