diff --git a/src/components/ElementPopup.vue b/src/components/ElementPopup.vue
index 4400a03..a23f2e1 100644
--- a/src/components/ElementPopup.vue
+++ b/src/components/ElementPopup.vue
@@ -6,9 +6,9 @@
     :editable-css="elementCss"
     :popup-width="800"
     :popup-height="600"
+    :show-inheritance="false"
     @close="close"
     @css-input="handleCssInput"
-    @toggle-inheritance="toggleInheritance"
   >
     <template #header-left>
       <span class="element-label">{{ selector || '' }}</span>
@@ -18,18 +18,18 @@
     <template #controls>
       <!-- Font Family -->
       <div class="settings-subsection">
-        <div class="field field-font" :class="{ 'field--view-only': inheritanceLocked }">
+        <div class="field field-font" >
           <label class="label-with-tooltip" data-css="font-family">Police</label>
           <div class="field-font__options">
-            <select v-model="fontFamily" :disabled="inheritanceLocked">
+            <select v-model="fontFamily" >
               <option v-for="f in fonts" :key="f" :value="f">{{ f }}</option>
             </select>
             <div class="field-checkbox">
-              <input type="checkbox" v-model="italic" :disabled="inheritanceLocked" />
+              <input type="checkbox" v-model="italic"  />
               <label class="label-with-tooltip" data-css="font-style">Italique</label>
             </div>
             <div class="field-checkbox">
-              <input type="checkbox" v-model="bold" :disabled="inheritanceLocked" />
+              <input type="checkbox" v-model="bold"  />
               <label class="label-with-tooltip" data-css="font-weight">Gras</label>
             </div>
           </div>
@@ -38,61 +38,39 @@
 
       <!-- Font Size -->
       <div class="settings-subsection">
-        <div class="field" :class="{ 'field--view-only': inheritanceLocked }">
+        <div class="field field-text-size" >
           <label class="label-with-tooltip" data-css="font-size">Taille du texte</label>
-          <div class="input-with-unit">
-            <NumberInput
-              v-model="fontSize.value"
-              :min="6"
-              :step="1"
-              :disabled="inheritanceLocked"
-            />
-            <div class="unit-toggle">
-              <button
-                type="button"
-                :class="{ active: fontSize.unit === 'px' }"
-                :disabled="inheritanceLocked"
-                @click="updateUnitPropUnit(fontSize, 'px')"
-              >
-                px
-              </button>
-            </div>
-          </div>
+          <InputWithUnit
+            v-model="fontSizeModel"
+            :units="['px']"
+            :min="6"
+            :max="72"
+            showRange
+          />
         </div>
       </div>
 
 
       <!-- LineHeight -->
       <div class="settings-subsection">
-        <div class="field" :class="{ 'field--view-only': inheritanceLocked }">
+        <div class="field field-text-size" >
           <label class="label-with-tooltip" data-css="line-height">Interlignage</label>
-          <div class="input-with-unit">
-            <NumberInput
-              v-model="lineHeight.value"
-              :min="0"
-              :step="1"
-              :disabled="inheritanceLocked"
-            />
-            <div class="unit-toggle">
-              <button
-                type="button"
-                :class="{ active: lineHeight.unit === 'px' }"
-                :disabled="inheritanceLocked"
-                @click="updateUnitPropUnit(lineHeight, 'px')"
-              >
-                px
-              </button>
-            </div>
-          </div>
+          <InputWithUnit
+            v-model="lineHeightModel"
+            :units="['px']"
+            :min="0"
+            :max="72"
+            showRange
+          />
         </div>
       </div>
 
 
       <!-- Text Alignment -->
       <div class="settings-subsection">
-        <div class="field" :class="{ 'field--view-only': inheritanceLocked }">
+        <div class="field" >
           <label class="label-with-tooltip" data-css="text-align">Alignement</label>
-          <select v-model="textAlign" :disabled="inheritanceLocked">
+          <select v-model="textAlign" >
             <option value="left">Gauche</option>
             <option value="center">Centre</option>
             <option value="right">Droite</option>
@@ -103,7 +81,7 @@
 
       <!-- Bordure -->
       <div class="settings-subsection">
-        <div class="field field-border" :class="{ 'field--view-only': inheritanceLocked }">
+        <div class="field field-border" >
           <div class="settings-subsection-header">
           <label class="label-with-tooltip" data-css="border">Bordure</label>
           </div>
@@ -115,16 +93,15 @@
                   v-model="borderWidth.value"
                   :min="0"
                   :step="1"
-                  :disabled="inheritanceLocked"
-                />
+                                 />
                 <div class="unit-toggle">
