diff --git a/src/components/PagePopup.vue b/src/components/PagePopup.vue
index 579016a..2e4247e 100644
--- a/src/components/PagePopup.vue
+++ b/src/components/PagePopup.vue
@@ -5,16 +5,175 @@
     :style="{ top: position.y + 'px', left: position.x + 'px' }"
   >
     <div class="popup-header">
-      <span>{{ pageSelector }}</span>
+      <div class="header-left">
+        <span class="page-label">@page</span>
+        <span class="page-name">geoformat</span>
+        <span class="page-count">6 pages</span>
+      </div>
       <button class="close-btn" @click="close">×</button>
     </div>
+
     <div class="popup-body">
+      <!-- Left: Controls -->
       <div class="popup-controls">
-        <p class="info">Gabarit de page</p>
-        <!-- Additional page-specific controls will be added here later -->
+        <!-- Margins -->
+        <div class="control-section">
+          <h4>Marges</h4>
+          <div class="margin-grid">
+            <div class="margin-field">
+              <label>Haut</label>
+              <div class="input-with-unit">
+                <input
+                  type="number"
+                  v-model.number="margins.top.value"
+                  min="0"
+                />
+                <div class="unit-toggle">
+                  <button
+                    type="button"
+                    :class="{ active: margins.top.unit === 'mm' }"
+                    @click="margins.top.unit = 'mm'"
+                  >
+                    mm
+                  </button>
+                  <button
+                    type="button"
+                    :class="{ active: margins.top.unit === 'px' }"
+                    @click="margins.top.unit = 'px'"
+                  >
+                    px
+                  </button>
+                </div>
+              </div>
+            </div>
+
+            <div class="margin-field">
+              <label>Bas</label>
+              <div class="input-with-unit">
+                <input
+                  type="number"
+                  v-model.number="margins.bottom.value"
+                  min="0"
+                />
+                <div class="unit-toggle">
+                  <button
+                    type="button"
+                    :class="{ active: margins.bottom.unit === 'mm' }"
+                    @click="margins.bottom.unit = 'mm'"
+                  >
+                    mm
+                  </button>
+                  <button
+                    type="button"
+                    :class="{ active: margins.bottom.unit === 'px' }"
+                    @click="margins.bottom.unit = 'px'"
+                  >
+                    px
+                  </button>
+                </div>
+              </div>
+            </div>
+
+            <div class="margin-field">
+              <label>Gauche</label>
+              <div class="input-with-unit">
+                <input
+                  type="number"
+                  v-model.number="margins.left.value"
+                  min="0"
+                />
+                <div class="unit-toggle">
+                  <button
+                    type="button"
+                    :class="{ active: margins.left.unit === 'mm' }"
+                    @click="margins.left.unit = 'mm'"
+                  >
+                    mm
+                  </button>
+                  <button
+                    type="button"
+                    :class="{ active: margins.left.unit === 'px' }"
+                    @click="margins.left.unit = 'px'"
+                  >
+                    px
+                  </button>
+                </div>
+              </div>
+            </div>
+
+            <div class="margin-field">
+              <label>Droite</label>
+              <div class="input-with-unit">
+                <input
+                  type="number"
+                  v-model.number="margins.right.value"
+                  min="0"
+                />
+                <div class="unit-toggle">
+                  <button
+                    type="button"
+                    :class="{ active: margins.right.unit === 'mm' }"
+                    @click="margins.right.unit = 'mm'"
+                  >
+                    mm
+                  </button>
+                  <button
+                    type="button"
+                    :class="{ active: margins.right.unit === 'px' }"
+                    @click="margins.right.unit = 'px'"
+                  >
+                    px
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Background -->
+        <div class="control-section">
+          <label>Arrière-plan</label>
+          <div class="input-with-color">
+            <input
+              type="text"
+              v-model="background"
+              data-coloris
+            />
+          </div>
+        </div>
+
+        <!-- Patterns -->
+        <div class="control-section">
+          <label>Motifs</label>
+          <select v-model="pattern">
+            <option value="">Choisissez</option>
+            <option value="dots">Points</option>
+            <option value="lines">Lignes</option>
+            <option value="grid">Grille</option>
+          </select>
+        </div>
+
+        <!-- Unlock Inheritance Button -->
+        <div class="control-section">
+          <button class="unlock-btn" @click="toggleInheritance">
+            Déverrouiller l'héritage
+          </button>
+        </div>
       </div>
