diff --git a/packages/oceanfront/src/components/Editable.vue b/packages/oceanfront/src/components/Editable.vue
index 191ef14d..0c6ae8a7 100644
--- a/packages/oceanfront/src/components/Editable.vue
+++ b/packages/oceanfront/src/components/Editable.vue
@@ -195,7 +195,7 @@ const OfEditableField = defineComponent({
       if (type.value === 'toggle') {
         return 'editable'
       } else {
-        return active.value ? 'editable' : 'fixed'
+        return active.value ? 'editable' : props.modelValue?.mode || 'fixed'
       }
     })
     const resizeInput = (focus = false) => {
diff --git a/packages/oceanfront/src/lib/fields.ts b/packages/oceanfront/src/lib/fields.ts
index c651fd83..19a732af 100644
--- a/packages/oceanfront/src/lib/fields.ts
+++ b/packages/oceanfront/src/lib/fields.ts
@@ -215,6 +215,8 @@ export const BaseFieldProps = {
   formatOptions: null,
   defaultValue: null,
   sticky: { type: Boolean, default: true },
+  switch: { type: Boolean, default: false },
+  outside: { type: Boolean, default: true },
 }
 
 export function extendFieldFormat(