-                  <button type="button" class="active" :disabled="inheritanceLocked">px</button>
+                  <button type="button" class="active" >px</button>
                 </div>
               </div>
             </div>
             <div class="field-border__option">
               <label class="label-with-tooltip" data-css="border-style">Style</label>
-              <select v-model="borderStyle" :disabled="inheritanceLocked">
+              <select v-model="borderStyle" >
                 <option value="solid">Plein</option>
                 <option value="dotted">Pointillés</option>
                 <option value="dashed">Tirets</option>
@@ -138,8 +115,7 @@
                   ref="borderColorInput"
                   type="text"
                   v-model="borderColor"
-                  :disabled="inheritanceLocked"
-                  data-coloris
+                                   data-coloris
                 />
               </div>
             </div>
@@ -149,15 +125,14 @@
 
       <!-- Color -->
       <div class="settings-subsection">
-        <div class="field field-simple" :class="{ 'field--view-only': inheritanceLocked }">
+        <div class="field field-simple" >
           <label class="label-with-tooltip" data-css="color">Couleur du texte</label>
           <div class="input-with-color">
             <input
               ref="colorInput"
               type="text"
               v-model="color"
-              :disabled="inheritanceLocked"
-              data-coloris
+                           data-coloris
             />
           </div>
         </div>
@@ -165,15 +140,14 @@
 
       <!-- Background -->
       <div class="settings-subsection">
-        <div class="field field-simple" :class="{ 'field--view-only': inheritanceLocked }">
+        <div class="field field-simple" >
           <label class="label-with-tooltip" data-css="background">Arrière-plan</label>
           <div class="input-with-color">
             <input
               ref="backgroundInput"
               type="text"
               v-model="background"
-              :disabled="inheritanceLocked"
-              data-coloris
+                           data-coloris
             />
           </div>
         </div>
@@ -187,8 +161,7 @@
             type="button"
             class="lock-toggle"
             :class="{ locked: marginLocked }"
-            :disabled="inheritanceLocked"
-            @click="marginLocked = !marginLocked"
+                       @click="marginLocked = !marginLocked"
             :title="marginLocked ? 'Déverrouiller (modifier indépendamment)' : 'Verrouiller (modifier ensemble)'"
           >
             <svg v-if="marginLocked" width="11" height="13" viewBox="0 0 11 13" fill="none">
@@ -205,29 +178,25 @@
           v-for="side in sides"
           :key="side.key"
           class="field field-margin"
-          :class="{ 'field--view-only': inheritanceLocked }"
-        >
+                 >
           <label class="label-with-tooltip" :data-css="`margin-${side.key}`">{{ side.label }}</label>
           <div class="input-with-unit">
             <NumberInput
               :modelValue="margin[side.key].value"
               :min="0"
               :step="1"
-              :disabled="inheritanceLocked"
-              @update:modelValue="(v) => updateMarginValue(side.key, v)"
+                           @update:modelValue="(v) => updateMarginValue(side.key, v)"
             />
             <div class="unit-toggle">
               <button
                 type="button"
                 :class="{ active: margin[side.key].unit === 'mm' }"
-                :disabled="inheritanceLocked"
-                @click="updateMarginUnit(side.key, 'mm')"
+                               @click="updateMarginUnit(side.key, 'mm')"
               >mm</button>
               <button
                 type="button"
                 :class="{ active: margin[side.key].unit === 'px' }"
-                :disabled="inheritanceLocked"
-                @click="updateMarginUnit(side.key, 'px')"
+                               @click="updateMarginUnit(side.key, 'px')"
               >px</button>
             </div>
           </div>
@@ -242,8 +211,7 @@
             type="button"
             class="lock-toggle"
             :class="{ locked: paddingLocked }"
-            :disabled="inheritanceLocked"
-            @click="paddingLocked = !paddingLocked"
+                       @click="paddingLocked = !paddingLocked"
             :title="paddingLocked ? 'Déverrouiller (modifier indépendamment)' : 'Verrouiller (modifier ensemble)'"
           >
             <svg v-if="paddingLocked" width="11" height="13" viewBox="0 0 11 13" fill="none">
@@ -260,29 +228,25 @@
           v-for="side in sides"
           :key="side.key"
           class="field field-margin"
-          :class="{ 'field--view-only': inheritanceLocked }"
-        >
+                 >
           <label class="label-with-tooltip" :data-css="`padding-${side.key}`">{{ side.label }}</label>
           <div class="input-with-unit">
             <NumberInput
               :modelValue="padding[side.key].value"
               :min="0"
               :step="1"