+
+      <!-- Right: CSS Editor -->
       <div class="popup-css">
+        <div class="css-header">
+          <span>CSS</span>
+          <label class="toggle">
+            <span class="toggle-label">Mode édition</span>
+            <input type="checkbox" v-model="isEditable" />
+            <span class="toggle-switch"></span>
+          </label>
+        </div>
+        <pre v-if="!isEditable" class="readonly"><code>{{ pageCss }}</code></pre>
         <textarea
+          v-else
           :value="pageCss"
           @input="handleCssInput"
           spellcheck="false"
@@ -25,8 +184,9 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import { useStylesheetStore } from '../stores/stylesheet';
+import Coloris from '@melloware/coloris';
 
 const stylesheetStore = useStylesheetStore();
 
@@ -36,8 +196,19 @@ const props = defineProps({
 
 const visible = ref(false);
 const position = ref({ x: 0, y: 0 });
-const pageSelector = ref('@page');
 const selectedPageElement = ref(null);
+const isEditable = ref(false);
+const inheritanceUnlocked = ref(false);
+
+const margins = ref({
+  top: { value: 6, unit: 'mm' },
+  bottom: { value: 7, unit: 'mm' },
+  left: { value: 6, unit: 'mm' },
+  right: { value: 7, unit: 'mm' },
+});
+
+const background = ref('transparent');
+const pattern = ref('');
 
 const calculatePosition = (pageElement) => {
   const rect = pageElement.getBoundingClientRect();
@@ -50,13 +221,23 @@ const calculatePosition = (pageElement) => {
 
 const open = (pageElement) => {
   selectedPageElement.value = pageElement;
-  pageSelector.value = '@page';
   position.value = calculatePosition(pageElement);
 
   // Add border to the selected page
   pageElement.style.outline = '2px solid #61afef';
 
   visible.value = true;
+
+  // Initialize Coloris after opening
+  setTimeout(() => {
+    Coloris.init();
+    Coloris({
+      themeMode: 'light',
+      alpha: true,
+      format: 'auto',
+      formatToggle: true,
+    });
+  }, 0);
 };
 
 const close = () => {
@@ -66,6 +247,12 @@ const close = () => {
     selectedPageElement.value = null;
   }
   visible.value = false;
+  isEditable.value = false;
+};
+
+const toggleInheritance = () => {
+  inheritanceUnlocked.value = !inheritanceUnlocked.value;
+  // TODO: Implement inheritance unlock logic
 };
 
 const pageCss = computed(() => {
@@ -89,6 +276,20 @@ const handleCssInput = (event) => {
   }, 500);
 };
 
+// Watch for margin changes
+watch(
+  margins,
+  (newMargins) => {
+    // TODO: Update @page margins in stylesheet
+  },
+  { deep: true }
+);
+
+// Watch for background changes
+watch(background, (newBackground) => {
+  // TODO: Update @page background in stylesheet
+});
+
 defineExpose({ open, close, visible });
 </script>
 
@@ -96,68 +297,265 @@ defineExpose({ open, close, visible });
 #page-popup {
   position: fixed;
   background: white;
-  border-radius: 4px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  border-radius: 8px;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.2);
   z-index: 10000;
-  min-width: 400px;
-  max-width: 500px;
+  width: 800px;
+  max-height: 600px;
+  display: flex;
+  flex-direction: column;
 }
 
 .popup-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 0.5rem 0.75rem;
-  border-bottom: 1px solid #eee;
+  padding: 0.75rem 1rem;
+  border-bottom: 1px solid #e0e0e0;
+  background: #f9f9f9;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.page-label {
+  background: #ff8a50;
+  color: white;
+  padding: 0.25rem 0.5rem;
+  border-radius: 4px;
+  font-size: 0.875rem;
+  font-weight: 600;
+}
+
+.page-name {
+  font-weight: 600;
+  font-size: 0.875rem;
+}
+
+.page-count {
+  color: #ff8a50;
   font-size: 0.875rem;
-  font-weight: bold;
-  background: #f5f5f5;
 }
 
 .close-btn {
   background: none;
   border: none;
   cursor: pointer;
-  font-size: 1.25rem;
+  font-size: 1.5rem;
   line-height: 1;
   padding: 0;
+  color: #666;
 }
 
 .popup-body {
   display: flex;
-  gap: 1px;
-  background: #eee;
+  flex: 1;
+  overflow: hidden;
 }
 
 .popup-controls {
   flex: 1;
-  padding: 0.75rem;
+  padding: 1rem;
+  overflow-y: auto;
   background: white;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.control-section h4 {
+  margin: 0 0 0.5rem 0;
+  font-size: 0.875rem;
+  font-weight: 600;
+}
+
+.control-section label {
+  display: block;
+  font-size: 0.75rem;
+  margin-bottom: 0.25rem;
+  color: #666;
+}
+
+.control-section select {
+  width: 100%;
+  padding: 0.5rem;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  font-size: 0.875rem;
+}
+
+.margin-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 0.75rem;
+}
+
+.margin-field label {
+  display: block;
+  font-size: 0.75rem;
+  margin-bottom: 0.25rem;
+  color: #666;
+}
+
+.input-with-unit {
+  display: flex;
+  gap: 0.25rem;
+  align-items: center;
+}
+
+.input-with-unit input[type='number'] {
+  flex: 1;
+  padding: 0.375rem;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  font-size: 0.875rem;
+}
+
+.input-with-color {
+  width: 100%;
+}
+
+.input-with-color input {
+  width: 100%;
+  padding: 0.5rem;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  font-size: 0.875rem;
+}
+
+.unit-toggle {
+  display: flex;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.unit-toggle button {
+  padding: 0.375rem 0.5rem;
+  border: none;
+  background: white;
+  cursor: pointer;
+  font-size: 0.75rem;
+  transition: background 0.2s;
+}
+
+.unit-toggle button:not(:last-child) {
+  border-right: 1px solid #ddd;
+}
+
+.unit-toggle button.active {
+  background: #007bff;
+  color: white;
+}
+
+.unlock-btn {
+  width: 100%;
+  padding: 0.5rem;
+  background: transparent;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 0.875rem;
+  transition: background 0.2s;
+}
+
+.unlock-btn:hover {
+  background: #f5f5f5;
 }
 
 .popup-css {
   flex: 1;
-  background: #1e1e1e;
+  background: #f5f5f5;
   display: flex;
+  flex-direction: column;
+  border-left: 1px solid #e0e0e0;
+}
+
+.css-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0.5rem 0.75rem;
+  background: #e8e8e8;
+  border-bottom: 1px solid #d0d0d0;
+  font-size: 0.875rem;
+  font-weight: 600;
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  cursor: pointer;
+  font-size: 0.75rem;
+  font-weight: normal;
+  color: #666;
+}
+
+.toggle input[type='checkbox'] {
+  position: absolute;
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.toggle-switch {
+  position: relative;
+  display: inline-block;
+  width: 36px;
+  height: 18px;
+  background: #ccc;
+  border-radius: 18px;
+  transition: background 0.2s ease;
+}
+
+.toggle-switch::after {
+  content: '';
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  width: 14px;
+  height: 14px;
+  background: white;
+  border-radius: 50%;
+  transition: transform 0.2s ease;
+}
+
+.toggle input[type='checkbox']:checked + .toggle-switch {
+  background: #61afef;
+}
+
+.toggle input[type='checkbox']:checked + .toggle-switch::after {
+  transform: translateX(18px);
+}
+
+.readonly {
+  flex: 1;
+  margin: 0;
+  padding: 0.75rem;
+  background: #1e1e1e;
+  color: #abb2bf;
+  font-family: 'Courier New', Courier, monospace;
+  font-size: 0.75rem;
+  line-height: 1.5;
+  overflow-y: auto;
+  white-space: pre-wrap;
 }
 
 .popup-css textarea {
+  flex: 1;
   width: 100%;
-  height: 200px;
   background: #1e1e1e;
   color: #abb2bf;
   border: none;
   padding: 0.75rem;
   font-family: 'Courier New', Courier, monospace;
   font-size: 0.75rem;
-  line-height: 1.4;
+  line-height: 1.5;
   resize: none;
   outline: none;
 }
-
-.info {
-  font-size: 0.875rem;
-  color: #666;
-  margin: 0 0 0.5rem 0;
-}
 </style>