-              :disabled="inheritanceLocked"
-              @update:modelValue="(v) => updatePaddingValue(side.key, v)"
+                           @update:modelValue="(v) => updatePaddingValue(side.key, v)"
             />
             <div class="unit-toggle">
               <button
                 type="button"
                 :class="{ active: padding[side.key].unit === 'mm' }"
-                :disabled="inheritanceLocked"
-                @click="updatePaddingUnit(side.key, 'mm')"
+                               @click="updatePaddingUnit(side.key, 'mm')"
               >mm</button>
               <button
                 type="button"
                 :class="{ active: padding[side.key].unit === 'px' }"
-                :disabled="inheritanceLocked"
-                @click="updatePaddingUnit(side.key, 'px')"
+                               @click="updatePaddingUnit(side.key, 'px')"
               >px</button>
             </div>
           </div>
@@ -297,6 +261,7 @@ import { ref, reactive, computed, watch, nextTick } from 'vue';
 import { useStylesheetStore } from '../stores/stylesheet';
 import { useDebounce } from '../composables/useDebounce';
 import NumberInput from './ui/NumberInput.vue';
+import InputWithUnit from './ui/InputWithUnit.vue';
 import BasePopup from './ui/BasePopup.vue';
 import { convertUnit } from '../utils/unit-conversion';
 
@@ -311,7 +276,6 @@ const emit = defineEmits(['close']);
 const basePopup = ref(null);
 
 const visible = computed(() => basePopup.value?.visible ?? false);
-const inheritanceLocked = computed(() => basePopup.value?.inheritanceLocked ?? true);
 
 const selector = ref('');
 const selectedElement = ref(null);
@@ -331,7 +295,15 @@ const textAlign = ref('left');
 const color = ref('rgb(0, 0, 0)');
 const background = ref('transparent');
 const fontSize = reactive({ value: 23, unit: 'px' });
+const fontSizeModel = computed({
+  get: () => ({ value: fontSize.value, unit: fontSize.unit }),
+  set: (v) => { fontSize.value = v.value; fontSize.unit = v.unit; },
+});
 const lineHeight = reactive({ value: 28, unit: 'px' });
+const lineHeightModel = computed({
+  get: () => ({ value: lineHeight.value, unit: lineHeight.unit }),
+  set: (v) => { lineHeight.value = v.value; lineHeight.unit = v.unit; },
+});
 const borderWidth = reactive({ value: 0, unit: 'px' });
 const borderStyle = ref('solid');
 const borderColor = ref('#000000');
@@ -501,17 +473,7 @@ const generatePreviewCss = () => {
 
 const displayedCss = computed(() => {
   if (!selector.value) return '';
-
-  if (!inheritanceLocked.value) {
-    return elementCss.value || generatePreviewCss();
-  }
-
-  const preview = generatePreviewCss();
-  if (!preview) return '';
-
-  return '/* Héritage verrouillé - déverrouiller pour appliquer */\n/* ' +
-         preview.split('\n').join('\n   ') +
-         ' */';
+  return elementCss.value || generatePreviewCss();
 });
 
 const applyAllStyles = () => {
@@ -700,9 +662,6 @@ const open = (element, event, count = null) => {
 
   elementInstanceCount.value = count !== null ? count : getInstanceCount(selector.value);
 
-  const blockState = stylesheetStore.getBlockState(selector.value);
-  basePopup.value.inheritanceLocked = blockState !== 'active';
-
   loadValuesFromStylesheet();
   basePopup.value.open(event);
 
@@ -732,71 +691,6 @@ const handleIframeClick = (event, targetElement = null, elementCount = null) =>
   open(element, event, elementCount);
 };
 
-const toggleInheritance = () => {
-  const blockState = stylesheetStore.getBlockState(selector.value);
-
-  if (basePopup.value.inheritanceLocked && blockState === 'commented') {
-    stylesheetStore.uncommentCssBlock(selector.value);
-    basePopup.value.inheritanceLocked = false;
-  } else if (basePopup.value.inheritanceLocked && blockState === 'none') {
-    if (selectedElement.value && props.iframeRef && props.iframeRef.contentWindow) {
-      const cs = props.iframeRef.contentWindow.getComputedStyle(selectedElement.value);
-
-      isUpdatingFromStore = true;
-
-      fontFamily.value = cs.fontFamily.replace(/['"]/g, '').split(',')[0].trim();
-      italic.value = cs.fontStyle === 'italic';
-      bold.value = parseInt(cs.fontWeight) >= 700;
-
-      const fontSizeMatch = cs.fontSize.match(/([\d.]+)(px|rem|em|pt)/);
-      if (fontSizeMatch) {
-        fontSize.value = parseFloat(fontSizeMatch[1]);
-        fontSize.unit = fontSizeMatch[2];
-      }
-
-      const lineHeightMatch = cs.lineHeight.match(/([\d.]+)(px|rem|em|pt)/);
-      if (lineHeightMatch) {
-        lineHeight.value = parseFloat(lineHeightMatch[1]);
-        lineHeight.unit = lineHeightMatch[2];
-      }
-
-      textAlign.value = cs.textAlign;
-      color.value = cs.color;
-      background.value = cs.backgroundColor;
-
-      const borderWidthMatch = cs.borderTopWidth.match(/([\d.]+)(px)/);
-      if (borderWidthMatch) {
-        borderWidth.value = parseFloat(borderWidthMatch[1]);
-        borderWidth.unit = 'px';
-      }
-      borderStyle.value = cs.borderTopStyle || 'solid';
-      borderColor.value = cs.borderTopColor || '#000000';
-
-      for (const side of ['top', 'right', 'bottom', 'left']) {
-        const cssSide = side.charAt(0).toUpperCase() + side.slice(1);
-        const marginMatch = cs[`margin${cssSide}`].match(/([\d.]+)(px|mm|pt)/);
-        if (marginMatch) {
-          margin[side].value = parseFloat(marginMatch[1]);
-          margin[side].unit = marginMatch[2];
-        }
-        const paddingMatch = cs[`padding${cssSide}`].match(/([\d.]+)(px|mm|pt)/);
-        if (paddingMatch) {
-          padding[side].value = parseFloat(paddingMatch[1]);
-          padding[side].unit = paddingMatch[2];
-        }
-      }
-
-      isUpdatingFromStore = false;
-    }
-
-    applyAllStyles();
-    basePopup.value.inheritanceLocked = false;
-  } else if (!basePopup.value.inheritanceLocked && blockState === 'active') {
-    stylesheetStore.commentCssBlock(selector.value);
-    basePopup.value.inheritanceLocked = true;
-  }
-};
-
 defineExpose({ handleIframeClick, close, visible });
 </script>
 
diff --git a/src/components/editor/TextSettings.vue b/src/components/editor/TextSettings.vue
index e4a706f..72d0900 100644
--- a/src/components/editor/TextSettings.vue
+++ b/src/components/editor/TextSettings.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="settings-section" id="settings-section_elem" data-color-type="elem">
-    <h2>Réglage du texte</h2>
+    <h2>Réglage du texte par défaut</h2>
     <div class="container"> 
   
     <p class="infos">
@@ -20,18 +20,14 @@
             <input id="text-italic" type="checkbox" v-model="italic" />
             <label for="text-italic" class="label-with-tooltip" data-css="font-style">Italique</label>
           </div>
+          <div class="field-checkbox">
+            <input id="text-bold" type="checkbox" v-model="bold" />
+            <label for="text-bold" class="label-with-tooltip" data-css="font-weight">Gras</label>
+          </div>
         </div>
       </div>
     </div>
 
-    <!-- Graisse -->
-    <div class="settings-subsection">
-      <div class="field">
-        <label class="label-with-tooltip" data-css="font-weight">Graisse</label>
-        <UnitToggle v-model="weight" :units="weights" />
-      </div>
-    </div>
-
     <!-- Taille du texte -->
     <div class="settings-subsection">
       <div class="field field-text-size">
@@ -46,18 +42,6 @@
       </div>
     </div>
 
-    <!-- Alignement -->
-    <div class="settings-subsection">
-      <div class="field field-simple">
-        <label for="text-alignment" class="label-with-tooltip" data-css="text-align">Alignement</label>
-        <select id="text-alignment" v-model="alignment">
-          <option v-for="a in alignments" :key="a.value" :value="a.value">
-            {{ a.label }}
-          </option>
-        </select>
-      </div>
-    </div>
-
     <!-- Couleurs -->
     <div class="settings-subsection">
       <div class="field field-simple">
@@ -75,296 +59,6 @@
       </div>
     </div>
 
-      <!-- Couleurs // arrière plan -->
-    <div class="settings-subsection">
-      <div class="field field-simple">
-        <label for="text-background" class="label-with-tooltip" data-css="background">Arrière-plan</label>
-        <div class="input-with-color">
-          <input
-            ref="backgroundInput"
-            id="text-background"
-            type="text"
-            v-model="background"
-            class="color-input"
-            data-coloris
-          />
-        </div>
-      </div>
-    </div>
-
-    <!-- Marges extérieures -->
-    <div class="settings-subsection margins">
-      <div class="subsection-header">
-        <h3>Marges extérieures</h3>
-        <button
-          type="button"
-          class="link-button"
-          :class="{ active: marginOuterLinked }"
-          @click="marginOuterLinked = !marginOuterLinked"
-          :title="marginOuterLinked ? 'Dissocier les marges' : 'Lier les marges'"
-        >
-          <svg v-if="marginOuterLinked" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M18.3638 15.5355L16.9496 14.1213L18.3638 12.7071C20.3164 10.7545 20.3164 7.58866 18.3638 5.63604C16.4112 3.68341 13.2453 3.68341 11.2927 5.63604L9.87849 7.05025L8.46428 5.63604L9.87849 4.22182C12.6122 1.48815 17.0443 1.48815 19.778 4.22182C22.5117 6.95549 22.5117 11.3876 19.778 14.1213L18.3638 15.5355ZM15.5353 18.364L14.1211 19.7782C11.3875 22.5118 6.95531 22.5118 4.22164 19.7782C1.48797 17.0445 1.48797 12.6123 4.22164 9.87868L5.63585 8.46446L7.05007 9.87868L5.63585 11.2929C3.68323 13.2455 3.68323 16.4113 5.63585 18.364C7.58847 20.3166 10.7543 20.3166 12.7069 18.364L14.1211 16.9497L15.5353 18.364ZM14.8282 7.75736L16.2425 9.17157L9.17139 16.2426L7.75717 14.8284L14.8282 7.75736Z"></path></svg>
-          <svg v-else xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M17 17H22V19H19V22H17V17ZM7 7H2V5H5V2H7V7ZM18.364 15.5355L16.9497 14.1213L18.364 12.7071C20.3166 10.7545 20.3166 7.58866 18.364 5.63604C16.4113 3.68342 13.2455 3.68342 11.2929 5.63604L9.87868 7.05025L8.46447 5.63604L9.87868 4.22183C12.6123 1.48816 17.0445 1.48816 19.7782 4.22183C22.5118 6.9555 22.5118 11.3877 19.7782 14.1213L18.364 15.5355ZM15.5355 18.364L14.1213 19.7782C11.3877 22.5118 6.9555 22.5118 4.22183 19.7782C1.48816 17.0445 1.48816 12.6123 4.22183 9.87868L5.63604 8.46447L7.05025 9.87868L5.63604 11.2929C3.68342 13.2455 3.68342 16.4113 5.63604 18.364C7.58866 20.3166 10.7545 20.3166 12.7071 18.364L14.1213 16.9497L15.5355 18.364ZM14.8284 7.75736L16.2426 9.17157L9.17157 16.2426L7.75736 14.8284L14.8284 7.75736Z"></path></svg>
-        </button>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-outer-top" class="label-with-tooltip" data-css="margin-top">Haut</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-outer-top"
-            :modelValue="marginOuterDetailed.top.value"
-            @update:modelValue="(value) => marginOuterDetailed.top.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.top.unit === 'mm' }"
-              @click="updateMarginOuterUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.top.unit === 'px' }"
-              @click="updateMarginOuterUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginOuterDetailed.top.unit === 'rem' }"
-              @click="updateMarginOuterUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-outer-bottom" class="label-with-tooltip" data-css="margin-bottom">Bas</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-outer-bottom"
-            :modelValue="marginOuterDetailed.bottom.value"
-            @update:modelValue="(value) => marginOuterDetailed.bottom.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.bottom.unit === 'mm' }"
-              @click="updateMarginOuterUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.bottom.unit === 'px' }"
-              @click="updateMarginOuterUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginOuterDetailed.bottom.unit === 'rem' }"
-              @click="updateMarginOuterUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-outer-left" class="label-with-tooltip" data-css="margin-left">Gauche</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-outer-left"
-            :modelValue="marginOuterDetailed.left.value"
-            @update:modelValue="(value) => marginOuterDetailed.left.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.left.unit === 'mm' }"
-              @click="updateMarginOuterUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.left.unit === 'px' }"
-              @click="updateMarginOuterUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginOuterDetailed.left.unit === 'rem' }"
-              @click="updateMarginOuterUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-outer-right" class="label-with-tooltip" data-css="margin-right">Droite</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-outer-right"
-            :modelValue="marginOuterDetailed.right.value"
-            @update:modelValue="(value) => marginOuterDetailed.right.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.right.unit === 'mm' }"
-              @click="updateMarginOuterUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginOuterDetailed.right.unit === 'px' }"
-              @click="updateMarginOuterUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginOuterDetailed.right.unit === 'rem' }"
-              @click="updateMarginOuterUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- Marges intérieures -->
-    <div class="settings-subsection margins">
-      <div class="subsection-header">
-        <h3>Marges intérieures</h3>
-        <button
-          type="button"
-          class="link-button"
-          :class="{ active: marginInnerLinked }"
-          @click="marginInnerLinked = !marginInnerLinked"
-          :title="marginInnerLinked ? 'Dissocier les marges' : 'Lier les marges'"
-        >
-          <svg v-if="marginInnerLinked" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M18.3638 15.5355L16.9496 14.1213L18.3638 12.7071C20.3164 10.7545 20.3164 7.58866 18.3638 5.63604C16.4112 3.68341 13.2453 3.68341 11.2927 5.63604L9.87849 7.05025L8.46428 5.63604L9.87849 4.22182C12.6122 1.48815 17.0443 1.48815 19.778 4.22182C22.5117 6.95549 22.5117 11.3876 19.778 14.1213L18.3638 15.5355ZM15.5353 18.364L14.1211 19.7782C11.3875 22.5118 6.95531 22.5118 4.22164 19.7782C1.48797 17.0445 1.48797 12.6123 4.22164 9.87868L5.63585 8.46446L7.05007 9.87868L5.63585 11.2929C3.68323 13.2455 3.68323 16.4113 5.63585 18.364C7.58847 20.3166 10.7543 20.3166 12.7069 18.364L14.1211 16.9497L15.5353 18.364ZM14.8282 7.75736L16.2425 9.17157L9.17139 16.2426L7.75717 14.8284L14.8282 7.75736Z"></path></svg>
-          <svg v-else xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M17 17H22V19H19V22H17V17ZM7 7H2V5H5V2H7V7ZM18.364 15.5355L16.9497 14.1213L18.364 12.7071C20.3166 10.7545 20.3166 7.58866 18.364 5.63604C16.4113 3.68342 13.2455 3.68342 11.2929 5.63604L9.87868 7.05025L8.46447 5.63604L9.87868 4.22183C12.6123 1.48816 17.0445 1.48816 19.7782 4.22183C22.5118 6.9555 22.5118 11.3877 19.7782 14.1213L18.364 15.5355ZM15.5355 18.364L14.1213 19.7782C11.3877 22.5118 6.9555 22.5118 4.22183 19.7782C1.48816 17.0445 1.48816 12.6123 4.22183 9.87868L5.63604 8.46447L7.05025 9.87868L5.63604 11.2929C3.68342 13.2455 3.68342 16.4113 5.63604 18.364C7.58866 20.3166 10.7545 20.3166 12.7071 18.364L14.1213 16.9497L15.5355 18.364ZM14.8284 7.75736L16.2426 9.17157L9.17157 16.2426L7.75736 14.8284L14.8284 7.75736Z"></path></svg>
-        </button>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-inner-top" class="label-with-tooltip" data-css="padding-top">Haut</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-inner-top"
-            :modelValue="marginInnerDetailed.top.value"
-            @update:modelValue="(value) => marginInnerDetailed.top.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.top.unit === 'mm' }"
-              @click="updateMarginInnerUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.top.unit === 'px' }"
-              @click="updateMarginInnerUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginInnerDetailed.top.unit === 'rem' }"
-              @click="updateMarginInnerUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-inner-bottom" class="label-with-tooltip" data-css="padding-bottom">Bas</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-inner-bottom"
-            :modelValue="marginInnerDetailed.bottom.value"
-            @update:modelValue="(value) => marginInnerDetailed.bottom.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.bottom.unit === 'mm' }"
-              @click="updateMarginInnerUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.bottom.unit === 'px' }"
-              @click="updateMarginInnerUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginInnerDetailed.bottom.unit === 'rem' }"
-              @click="updateMarginInnerUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-inner-left" class="label-with-tooltip" data-css="padding-left">Gauche</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-inner-left"
-            :modelValue="marginInnerDetailed.left.value"
-            @update:modelValue="(value) => marginInnerDetailed.left.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.left.unit === 'mm' }"
-              @click="updateMarginInnerUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.left.unit === 'px' }"
-              @click="updateMarginInnerUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginInnerDetailed.left.unit === 'rem' }"
-              @click="updateMarginInnerUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-
-      <div class="field field-margin">
-        <label for="margin-inner-right" class="label-with-tooltip" data-css="padding-right">Droite</label>
-        <div class="input-with-unit">
-          <NumberInput
-            id="margin-inner-right"
-            :modelValue="marginInnerDetailed.right.value"
-            @update:modelValue="(value) => marginInnerDetailed.right.value = value"
-            :min="0"
-            :step="1"
-          />
-          <div class="unit-toggle">
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.right.unit === 'mm' }"
-              @click="updateMarginInnerUnit('mm')"
-            >mm</button>
-            <button
-              type="button"
-              :class="{ active: marginInnerDetailed.right.unit === 'px' }"
-              @click="updateMarginInnerUnit('px')"
-            >px</button>
-            <!-- <button
-              type="button"
-              :class="{ active: marginInnerDetailed.right.unit === 'rem' }"
-              @click="updateMarginInnerUnit('rem')"
-            >rem</button> -->
-          </div>
-        </div>
-      </div>
-    </div>
 
   </div>
   </section>
@@ -373,73 +67,28 @@
 <script setup>
 import { ref, watch, onMounted } from 'vue';
 import { initColoris } from '../../composables/useColoris';
-import UnitToggle from '../ui/UnitToggle.vue';
 import InputWithUnit from '../ui/InputWithUnit.vue';
-import NumberInput from '../ui/NumberInput.vue';
 import { useCssUpdater } from '../../composables/useCssUpdater';
 import { useCssSync } from '../../composables/useCssSync';
 import { useDebounce } from '../../composables/useDebounce';
-import { useLinkedSpacing } from '../../composables/useLinkedSpacing';
 
-const { updateStyle, setMargin, setDetailedMargins, setPadding, setDetailedPadding } = useCssUpdater();
-const { extractValue, extractNumericValue, extractSpacing } = useCssSync();
+const { updateStyle } = useCssUpdater();
+const { extractValue, extractNumericValue } = useCssSync();
 const { debouncedUpdate } = useDebounce(500);
 
 // Constants
 const fonts = ['Alegreya Sans', 'Arial', 'Georgia', 'Helvetica', 'Times New Roman'];
-const weights = ['200', '300', '400', '600', '800', 'normal', 'bold'];
-const alignments = [
-  { value: 'left', label: 'Gauche' },
-  { value: 'center', label: 'Centre' },
-  { value: 'right', label: 'Droite' },
-  { value: 'justify', label: 'Justifié' }
-];
 
 // State
 const font = ref('Alegreya Sans');
 const italic = ref(false);
-const weight = ref('400');
+const bold = ref(false);
 const fontSize = ref({ value: 16, unit: 'px' });
-const alignment = ref('left');
 const color = ref('rgb(0, 0, 0)');
-const background = ref('transparent');
 const colorInput = ref(null);
-const backgroundInput = ref(null);
 
 let isUpdatingFromStore = false;
 
-const {
-  sides: marginOuterDetailed,
-  linked: marginOuterLinked,
-  updateUnit: updateMarginOuterUnit,
-  setFromSpacing: setMarginOuterFromSpacing,
-} = useLinkedSpacing({
-  initialValues: {
-    top: { value: 0, unit: 'mm' },
-    right: { value: 0, unit: 'mm' },
-    bottom: { value: 24, unit: 'mm' },
-    left: { value: 0, unit: 'mm' },
-  },
-  isUpdatingFromStore: () => isUpdatingFromStore,
-  debouncedUpdate,
-  onUpdate: (s) => {
-    setDetailedMargins('p', s.top, s.right, s.bottom, s.left);
-  },
-});
-
-const {
-  sides: marginInnerDetailed,
-  linked: marginInnerLinked,
-  updateUnit: updateMarginInnerUnit,
-  setFromSpacing: setMarginInnerFromSpacing,
-} = useLinkedSpacing({
-  isUpdatingFromStore: () => isUpdatingFromStore,
-  debouncedUpdate,
-  onUpdate: (s) => {
-    setDetailedPadding('p', s.top, s.right, s.bottom, s.left);
-  },
-});
-
 // Watchers for body styles
 watch(font, (val) => {
   if (isUpdatingFromStore) return;
@@ -451,25 +100,15 @@ watch(italic, (val) => {
   updateStyle('p', 'font-style', val ? 'italic' : 'normal');
 });
 
-watch(alignment, (val) => {
-  if (isUpdatingFromStore) return;
-  updateStyle('body', 'text-align', val);
-});
-
 watch(color, (val) => {
   if (isUpdatingFromStore) return;
   updateStyle('body', 'color', val);
 });
 
-watch(background, (val) => {
-  if (isUpdatingFromStore) return;
-  updateStyle('p', 'background', val);
-});
-
 // Watchers for paragraph styles
-watch(weight, (val) => {
+watch(bold, (val) => {
   if (isUpdatingFromStore) return;
-  updateStyle('p', 'font-weight', val);
+  updateStyle('p', 'font-weight', val ? 'bold' : 'normal');
 });
 
 watch(fontSize, (val) => {
@@ -488,39 +127,23 @@ const syncFromStore = () => {
   const fontStyle = extractValue('p', 'font-style');
   if (fontStyle) italic.value = fontStyle === 'italic';
 
-  const textAlign = extractValue('body', 'text-align');
-  if (textAlign) alignment.value = textAlign;
-
   const colorVal = extractValue('body', 'color');
   if (colorVal) color.value = colorVal;
 
-  const bgVal = extractValue('p', 'background');
-  if (bgVal) background.value = bgVal;
-
   // Paragraph styles
   const fontWeight = extractValue('p', 'font-weight');
-  if (fontWeight) weight.value = fontWeight;
+  if (fontWeight) bold.value = fontWeight === 'bold' || parseInt(fontWeight) >= 700;
 
   const fontSizeVal = extractNumericValue('p', 'font-size', ['px']); // ['px', 'em', 'rem']
   if (fontSizeVal) fontSize.value = fontSizeVal;
 
-  // Margins
-  const margins = extractSpacing('p', 'margin');
-  if (margins) setMarginOuterFromSpacing(margins);
-
-  // Padding
-  const padding = extractSpacing('p', 'padding');
-  if (padding) setMarginInnerFromSpacing(padding);
-
   isUpdatingFromStore = false;
 };
 
 const updateColorisButtons = () => {
-  [colorInput.value, backgroundInput.value].forEach((input) => {
-    if (input) {
-      input.dispatchEvent(new Event('input', { bubbles: true }));
-    }
-  });
+  if (colorInput.value) {
+    colorInput.value.dispatchEvent(new Event('input', { bubbles: true }));
+  }
 };
 
 onMounted(() => {
@@ -533,48 +156,3 @@ onMounted(() => {
 });
 </script>
 
-<style scoped>
-.subsection-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 0.5rem;
-}
-
-.subsection-header h3 {
-  margin: 0;
-}
-
-.link-button {
-  background: none;
-  border: 1px solid var(--color-border, #ddd);
-  border-radius: 4px;
-  padding: 0.25rem;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: all 0.2s;
-  width: 24px;
-  height: 24px;
-}
-
-.link-button svg {
-  width: 16px;
-  height: 16px;
-  color: var(--color-text-secondary, #666);
-}
-
-.link-button:hover {
-  background: var(--color-hover, #f0f0f0);
-}
-
-.link-button.active {
-  background: var(--color-primary, #007bff);
-  border-color: var(--color-primary, #007bff);
-}
-
-.link-button.active svg {
-  color: white;
-}
-</style>
diff --git a/src/components/ui/BasePopup.vue b/src/components/ui/BasePopup.vue
index 5ca07c0..2e16e4d 100644
--- a/src/components/ui/BasePopup.vue
+++ b/src/components/ui/BasePopup.vue
@@ -17,7 +17,7 @@
         <slot name="controls" />
 
         <!-- Lock/Unlock Inheritance Button -->
-        <div class="settings-subsection">
+        <div v-if="showInheritance" class="settings-subsection">
           <button class="inheritance-btn" @click="$emit('toggle-inheritance')">
             <svg
               v-if="inheritanceLocked"
@@ -54,13 +54,13 @@
           <span>CSS</span>
           <label
             class="toggle"
-            :class="{ 'field--view-only': inheritanceLocked }"
+            :class="{ 'field--view-only': showInheritance && inheritanceLocked }"
           >
             <span class="toggle-label">Mode édition</span>
             <input
               type="checkbox"
               v-model="isEditable"
-              :disabled="inheritanceLocked"
+              :disabled="showInheritance && inheritanceLocked"
             />
             <span class="toggle-switch"></span>
           </label>
@@ -73,7 +73,7 @@
           v-else
           :value="editableCss"
           @input="handleCssInput"
-          :disabled="inheritanceLocked"
+          :disabled="showInheritance && inheritanceLocked"
           spellcheck="false"
         ></textarea>
       </div>
@@ -99,6 +99,7 @@ const props = defineProps({
   editableCss: { type: String, default: '' },
   popupWidth: { type: Number, default: 800 },
   popupHeight: { type: Number, default: 600 },
+  showInheritance: { type: Boolean, default: true },
 });
 
 const emit = defineEmits(['close', 'css-input', 'toggle-inheritance']);