From 4b3e05d0661c9b73cfc134db67c404bf73f02af7 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Wed, 17 Jun 2026 17:46:40 +0200
Subject: [PATCH 01/17] fix: change jwt secret

---
 backend/src/auth/strategy/jwt.strategy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/auth/strategy/jwt.strategy.ts b/backend/src/auth/strategy/jwt.strategy.ts
index bf77cc5..b16d482 100644
--- a/backend/src/auth/strategy/jwt.strategy.ts
+++ b/backend/src/auth/strategy/jwt.strategy.ts
@@ -9,7 +9,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
   constructor(private readonly prisma: PrismaService) {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
-      secretOrKey: 'super-secret',
+      secretOrKey: process.env.JWT_SECRET || 'super-secret',
     });
   }
 

From f38b247081a1d03fa96d9bae14ae1a82b7d6af63 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Wed, 17 Jun 2026 17:55:06 +0200
Subject: [PATCH 02/17] feat: UX UI improvements

---
 frontend/src/components/HeaderComponent.vue   | 172 ++++++++++++------
 frontend/src/components/LoadingComponent.vue  |  16 +-
 .../src/components/Search/SearchResults.vue   |  35 ++--
 .../Search/components/ResultCard.vue          | 168 +++++++++++------
 .../Search/components/SearchInput.vue         |  24 ++-
 frontend/src/components/Shared/EmptyState.vue |  48 +++++
 frontend/src/components/loginComponent.vue    |  51 +++---
 frontend/src/css/app.css                      |  52 +++++-
 frontend/src/i18n/ca-ES/index.ts              |  15 ++
 frontend/src/i18n/es-ES/index.ts              |  15 ++
 frontend/src/i18n/translateKeys.ts            |  15 ++
 frontend/src/layouts/MainLayout.vue           |   9 +-
 frontend/src/pages/ConfirmRequestsPage.vue    | 171 ++++++++++-------
 frontend/src/pages/ErrorNotFound.vue          |  39 ++--
 frontend/src/pages/GlossPage.vue              |  39 ++--
 frontend/src/pages/MyRequestsPage.vue         | 118 ++++++++----
 frontend/src/pages/ViewRequestGlossPage.vue   |   6 +-
 17 files changed, 687 insertions(+), 306 deletions(-)
 create mode 100644 frontend/src/components/Shared/EmptyState.vue

diff --git a/frontend/src/components/HeaderComponent.vue b/frontend/src/components/HeaderComponent.vue
index f77d102..fdfa9ea 100644
--- a/frontend/src/components/HeaderComponent.vue
+++ b/frontend/src/components/HeaderComponent.vue
@@ -1,11 +1,10 @@
 <template>
   <q-header
-    class="bg-secondary text-black"
-    style="height: 10vh"
+    class="bg-secondary text-black app-header"
+    elevated
   >
     <loginComponent v-model="isLoginDialogOpen" />
-    
-    <!-- Sidebar Navigation -->
+
     <q-drawer
       v-model="isSidebarOpen"
       side="right"
@@ -14,72 +13,111 @@
       overlay
       class="bg-secondary"
     >
-      
+      <q-toolbar class="q-px-md">
+        <q-toolbar-title class="text-subtitle1 text-weight-bold">
+          {{ translate('signBank') }}
+        </q-toolbar-title>
+        <q-btn
+          flat
+          dense
+          round
+          icon="close"
+          :aria-label="translate('closeMenu')"
+          @click="isSidebarOpen = false"
+        />
+      </q-toolbar>
+
+      <q-separator />
+
       <q-list padding>
+        <q-item-label
+          header
+          class="text-grey-7"
+        >
+          {{ translate('navigation') }}
+        </q-item-label>
+
         <q-item
           v-if="route.path !== '/search' && route.path !== '/'"
           clickable
           v-ripple
+          :active="isActive('/search')"
+          active-class="nav-item-active"
           @click="navigateTo('/search')"
         >
           <q-item-section avatar>
             <q-icon name="search" />
           </q-item-section>
-          <q-item-section class="text-caption">{{ translate('searchGloss') }}</q-item-section>
+          <q-item-section>{{ translate('searchGloss') }}</q-item-section>
         </q-item>
-        
+
         <q-item
           v-if="userStore.isLoggedIn"
           clickable
           v-ripple
+          :active="isActive('/my-requests')"
+          active-class="nav-item-active"
           @click="navigateTo('/my-requests')"
         >
           <q-item-section avatar>
             <q-icon name="add" />
           </q-item-section>
-          <q-item-section class="text-caption">{{ translate('createEntry') }}</q-item-section>
-        </q-item>
-        
-        <q-item
-          v-if="userStore.isAdmin && userStore.isLoggedIn"
-          clickable
-          v-ripple
-          @click="navigateTo('/confirm-requests')"
-        >
-          <q-item-section avatar>
-            <q-icon name="check_circle" />
-          </q-item-section>
-          <q-item-section class="text-caption">{{ translate('confirmRequests') }}</q-item-section>
-        </q-item>
-        
-        <q-item
-          v-if="userStore.isAdmin && userStore.isLoggedIn"
-          clickable
-          v-ripple
-          @click="navigateTo('/user-management')"
-        >
-          <q-item-section avatar>
-            <q-icon name="people" />
-          </q-item-section>
-          <q-item-section class="text-caption">{{ translate('userManagement') }}</q-item-section>
+          <q-item-section>{{ translate('createEntry') }}</q-item-section>
         </q-item>
+
+        <template v-if="userStore.isAdmin && userStore.isLoggedIn">
+          <q-separator class="q-my-sm" />
+
+          <q-item-label
+            header
+            class="text-grey-7"
+          >
+            {{ translate('admin') }}
+          </q-item-label>
+
+          <q-item
+            clickable
+            v-ripple
+            :active="isActive('/confirm-requests')"
+            active-class="nav-item-active"
+            @click="navigateTo('/confirm-requests')"
+          >
+            <q-item-section avatar>
+              <q-icon name="check_circle" />
+            </q-item-section>
+            <q-item-section>{{ translate('confirmRequests') }}</q-item-section>
+          </q-item>
+
+          <q-item
+            clickable
+            v-ripple
+            :active="isActive('/user-management')"
+            active-class="nav-item-active"
+            @click="navigateTo('/user-management')"
+          >
+            <q-item-section avatar>
+              <q-icon name="people" />
+            </q-item-section>
+            <q-item-section>{{ translate('userManagement') }}</q-item-section>
+          </q-item>
+        </template>
       </q-list>
-      
-      <!-- Authentication buttons at the bottom -->
+
       <div class="absolute-bottom q-pa-md">
+        <q-separator class="q-mb-sm" />
         <q-item
           v-if="!userStore.isLoggedIn"
           clickable
           v-ripple
           @click="openLogin"
-          class="rounded-borders q-mb-sm"
+          class="rounded-borders"
         >
           <q-item-section avatar>
             <q-icon name="login" color="primary" />
           </q-item-section>
-          <q-item-section class="text-primary text-caption">{{ translate('login') }}</q-item-section>
+          <q-item-section class="text-primary">{{ translate('login') }}</q-item-section>
         </q-item>
-        
+
         <q-item
           v-if="userStore.isLoggedIn"
           clickable
@@ -90,34 +128,41 @@
           <q-item-section avatar>
             <q-icon name="logout" color="negative" />
           </q-item-section>
-          <q-item-section class="text-negative text-caption">{{ translate('logout') }}</q-item-section>
+          <q-item-section class="text-negative">{{ translate('logout') }}</q-item-section>
         </q-item>
       </div>
     </q-drawer>
 
-    <q-toolbar class="row no-wrap">
-      <q-toolbar-title class="col">
+    <q-toolbar class="row no-wrap items-center">
+      <q-toolbar-title class="col row items-center no-wrap q-gutter-sm">
         <q-img
           src="https://dlc.iec.cat/img/LOGO_IEC2.png"
-          class="q-ma-md"
-          style="width: 50px;"
+          style="width: 44px; height: 44px;"
+          fit="contain"
+          alt="IEC"
         />
         <q-img
-          class="header-logo cursor-pointer q-mr-md"
+          class="header-logo cursor-pointer"
           src="https://www.upf.edu/o/upf-2016-theme/images/upf/logo.png"
+          style="width: 90px; height: 36px;"
+          fit="contain"
+          alt="UPF"
           @click="navigateTo('/')"
         />
+        <span
+          class="app-title cursor-pointer gt-xs"
+          @click="navigateTo('/')"
+        >
+          {{ translate('signBank') }}
+        </span>
       </q-toolbar-title>
 
-      <q-space />
-
-      <!-- Menu Button - Always visible -->
       <q-btn
         flat
         dense
         round
         :icon="isSidebarOpen ? 'close' : 'menu'"
-        :aria-label="isSidebarOpen ? 'Close menu' : 'Open menu'"
+        :aria-label="isSidebarOpen ? translate('closeMenu') : translate('openMenu')"
         @click="isSidebarOpen = !isSidebarOpen"
       />
     </q-toolbar>
@@ -146,11 +191,16 @@ const openLogin = () => {
   isLoginDialogOpen.value = true
   isSidebarOpen.value = false
 }
+
+const isActive = (path: string) => route.path === path || route.path.startsWith(path + '/')
 </script>
 
 <style scoped>
+.app-header {
+  min-height: 64px;
+}
+
 .header-logo {
-  width: 100px;
   transition: transform 0.2s;
 }
 
@@ -158,34 +208,36 @@ const openLogin = () => {
   transform: scale(1.05);
 }
 
-.q-btn {
-  margin: 0 4px;
+.app-title {
+  font-size: 1.1rem;
+  font-weight: 600;
+  letter-spacing: 0.02em;
+  user-select: none;
 }
 
-/* Drawer styling for all screen sizes */
-.q-drawer {
-  z-index: 2000;
+.nav-item-active {
+  background: rgba(200, 16, 47, 0.08);
+  color: var(--primary);
+  font-weight: 500;
 }
 
-.q-drawer__content {
-  background: var(--q-secondary);
+.q-drawer {
+  z-index: 2000;
 }
 
-/* Mobile responsive adjustments */
 @media (max-width: 599px) {
   .header-logo {
-    width: 80px;
+    width: 70px !important;
   }
-  
+
   .q-toolbar {
     padding: 0 8px;
   }
 }
 
-/* Desktop drawer adjustments */
 @media (min-width: 600px) {
   .q-drawer {
     box-shadow: -2px 0 8px rgba(0, 0, 0, 0.1);
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/LoadingComponent.vue b/frontend/src/components/LoadingComponent.vue
index 55b9d7e..68c59e8 100644
--- a/frontend/src/components/LoadingComponent.vue
+++ b/frontend/src/components/LoadingComponent.vue
@@ -1,19 +1,27 @@
 <template>
   <div
     v-if="loading"
-    class="q-pa-xl row col fit justify-center items-center"
+    class="loading-container column justify-center items-center"
   >
     <q-spinner
       size="3em"
       color="primary"
     />
-    <span class="q-ml-sm">{{ translate('common.loading') }}</span>
+    <span class="q-mt-md text-grey-7">{{ translate('loading') }}</span>
   </div>
 </template>
 
 <script setup lang="ts">
 import translate from 'src/utils/translate';
-const { loading } = defineProps<{
+
+defineProps<{
   loading: boolean;
 }>();
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.loading-container {
+  min-height: 300px;
+  width: 100%;
+}
+</style>
diff --git a/frontend/src/components/Search/SearchResults.vue b/frontend/src/components/Search/SearchResults.vue
index 9be0005..a2c1295 100644
--- a/frontend/src/components/Search/SearchResults.vue
+++ b/frontend/src/components/Search/SearchResults.vue
@@ -8,18 +8,24 @@
     </q-inner-loading>
 
     <div
-      v-if="!hasResults && !loading"
-      class="text-center q-mt-xl"
+      v-if="hasResults && !loading"
+      class="row items-center justify-between q-mb-sm"
     >
-      <p class="text-h6">
-        {{ t('noResults') }}
-      </p>
+      <span class="text-caption text-grey-7">
+        {{ totalResults }} {{ t('resultsFound').toLowerCase() }}
+      </span>
     </div>
 
+    <EmptyState
+      v-if="!hasResults && !loading"
+      icon="search_off"
+      :title="t('noResults')"
+      :subtitle="t('searchEmptyHint')"
+    />
+
     <div
       v-else-if="hasResults"
-      class="search-results-grid" 
-      :style="{ overflowY: 'auto'}"
+      class="search-results-grid"
     >
       <div
         v-for="hit in results?.hits"
@@ -35,14 +41,16 @@
     </div>
 
     <div
-      v-if="totalResults > perPage" 
-      class="flex flex-center q-mt-sm"
+      v-if="totalResults > perPage"
+      class="flex flex-center q-mt-md q-pb-sm"
     >
       <q-pagination
         :model-value="page"
         :max="Math.ceil(totalResults / perPage)"
         :max-pages="6"
         boundary-numbers
+        direction-links
+        color="primary"
         @update:model-value="$emit('update:page', $event)"
       />
     </div>
@@ -54,6 +62,7 @@ import { computed } from 'vue';
 import translate from 'src/utils/translate';
 import type { SearchResponse } from 'src/services/search.service';
 import ResultCard from './components/ResultCard.vue';
+import EmptyState from 'src/components/Shared/EmptyState.vue';
 
 const t = (key: string) => translate(key);
 
@@ -69,7 +78,6 @@ defineEmits<{
   (e: 'update:page', value: number): void;
   (e: 'update:showDetails', value: boolean): void;
   (e: 'view-details', glossId: string): void;
-  (e: 'page-change', page: number): void;
 }>();
 
 const hasResults = computed(() => {
@@ -86,37 +94,34 @@ const totalResults = computed(() => {
   display: grid;
   gap: 16px;
   width: 100%;
+  overflow-y: auto;
 }
 
 .result-item {
   width: 100%;
 }
 
-/* Mobile: 1 column */
 @media (max-width: 599px) {
   .search-results-grid {
     grid-template-columns: 1fr;
   }
 }
 
-/* Tablet: 2 columns */
 @media (min-width: 600px) and (max-width: 1023px) {
   .search-results-grid {
     grid-template-columns: repeat(2, 1fr);
   }
 }
 
-/* Desktop: 3 columns */
 @media (min-width: 1024px) and (max-width: 1899px) {
   .search-results-grid {
     grid-template-columns: repeat(3, 1fr);
   }
 }
 
-/* Large Desktop: 4 columns */
 @media (min-width: 1900px) {
   .search-results-grid {
     grid-template-columns: repeat(4, 1fr);
   }
 }
-</style> 
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/Search/components/ResultCard.vue b/frontend/src/components/Search/components/ResultCard.vue
index 49f69e5..95f6b41 100644
--- a/frontend/src/components/Search/components/ResultCard.vue
+++ b/frontend/src/components/Search/components/ResultCard.vue
@@ -1,15 +1,32 @@
 <template>
-  <q-card flat class="result-card" @click="$emit('view-details', document.glossId)">
-    <!-- Video Section -->
-    <q-card-section v-if="document.url" class="video-section">
-      <div class="video-container">
+  <q-card
+    flat
+    bordered
+    class="result-card sb-card-interactive"
+    role="button"
+    tabindex="0"
+    :aria-label="`${document.gloss}${document.description ? ': ' + document.description : ''}`"
+    @click="emitViewDetails"
+    @keydown.enter="emitViewDetails"
+    @keydown.space.prevent="emitViewDetails"
+    @mouseenter="playVideo"
+    @mouseleave="pauseVideo"
+    @focus="playVideo"
+    @blur="pauseVideo"
+  >
+    <q-card-section
+      v-if="document.url"
+      class="video-section q-pb-none"
+    >
+      <div class="video-container bg-grey-2">
         <video
+          ref="videoRef"
           class="video-player"
           :src="getVideoUrl(document.url)"
           preload="metadata"
           loop
-          :autoplay="true"
           muted
+          playsinline
           @error="handleVideoError"
           @loadeddata="handleVideoLoaded"
         >
@@ -21,35 +38,58 @@
         </video>
         <div
           v-if="isLoading"
-          class="absolute-center"
+          class="absolute-full flex flex-center bg-grey-2"
         >
           <q-spinner
             color="primary"
-            size="1.5em"
+            size="2em"
+          />
+        </div>
+        <div
+          v-if="!isLoading && !hasVideoError"
+          class="play-hint absolute-bottom-right q-ma-sm"
+        >
+          <q-icon
+            name="play_circle"
+            color="white"
+            size="sm"
+            style="filter: drop-shadow(0 1px 2px rgba(0,0,0,0.5));"
           />
         </div>
       </div>
     </q-card-section>
 
-    <!-- Content Section -->
+    <q-card-section
+      v-else
+      class="video-section q-pb-none"
+    >
+      <div class="video-container bg-grey-2 flex flex-center">
+        <q-icon
+          name="videocam_off"
+          size="2.5em"
+          color="grey-5"
+        />
+      </div>
+    </q-card-section>
+
     <q-card-section class="content-section">
-      <!-- Gloss -->
-      <div class="text-h6 text-truncate q-mb-sm">
+      <div class="text-h6 text-truncate q-mb-xs gloss-title">
         {{ document.gloss }}
       </div>
-      
-      <!-- Definition -->
-      <div v-if="document.description" class="text-body2 text-grey-7 q-mb-sm description-text">
+
+      <div
+        v-if="document.description"
+        class="text-body2 text-grey-7 q-mb-sm description-text"
+      >
         {{ document.description }}
       </div>
-      
-      <!-- Lexical Category -->
+
       <q-chip
         v-if="document.lexicalCategory"
         dense
         color="primary"
         text-color="white"
-        class="q-mb-md"
+        size="sm"
       >
         {{ translate(document.lexicalCategory) }}
       </q-chip>
@@ -65,88 +105,102 @@ import { ref } from 'vue';
 
 const t = (key: string) => translate(key);
 const isLoading = ref(true);
+const hasVideoError = ref(false);
+const videoRef = ref<HTMLVideoElement | null>(null);
 
-const handleVideoError = (error: Event) => {
-  console.error('Video loading error:', error);
-  isLoading.value = false;
-};
-
-const handleVideoLoaded = () => {
-  isLoading.value = false;
-};
-
-defineProps<{
+const props = defineProps<{
   document: SearchResult;
   showDetails: boolean;
 }>();
 
-defineEmits<{
+const emit = defineEmits<{
   (e: 'view-details', glossId: string): void;
 }>();
+
+const emitViewDetails = () => {
+  emit('view-details', props.document.glossId);
+};
+
+const playVideo = () => {
+  videoRef.value?.play().catch(() => {});
+};
+
+const pauseVideo = () => {
+  if (videoRef.value) {
+    videoRef.value.pause();
+    videoRef.value.currentTime = 0;
+  }
+};
+
+const handleVideoError = () => {
+  hasVideoError.value = true;
+  isLoading.value = false;
+};
+
+const handleVideoLoaded = () => {
+  isLoading.value = false;
+};
 </script>
 
 <style scoped>
 .result-card {
   height: 100%;
-  transition: all 0.3s ease;
-  cursor: pointer;
   display: flex;
   flex-direction: column;
-}
-
-.result-card:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+  border-radius: var(--sb-card-radius);
+  overflow: hidden;
 }
 
 .video-section {
-  padding-bottom: 8px;
+  padding: 12px 12px 0;
 }
 
 .video-container {
   position: relative;
   width: 100%;
-  height: 200px; /* Fixed height for consistent sizing */
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 12px;
+  height: 180px;
+  border-radius: 8px;
   overflow: hidden;
 }
 
 .video-player {
-  max-width: 100%;
-  max-height: 100%;
-  object-fit: contain; /* This will center and maintain aspect ratio */
-  width: auto;
-  height: auto;
-  border-radius: 6px;
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+.play-hint {
+  opacity: 0.7;
+  pointer-events: none;
+}
+
+.result-card:hover .play-hint,
+.result-card:focus-visible .play-hint {
+  opacity: 0;
 }
 
 .content-section {
   flex: 1;
   display: flex;
   flex-direction: column;
-  padding-top: 8px;
+  padding: 12px;
+}
+
+.gloss-title {
+  line-height: 1.3;
 }
 
 .description-text {
   line-height: 1.4;
   display: -webkit-box;
-  -webkit-line-clamp: 3;
+  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;
-  text-overflow: ellipsis;
 }
 
-/* Mobile responsive adjustments */
-@media (max-width: 768px) {
-  .result-card {
-    margin-bottom: 8px;
-  }
-  
+@media (max-width: 599px) {
   .video-container {
-    height: 150px; /* Slightly smaller on mobile */
+    height: 150px;
   }
 }
-</style> 
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/Search/components/SearchInput.vue b/frontend/src/components/Search/components/SearchInput.vue
index 289c6c7..e734c51 100644
--- a/frontend/src/components/Search/components/SearchInput.vue
+++ b/frontend/src/components/Search/components/SearchInput.vue
@@ -1,28 +1,38 @@
 <template>
-  <div class="row q-col-gutter-sm">
+  <div class="row q-col-gutter-sm items-center">
     <div class="col">
       <q-input
         :model-value="modelValue"
         outlined
         dense
         clearable
-        :placeholder="t('search')"
+        :placeholder="t('enterAWord')"
+        :aria-label="t('search')"
         @update:model-value="(val) => $emit('update:model-value', String(val || ''))"
         @keyup.enter="$emit('search')"
       >
+        <template #prepend>
+          <q-icon name="search" color="grey-6" />
+        </template>
         <template #append>
-          <q-icon
-            name="search"
-            class="cursor-pointer"
+          <q-btn
+            flat
+            dense
+            round
+            icon="search"
+            color="primary"
+            :aria-label="t('search')"
             @click="$emit('search')"
           />
         </template>
       </q-input>
     </div>
-    <div class="col-auto">
+    <div class="col-auto gt-xs">
       <q-btn
         color="primary"
+        unelevated
         :label="t('search')"
+        icon="search"
         @click="$emit('search')"
       />
     </div>
@@ -42,4 +52,4 @@ defineEmits<{
   (e: 'update:model-value', value: string): void;
   (e: 'search'): void;
 }>();
-</script> 
\ No newline at end of file
+</script>
diff --git a/frontend/src/components/Shared/EmptyState.vue b/frontend/src/components/Shared/EmptyState.vue
new file mode 100644
index 0000000..56b05ea
--- /dev/null
+++ b/frontend/src/components/Shared/EmptyState.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="empty-state column items-center justify-center text-center q-pa-xl">
+    <q-icon
+      :name="icon"
+      size="64px"
+      color="grey-5"
+      class="q-mb-md"
+    />
+    <p class="text-h6 text-grey-7 q-mb-xs">
+      {{ title }}
+    </p>
+    <p
+      v-if="subtitle"
+      class="text-body2 text-grey-6 q-mb-md"
+      style="max-width: 360px;"
+    >
+      {{ subtitle }}
+    </p>
+    <q-btn
+      v-if="actionLabel"
+      color="primary"
+      :icon="actionIcon"
+      :label="actionLabel"
+      unelevated
+      @click="$emit('action')"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+defineProps<{
+  icon?: string;
+  title: string;
+  subtitle?: string;
+  actionLabel?: string;
+  actionIcon?: string;
+}>();
+
+defineEmits<{
+  (e: 'action'): void;
+}>();
+</script>
+
+<style scoped>
+.empty-state {
+  min-height: 200px;
+}
+</style>
diff --git a/frontend/src/components/loginComponent.vue b/frontend/src/components/loginComponent.vue
index 88a3eb6..e7ef270 100644
--- a/frontend/src/components/loginComponent.vue
+++ b/frontend/src/components/loginComponent.vue
@@ -6,7 +6,7 @@
     <q-card class="login-card">
       <q-card-section class="row items-center q-pb-none">
         <div class="text-h6">
-          Login
+          {{ translate('login') }}
         </div>
         <q-space />
         <q-btn
@@ -15,6 +15,7 @@
           flat
           round
           dense
+          :aria-label="translate('cancel')"
         />
       </q-card-section>
 
@@ -26,8 +27,9 @@
           <q-input
             v-model="email"
             type="email"
+            autocomplete="email"
             :label="translate('email')"
-            :rules="[val => !!val || 'Email is required']"
+            :rules="[val => !!val || translate('emailRequired')]"
             filled
           >
             <template #prepend>
@@ -38,8 +40,9 @@
           <q-input
             v-model="password"
             :type="isPwd ? 'password' : 'text'"
+            autocomplete="current-password"
             :label="translate('password')"
-            :rules="[val => !!val || 'Password is required']"
+            :rules="[val => !!val || translate('passwordRequired')]"
             filled
           >
             <template #prepend>
@@ -49,6 +52,7 @@
               <q-icon
                 :name="isPwd ? 'visibility_off' : 'visibility'"
                 class="cursor-pointer"
+                :aria-label="translate('password')"
                 @click="isPwd = !isPwd"
               />
             </template>
@@ -60,18 +64,18 @@
               dense
               color="primary"
               :label="translate('forgotPassword')"
+              tabindex="-1"
             />
           </div>
 
-          <div class="row q-mt-md">
-            <q-btn
-              type="submit"
-              color="primary"              
-              :label="translate('login')"
-              class="full-width"
-              :loading="isLoading"
-            />
-          </div>
+          <q-btn
+            type="submit"
+            color="primary"
+            :label="translate('login')"
+            class="full-width q-mt-sm"
+            unelevated
+            :loading="isLoading"
+          />
         </q-form>
       </q-card-section>
     </q-card>
@@ -84,7 +88,6 @@ import { Notify } from 'quasar'
 import { useAuthentication } from '../hooks/useAuthentication'
 import translate from '../utils/translate'
 
-// Props
 const props = defineProps({
   modelValue: {
     type: Boolean,
@@ -92,16 +95,12 @@ const props = defineProps({
   }
 })
 
-// Emits
 const emit = defineEmits(['update:modelValue'])
 
-// Reactive references
 const email = ref('')
 const password = ref('')
 const isPwd = ref(true)
-const rememberMe = ref(false)
 
-// Computed
 const isOpen = computed({
   get: () => props.modelValue,
   set: (value: boolean) => emit('update:modelValue', value)
@@ -109,28 +108,21 @@ const isOpen = computed({
 
 const { login, isLoading, error } = useAuthentication()
 
-// Methods
 const handleLogin = async () => {
   try {
     await login(email.value, password.value)
     Notify.create({
       type: 'positive',
-      message: 'Login successful'
+      message: translate('loginSuccessful')
     })
 
-    // Close dialog
     isOpen.value = false
-    
-    // Reset form
     email.value = ''
     password.value = ''
-    rememberMe.value = false
-
-    window.location.reload()
   } catch {
     Notify.create({
       type: 'negative',
-      message: error.value || 'Login failed. Please check your credentials.'
+      message: error.value || translate('loginFailed')
     })
   }
 }
@@ -138,12 +130,13 @@ const handleLogin = async () => {
 
 <style scoped>
 .login-card {
-  min-width: 400px;
+  width: 100%;
+  max-width: 400px;
 }
 
 @media (max-width: 450px) {
   .login-card {
-    min-width: 300px;
+    max-width: calc(100vw - 32px);
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/css/app.css b/frontend/src/css/app.css
index e7dc9e9..a9021ad 100644
--- a/frontend/src/css/app.css
+++ b/frontend/src/css/app.css
@@ -1,4 +1,52 @@
 /* app global css */
 :root {
-    --primary: #c8102f;
-}
\ No newline at end of file
+  --primary: #c8102f;
+  --sb-card-radius: 12px;
+  --sb-transition: 0.2s ease;
+}
+
+body {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* Consistent focus ring for keyboard navigation */
+:focus-visible {
+  outline: 2px solid var(--primary);
+  outline-offset: 2px;
+}
+
+/* Subtle scrollbar styling */
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f5f5f5;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #c4c4c4;
+  border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: #999;
+}
+
+/* Shared card hover effect */
+.sb-card-interactive {
+  transition: transform var(--sb-transition), box-shadow var(--sb-transition);
+  cursor: pointer;
+}
+
+.sb-card-interactive:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+}
+
+.sb-card-interactive:focus-visible {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+}
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index 1dd5122..0685d21 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -399,6 +399,21 @@ const translations: TranslateKeys = {
   errorChangingPassword: 'Error en canviar la contrasenya',
   delete: 'Eliminar',
   create: 'Crear',
+  goBack: 'Tornar',
+  pageNotFound: 'Pàgina no trobada',
+  pageNotFoundDescription: 'La pàgina que cerqueu no existeix o s\'ha mogut.',
+  goHome: 'Anar a l\'inici',
+  loginSuccessful: 'Sessió iniciada correctament',
+  loginFailed: 'Error d\'inici de sessió. Comproveu les credencials.',
+  openMenu: 'Obrir menú',
+  closeMenu: 'Tancar menú',
+  navigation: 'Navegació',
+  noRequestsInTab: 'No hi ha sol·licituds en aquesta categoria',
+  noPendingRequests: 'No hi ha sol·licituds pendents de revisió',
+  createFirstRequest: 'Crear la primera sol·licitud',
+  retry: 'Tornar a intentar',
+  searchEmptyHint: 'Proveu amb altres termes o ajusteu els filtres de fonologia',
+  signBank: 'SignBank',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 2afcbb8..8d86e72 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -331,6 +331,21 @@ const translations: TranslateKeys = {
   errorChangingPassword: 'Error al cambiar contraseña',
   // Additional missing keys
   confirmDelete: 'Confirmar Eliminación',
+  goBack: 'Volver',
+  pageNotFound: 'Página no encontrada',
+  pageNotFoundDescription: 'La página que buscas no existe o ha sido movida.',
+  goHome: 'Ir al inicio',
+  loginSuccessful: 'Sesión iniciada correctamente',
+  loginFailed: 'Error de inicio de sesión. Comprueba tus credenciales.',
+  openMenu: 'Abrir menú',
+  closeMenu: 'Cerrar menú',
+  navigation: 'Navegación',
+  noRequestsInTab: 'No hay solicitudes en esta categoría',
+  noPendingRequests: 'No hay solicitudes pendientes de revisión',
+  createFirstRequest: 'Crear la primera solicitud',
+  retry: 'Reintentar',
+  searchEmptyHint: 'Prueba con otros términos o ajusta los filtros de fonología',
+  signBank: 'SignBank',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index b5f24e4..6dce90b 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -847,6 +847,21 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   passwordsDoNotMatch: string;
   passwordChanged: string;
   errorChangingPassword: string;
+  goBack: string;
+  pageNotFound: string;
+  pageNotFoundDescription: string;
+  goHome: string;
+  loginSuccessful: string;
+  loginFailed: string;
+  openMenu: string;
+  closeMenu: string;
+  navigation: string;
+  noRequestsInTab: string;
+  noPendingRequests: string;
+  createFirstRequest: string;
+  retry: string;
+  searchEmptyHint: string;
+  signBank: string;
 }
 
 export default TranslateKeys;
\ No newline at end of file
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 0fc9ef4..fa1d071 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -1,7 +1,7 @@
 <template>
   <q-layout view="lHh Lpr lFf">
     <HeaderComponent />
-    <q-page-container>
+    <q-page-container class="page-container">
       <router-view />
     </q-page-container>
   </q-layout>
@@ -9,5 +9,10 @@
 
 <script setup lang="ts">
 import HeaderComponent from 'components/HeaderComponent.vue';
-
 </script>
+
+<style scoped>
+.page-container {
+  background: #fafafa;
+}
+</style>
diff --git a/frontend/src/pages/ConfirmRequestsPage.vue b/frontend/src/pages/ConfirmRequestsPage.vue
index 770738e..6d8d65c 100644
--- a/frontend/src/pages/ConfirmRequestsPage.vue
+++ b/frontend/src/pages/ConfirmRequestsPage.vue
@@ -1,33 +1,50 @@
 <template>
-  <q-page class="q-pa-md no-wrap"
-  :style-fn="(header: number, height: number) => {
-      pageHeight = height-header
-      return { height: `${height - header}px` };
-    }" >
+  <q-page class="q-pa-md">
     <div class="row justify-between items-center q-mb-md">
       <div class="text-h5">
         {{ translate('pendingRequests') }}
       </div>
     </div>
-  
+
     <div
       v-if="loading"
       class="row justify-center items-center"
-      style="height: 200px;"
+      style="min-height: 200px;"
     >
       <q-spinner
         color="primary"
         size="3em"
       />
     </div>
-  
+
     <div
       v-else-if="error"
-      class="text-negative text-center"
+      class="column items-center q-pa-lg"
     >
-      {{ error }}
+      <q-icon
+        name="error_outline"
+        size="48px"
+        color="negative"
+        class="q-mb-md"
+      />
+      <p class="text-negative text-center q-mb-md">
+        {{ error }}
+      </p>
+      <q-btn
+        color="primary"
+        outline
+        icon="refresh"
+        :label="translate('retry')"
+        @click="retry"
+      />
     </div>
-  
+
+    <EmptyState
+      v-else-if="!requests?.length"
+      icon="inbox"
+      :title="translate('noPendingRequests')"
+    />
+
     <div
       v-else
       class="row q-col-gutter-md"
@@ -37,85 +54,103 @@
         :key="request.id"
         class="col-12 col-sm-6 col-md-4"
       >
-        <q-card>
+        <q-card
+          bordered
+          flat
+          class="request-card sb-card-interactive"
+        >
           <q-card-section>
-            <div class="row items-center justify-between">
-              <div class="text-h6">
+            <div class="row items-center justify-between no-wrap">
+              <div class="text-h6 text-truncate q-mr-sm">
                 {{ request.requestedGlossData.gloss }}
               </div>
               <q-chip
                 :color="getStatusColor(request.status)"
                 text-color="white"
                 dense
+                size="sm"
               >
                 {{ translate(request.status) }}
               </q-chip>
             </div>
           </q-card-section>
-  
-          <q-card-section class="row justify-between items-center">
-            <div class="column items-start">
-              <div class="text-caption">
-                {{ translate('requested') }}: {{ new Date(request.createdAt).toLocaleDateString() }}
-              </div>
-              <div class="text-caption">
-                {{ translate('requestedBy') }}: {{ request.creator.name }} {{ request.creator.lastName }}
-              </div>
+
+          <q-card-section class="q-pt-none">
+            <div class="text-caption text-grey-7">
+              {{ translate('requested') }}: {{ formatDate(request.createdAt) }}
+            </div>
+            <div class="text-caption text-grey-7">
+              {{ translate('requestedBy') }}: {{ request.creator.name }} {{ request.creator.lastName }}
             </div>
-            
+          </q-card-section>
+
+          <q-separator />
+
+          <q-card-actions align="right">
             <q-btn
-              flat
+              unelevated
               dense
               icon="rate_review"
               :label="translate('reviewRequest')"
               color="primary"
               @click="$router.push(`/confirm-requests/review/${request.id}`)"
             />
-          </q-card-section>
+          </q-card-actions>
         </q-card>
       </div>
     </div>
   </q-page>
 </template>
-  
-  <script setup lang="ts">
-  import { ref, onMounted } from 'vue';
-  import { useRouter } from 'vue-router';
-  import { api } from 'src/services/api';
-  import translate from 'src/utils/translate';
-  import type { GlossRequest } from 'src/types/models';
-  import { RequestStatus } from 'src/types/models';
-  
-  const $router = useRouter();
-  const pageHeight = ref(0);
-  const requests = ref<GlossRequest[]>();
-  const loading = ref(true);
-  const error = ref<string | null>(null);
-  
-  onMounted(async () => {
-    await fetchRequests();
-  });
-  
-  const fetchRequests = async () => {
-    try {
-      const response = await api.glossRequests.getPending();
-      requests.value = response.data;
-    } catch (err) {
-      error.value = translate('errors.failedToLoadRequests');
-      console.error(err);
-    } finally {
-      loading.value = false;
-    }
-  };
-  
-  const getStatusColor = (status: RequestStatus): string => {
-    switch (status) {
-      case RequestStatus.ACCEPTED:
-        return 'positive';
-      case RequestStatus.DENIED:
-        return 'negative';
-      default:
-        return 'warning';
-    }
-  };
-  </script>
\ No newline at end of file
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import { api } from 'src/services/api';
+import translate from 'src/utils/translate';
+import type { GlossRequest } from 'src/types/models';
+import { RequestStatus } from 'src/types/models';
+import EmptyState from 'src/components/Shared/EmptyState.vue';
+
+const requests = ref<GlossRequest[]>();
+const loading = ref(true);
+const error = ref<string | null>(null);
+
+onMounted(async () => {
+  await fetchRequests();
+});
+
+const fetchRequests = async () => {
+  try {
+    loading.value = true;
+    error.value = null;
+    const response = await api.glossRequests.getPending();
+    requests.value = response.data;
+  } catch (err) {
+    error.value = translate('errors.failedToLoadRequests');
+    console.error(err);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const retry = () => fetchRequests();
+
+const getStatusColor = (status: RequestStatus): string => {
+  switch (status) {
+    case RequestStatus.ACCEPTED:
+      return 'positive';
+    case RequestStatus.DENIED:
+      return 'negative';
+    default:
+      return 'warning';
+  }
+};
+
+const formatDate = (date: string) => new Date(date).toLocaleDateString();
+</script>
+
+<style scoped>
+.request-card {
+  border-radius: var(--sb-card-radius);
+  border-left: 4px solid var(--q-warning);
+}
+</style>
diff --git a/frontend/src/pages/ErrorNotFound.vue b/frontend/src/pages/ErrorNotFound.vue
index 5c26fec..98c5568 100644
--- a/frontend/src/pages/ErrorNotFound.vue
+++ b/frontend/src/pages/ErrorNotFound.vue
@@ -1,24 +1,27 @@
 <template>
-  <div class="fullscreen bg-blue text-white text-center q-pa-md flex flex-center">
-    <div>
-      <div style="font-size: 30vh">
+  <div class="fullscreen flex flex-center q-pa-md not-found-page">
+    <div class="text-center">
+      <q-icon
+        name="search_off"
+        size="80px"
+        color="grey-5"
+        class="q-mb-md"
+      />
+      <div class="text-h2 text-weight-bold text-primary q-mb-sm">
         404
       </div>
-
-      <div
-        class="text-h2"
-        style="opacity:.4"
-      >
-        Oops. Nothing here...
+      <div class="text-h6 text-grey-7 q-mb-xs">
+        {{ translate('pageNotFound') }}
       </div>
-
+      <p class="text-body2 text-grey-6 q-mb-lg">
+        {{ translate('pageNotFoundDescription') }}
+      </p>
       <q-btn
-        class="q-mt-xl"
-        color="white"
-        text-color="blue"
+        color="primary"
         unelevated
+        icon="home"
         to="/"
-        label="Go Home"
+        :label="translate('goHome')"
         no-caps
       />
     </div>
@@ -26,5 +29,11 @@
 </template>
 
 <script setup lang="ts">
-//
+import translate from 'src/utils/translate';
 </script>
+
+<style scoped>
+.not-found-page {
+  background: #fafafa;
+}
+</style>
diff --git a/frontend/src/pages/GlossPage.vue b/frontend/src/pages/GlossPage.vue
index 283db10..5fa8da9 100644
--- a/frontend/src/pages/GlossPage.vue
+++ b/frontend/src/pages/GlossPage.vue
@@ -7,17 +7,32 @@
 
     <div
       v-else-if="error"
-      class="text-center q-pa-md"
+      class="column items-center q-pa-xl"
     >
-      <div class="text-negative text-h6">
+      <q-icon
+        name="error_outline"
+        size="48px"
+        color="negative"
+        class="q-mb-md"
+      />
+      <div class="text-negative text-h6 text-center q-mb-md">
         {{ error }}
       </div>
-      <q-btn
-        color="primary"
-        :label="translate('common.goBack')"
-        class="q-mt-md"
-        @click="router.go(-1)"
-      />
+      <div class="row q-gutter-sm">
+        <q-btn
+          color="primary"
+          outline
+          icon="refresh"
+          :label="translate('retry')"
+          @click="getGlossData"
+        />
+        <q-btn
+          flat
+          icon="arrow_back"
+          :label="translate('goBack')"
+          @click="router.go(-1)"
+        />
+      </div>
     </div>
 
     <div
@@ -67,13 +82,15 @@ watch(() => route.fullPath, () => {
 })
 
 function getGlossData() {
-  if(route.params.gloss) {
+  if (route.params.gloss) {
+    loading.value = true
+    error.value = null
     api.glosses.get(route.params.gloss as string)
       .then((response) => {
         glossData.value = response.data
       })
-      .catch((error) => {
-        console.error(error)
+      .catch((err) => {
+        console.error(err)
         error.value = translate('errors.failedToLoadGloss')
       }).finally(() => {
         loading.value = false
diff --git a/frontend/src/pages/MyRequestsPage.vue b/frontend/src/pages/MyRequestsPage.vue
index d1992fa..38e3e68 100644
--- a/frontend/src/pages/MyRequestsPage.vue
+++ b/frontend/src/pages/MyRequestsPage.vue
@@ -1,16 +1,12 @@
 <template>
-  <q-page class="q-pa-md"
-  :style-fn="(header: number, height: number) => {
-      pageHeight = height-header
-      return { height: `${height - header}px` };
-    }"
-    >
+  <q-page class="q-pa-md">
     <div class="row justify-between items-center q-mb-md">
       <div class="text-h5">
         {{ translate('myGlossRequests') }}
       </div>
       <q-btn
         color="primary"
+        unelevated
         :label="translate('newRequest')"
         icon="add"
         @click="$router.push('/my-requests/create')"
@@ -20,7 +16,7 @@
     <div
       v-if="loading"
       class="row justify-center items-center"
-      style="height: 200px;"
+      style="min-height: 200px;"
     >
       <q-spinner
         color="primary"
@@ -30,36 +26,54 @@
 
     <div
       v-else-if="error"
-      class="text-negative text-center"
+      class="column items-center q-pa-lg"
     >
-      {{ error }}
+      <q-icon
+        name="error_outline"
+        size="48px"
+        color="negative"
+        class="q-mb-md"
+      />
+      <p class="text-negative text-center q-mb-md">
+        {{ error }}
+      </p>
+      <q-btn
+        color="primary"
+        outline
+        icon="refresh"
+        :label="translate('retry')"
+        @click="retry"
+      />
     </div>
 
     <div v-else>
       <q-tabs
         v-model="activeTab"
         class="text-primary q-mb-md"
-        align="justify"
+        align="left"
+        narrow-indicator
+        outside-arrows
+        mobile-arrows
       >
         <q-tab
           name="not_sent"
           icon="edit"
-          :label="' ' + translate('notSent') + ' (' + filteredRequests.not_sent.length + ')'"
+          :label="translate('notSent') + ' (' + filteredRequests.not_sent.length + ')'"
         />
         <q-tab
           name="pending"
           icon="pending"
-          :label="' ' + translate('pending') + ' (' + filteredRequests.pending.length + ')'"
+          :label="translate('pending') + ' (' + filteredRequests.pending.length + ')'"
         />
         <q-tab
           name="accepted"
           icon="check_circle"
-          :label="' ' + translate('accepted') + ' (' + filteredRequests.accepted.length + ')'"
+          :label="translate('accepted') + ' (' + filteredRequests.accepted.length + ')'"
         />
         <q-tab
           name="denied"
           icon="cancel"
-          :label="' ' + translate('denied') + ' (' + filteredRequests.denied.length + ')'"
+          :label="translate('denied') + ' (' + filteredRequests.denied.length + ')'"
         />
       </q-tabs>
 
@@ -67,57 +81,77 @@
         v-model="activeTab"
         animated
       >
-        <q-tab-panel 
+        <q-tab-panel
           v-for="(statusRequests, status) in filteredRequests"
           :key="status"
           :name="status.toLowerCase()"
+          class="q-pa-none q-pt-md"
         >
-          <div class="row q-col-gutter-md">
+          <EmptyState
+            v-if="statusRequests.length === 0"
+            :icon="getEmptyIcon(status)"
+            :title="translate('noRequestsInTab')"
+            :action-label="status === 'not_sent' ? translate('createFirstRequest') : undefined"
+            :action-icon="status === 'not_sent' ? 'add' : undefined"
+            @action="goToCreateRequest(status)"
+          />
+
+          <div
+            v-else
+            class="row q-col-gutter-md"
+          >
             <div
               v-for="request in statusRequests"
               :key="request.id"
               class="col-12 col-sm-6 col-md-4"
             >
-              <q-card :class="'request-card ' + status.toLowerCase()">
+              <q-card
+                bordered
+                flat
+                :class="'request-card sb-card-interactive ' + status.toLowerCase()"
+              >
                 <q-card-section>
-                  <div class="row items-center justify-between">
-                    <div class="text-h6">
+                  <div class="row items-center justify-between no-wrap">
+                    <div class="text-h6 text-truncate q-mr-sm">
                       {{ request.requestedGlossData.gloss }}
                     </div>
                     <q-chip
                       :color="getStatusColor(request.status)"
                       text-color="white"
                       dense
+                      size="sm"
                     >
                       {{ translate(request.status) }}
                     </q-chip>
                   </div>
                 </q-card-section>
 
-                <q-card-section>
-                  <div class="text-caption q-mb-sm">
-                    {{ translate('requested') }}: {{ new Date(request.createdAt).toLocaleDateString() }}
+                <q-card-section class="q-pt-none">
+                  <div class="text-caption text-grey-7 q-mb-xs">
+                    {{ translate('requested') }}: {{ formatDate(request.createdAt) }}
                   </div>
                   <div
                     v-if="request.status === 'ACCEPTED'"
-                    class="text-caption q-mb-sm"
+                    class="text-caption text-grey-7 q-mb-xs"
                   >
                     {{ translate('acceptedBy') }}: {{ request.acceptedBy?.name }} {{ request.acceptedBy?.lastName }}
                   </div>
                   <div
                     v-if="request.status === 'DENIED'"
-                    class="text-caption q-mb-sm"
+                    class="text-caption text-grey-7 q-mb-xs"
                   >
                     {{ translate('deniedBy') }}: {{ request.deniedBy?.name }} {{ request.deniedBy?.lastName }}
                   </div>
                   <div
                     v-if="request.status === 'DENIED' && request.denyReason"
-                    class="text-caption text-negative q-mb-sm"
+                    class="text-caption text-negative"
                   >
                     {{ translate('reason') }}: {{ request.denyReason }}
                   </div>
                 </q-card-section>
 
+                <q-separator />
+
                 <q-card-actions align="right">
                   <q-btn
                     v-if="request.glossId"
@@ -133,6 +167,7 @@
                     dense
                     icon="info"
                     :label="translate('details')"
+                    color="primary"
                     @click="request.status === 'NOT_COMPLETED' ? $router.push(`/my-requests/edit/${request.id}`) : $router.push(`/my-requests/view/${request.id}`)"
                   />
                 </q-card-actions>
@@ -151,9 +186,9 @@ import { useRouter } from 'vue-router';
 import { api } from 'src/services/api';
 import translate from 'src/utils/translate';
 import { GlossRequest, RequestStatus } from 'src/types/models';
+import EmptyState from 'src/components/Shared/EmptyState.vue';
 
 const $router = useRouter();
-const pageHeight = ref(0);
 const requests = ref<GlossRequest[]>([]);
 const loading = ref(true);
 const error = ref<string | null>(null);
@@ -165,6 +200,8 @@ onMounted(async () => {
 
 const fetchRequests = async () => {
   try {
+    loading.value = true;
+    error.value = null;
     const response = await api.glossRequests.getMine();
     requests.value = response.data;
   } catch (err) {
@@ -175,6 +212,8 @@ const fetchRequests = async () => {
   }
 };
 
+const retry = () => fetchRequests();
+
 const filteredRequests = computed(() => {
   return {
     not_sent: requests.value?.filter(r => r.status === RequestStatus.NOT_COMPLETED) || [],
@@ -196,12 +235,30 @@ const getStatusColor = (status: RequestStatus): string => {
       return 'warning';
   }
 };
+
+const getEmptyIcon = (status: string): string => {
+  switch (status) {
+    case 'not_sent': return 'edit_note';
+    case 'pending': return 'hourglass_empty';
+    case 'accepted': return 'check_circle_outline';
+    case 'denied': return 'block';
+    default: return 'inbox';
+  }
+};
+
+const formatDate = (date: string) => new Date(date).toLocaleDateString();
+
+const goToCreateRequest = (status: string) => {
+  if (status === 'not_sent') {
+    $router.push('/my-requests/create');
+  }
+};
 </script>
 
 <style lang="scss" scoped>
 .request-card {
-  transition: all 0.3s ease;
   border-left: 4px solid transparent;
+  border-radius: var(--sb-card-radius);
 
   &.not_sent {
     border-left-color: var(--q-grey);
@@ -218,10 +275,5 @@ const getStatusColor = (status: RequestStatus): string => {
   &.denied {
     border-left-color: var(--q-negative);
   }
-
-  &:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/pages/ViewRequestGlossPage.vue b/frontend/src/pages/ViewRequestGlossPage.vue
index 0a098e1..7c69310 100644
--- a/frontend/src/pages/ViewRequestGlossPage.vue
+++ b/frontend/src/pages/ViewRequestGlossPage.vue
@@ -14,7 +14,7 @@
       </div>
       <q-btn
         color="primary"
-        :label="translate('common.goBack')"
+        :label="translate('goBack')"
         class="q-mt-md"
         @click="router.go(-1)"
       />
@@ -89,7 +89,7 @@ const acceptRequest = async () => {
     })
     
     // Redirect to pending requests page
-    router.push('/pending-requests').catch((err) => {
+    router.push('/confirm-requests').catch((err) => {
       console.error(err)
     })
   } catch (err) {
@@ -119,7 +119,7 @@ const declineRequest = async () => {
     })
     
     // Redirect to pending requests page
-    router.push('/pending-requests').catch((err) => {
+    router.push('/confirm-requests').catch((err) => {
       console.error(err)
     })
   } catch (err) {

From aacf9998a4240ea75e1c6bc540d0c6ce9f67cf45 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Wed, 17 Jun 2026 18:01:31 +0200
Subject: [PATCH 03/17] feat: UI UX imperovements

---
 .../GlossDetail/GlossDetailComponent.vue      |  38 ++-
 .../DefinitionCardDesktop.vue                 |   5 +-
 .../DefinitionCardMobile.vue                  |   7 +-
 .../DefinitionTranslationsComponent.vue       |  17 +-
 .../DefinitionsComponent.vue                  |  89 ++++++-
 .../ExamplesComponent/ExampleCardDesktop.vue  |   7 +-
 .../ExamplesComponent/ExampleCardMobile.vue   |   7 +-
 .../ExamplesComponent/ExamplesComponent.vue   |  23 +-
 .../GlossDetail/components/GlossHeader.vue    |  11 +-
 .../components/GlossRequestProgress.vue       |  73 ++++++
 .../components/GlossTranslationsComponent.vue |  47 +++-
 .../components/MoreContentComponent.vue       | 225 +++++++++++++----
 .../components/SignFonologyComponent.vue      |  17 +-
 .../components/VideosComponent.vue            |  20 +-
 .../src/components/Shared/EditableModule.vue  | 116 +++++----
 .../components/Shared/PhonologyFilters.vue    | 239 +++++++++++++++++-
 frontend/src/i18n/ca-ES/index.ts              |  10 +
 frontend/src/i18n/es-ES/index.ts              |  10 +
 frontend/src/i18n/translateKeys.ts            |  10 +
 frontend/src/pages/CreateGlossRequest.vue     |   5 +-
 frontend/src/pages/EditGlossRequest.vue       |  10 +-
 frontend/src/pages/ReviewGlossRequest.vue     | 166 ++++++------
 frontend/src/pages/ViewRequestGlossPage.vue   |  73 +-----
 23 files changed, 910 insertions(+), 315 deletions(-)
 create mode 100644 frontend/src/components/GlossDetail/components/GlossRequestProgress.vue

diff --git a/frontend/src/components/GlossDetail/GlossDetailComponent.vue b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
index 15d6e1e..19f74ff 100644
--- a/frontend/src/components/GlossDetail/GlossDetailComponent.vue
+++ b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
@@ -1,8 +1,13 @@
 <template>
   <q-card
     flat
-    style="max-width: 1200px"
+    class="gloss-detail-card"
   >
+    <GlossRequestProgress
+      v-if="isDraft"
+      :gloss-data="glossData"
+    />
+
     <GlossHeader
       :gloss-data="glossData"
       :edit-mode="editMode"
@@ -17,25 +22,30 @@
       @decline-request="declineRequest"
       @submit-request="submitRequest"
     />
+
     <MainContent
-      v-if="!editMode"
+      v-if="!contentEditable"
       :gloss-data="glossData"
     />
+
     <MoreContentComponent
       :gloss-data="glossData"
-      :edit-mode="editMode"
+      :edit-mode="contentEditable"
+      :is-draft="isDraft"
       @update:gloss-data="handleGlossDataUpdate"
     />
   </q-card>
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { GlossData, RequestStatus } from 'src/types/models'
 import GlossHeader from './components/GlossHeader.vue'
-import MainContent from './components/MainContent.vue';
-import MoreContentComponent from './components/MoreContentComponent.vue';
-import { validateGloss } from 'src/utils/glossValidation';
-import { useQuasar } from 'quasar';
+import MainContent from './components/MainContent.vue'
+import MoreContentComponent from './components/MoreContentComponent.vue'
+import GlossRequestProgress from './components/GlossRequestProgress.vue'
+import { validateGloss } from 'src/utils/glossValidation'
+import { useQuasar } from 'quasar'
 import translate from 'src/utils/translate'
 
 const emit = defineEmits<{
@@ -55,6 +65,12 @@ const { glossData, editMode, allowEdit = true, isConfirmRequestPage = false, req
   submitting?: boolean | undefined
 }>()
 
+const isDraft = computed(() =>
+  editMode && allowEdit && requestStatus === RequestStatus.NOT_COMPLETED
+)
+
+const contentEditable = computed(() => allowEdit && editMode)
+
 const $q = useQuasar()
 
 const editGloss = () => {
@@ -103,3 +119,11 @@ const handleGlossDataUpdate = (updatedGlossData: GlossData) => {
   emit('update:glossData', updatedGlossData)
 }
 </script>
+
+<style scoped>
+.gloss-detail-card {
+  max-width: 1200px;
+  width: 100%;
+  margin: 0 auto;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
index 2f275a0..42bf9ba 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
@@ -2,7 +2,8 @@
   <q-item class="q-mb-lg q-pa-md q-hover:bg-grey-1 q-transition-all q-rounded-borders column">
     <EditableModule
       :allow-edit="allowEdit"
-      :show-delete="true"
+      :inline-edit="inlineEdit"
+      :show-delete="!inlineEdit || Boolean(definition.id)"
       :custom-edit-label="translate('editDefinition')"
       :custom-delete-label="translate('deleteDefinition')"
       @save="() => $emit('save', definition)"
@@ -84,6 +85,7 @@
         <!-- Definition Translations -->
         <DefinitionTranslationsComponent
           :allow-edit="allowEdit"
+          :inline-edit="inlineEdit"
           :definition-id="definition.id || ''"
           :translations="definition.definitionTranslations"
           @update:translations="(translations: DefinitionTranslation[]) => $emit('updateTranslations', definition, translations)"
@@ -104,6 +106,7 @@ import { getVideoUrl } from 'src/utils/videoUrl';
 const props = defineProps<{
   definition: Definition;
   allowEdit: boolean;
+  inlineEdit?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
index 4d423d0..6946d90 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
@@ -2,9 +2,8 @@
   <q-item class="q-mb-md q-pa-md q-hover:bg-grey-1 q-transition-all q-rounded-borders column">
     <EditableModule
       :allow-edit="allowEdit"
-      :show-delete="true"
-      :custom-edit-label="translate('editDefinition')"
-      :custom-delete-label="translate('deleteDefinition')"
+      :inline-edit="inlineEdit"
+      :show-delete="!inlineEdit || Boolean(definition.id)"
       @save="() => $emit('save', definition)"
       @delete="() => $emit('delete', definition)"
     >
@@ -84,6 +83,7 @@
         <!-- Definition Translations -->
         <DefinitionTranslationsComponent
           :allow-edit="allowEdit"
+          :inline-edit="inlineEdit"
           :definition-id="definition.id || ''"
           :translations="definition.definitionTranslations"
           @update:translations="(translations: DefinitionTranslation[]) => $emit('updateTranslations', definition, translations)"
@@ -104,6 +104,7 @@ import { getVideoUrl } from 'src/utils/videoUrl';
 const props = defineProps<{
   definition: Definition;
   allowEdit: boolean;
+  inlineEdit?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionTranslationsComponent.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionTranslationsComponent.vue
index 3b22611..b651943 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionTranslationsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionTranslationsComponent.vue
@@ -12,9 +12,9 @@
     >
       <EditableModule
         :allow-edit="allowEdit"
+        :inline-edit="inlineEdit"
         :initial-edit-state="definitionTranslation.isNew || false"
-        :show-delete="true"
-        :custom-delete-label="translate('deleteDefinitionTranslation')"
+        :show-delete="Boolean(definitionTranslation.id)"
         @save="() => saveDefinitionTranslation(definitionTranslation)"
         @cancel="cancelDefinitionTranslationEdit"
         @delete="() => deleteDefinitionTranslation(definitionTranslation)"
@@ -50,13 +50,23 @@
       </EditableModule>
     </div>
     <q-btn
-      v-if="allowEdit"
+      v-if="allowEdit && !inlineEdit"
       flat
       class="q-mt-sm"
       icon="add"
       :label="translate('addDefinitionTranslation')"
       @click="addTranslation"
     />
+    <q-btn
+      v-else-if="allowEdit && inlineEdit"
+      flat
+      dense
+      class="q-mt-sm"
+      icon="add"
+      color="primary"
+      :label="translate('addDefinitionTranslation')"
+      @click="addTranslation"
+    />
   </div>
 </template>
 
@@ -74,6 +84,7 @@ const loading = ref(false)
 
 const props = defineProps<{
   allowEdit: boolean;
+  inlineEdit?: boolean;
   definitionId: string;
   translations: DefinitionTranslation[];
 }>();
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
index d66c011..db94d86 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
@@ -1,6 +1,9 @@
 <template>
   <q-card-section class="column">
-    <div class="text-h5 q-mb-md row justify-between items-center">
+    <div
+      v-if="!inlineEdit"
+      class="text-h5 q-mb-md row justify-between items-center"
+    >
       {{ translate('definitions') }}
       <div class="row q-gutter-sm">
         <q-btn
@@ -22,15 +25,54 @@
         />
       </div>
     </div>
-    <q-list 
-      v-if="!isMobile"
-      >
+
+    <!-- Inline first definition form for draft creation -->
+    <q-card
+      v-if="inlineEdit && definitions.length === 0"
+      flat
+      bordered
+      class="q-pa-md q-mb-md"
+    >
+      <div class="text-subtitle1 text-weight-medium q-mb-md">
+        {{ translate('firstSense') }}
+      </div>
+      <q-input
+        v-model="inlineDefinition.title"
+        :label="translate('definitionTitle')"
+        outlined
+        dense
+        class="q-mb-sm"
+      />
+      <q-input
+        v-model="inlineDefinition.definition"
+        :label="translate('definition')"
+        outlined
+        type="textarea"
+        rows="3"
+        class="q-mb-md"
+        :rules="[val => !!val || translate('required')]"
+      />
+      <div class="row justify-end">
+        <q-btn
+          color="primary"
+          unelevated
+          icon="save"
+          :label="translate('save')"
+          :loading="loading"
+          :disable="!inlineDefinition.definition.trim()"
+          @click="saveInlineDefinition"
+        />
+      </div>
+    </q-card>
+
+    <q-list v-if="!isMobile">
       <!-- Desktop -->
         <DefinitionCardDesktop
           v-for="(definition, index) in definitions.sort((a, b) => a.priority - b.priority)"
           :key="definition.id || index"
           :definition="definition"
           :allow-edit="allowEdit"
+          :inline-edit="inlineEdit"
           @save="saveDefinition"
           @delete="deleteDefinition"
           @upload-video="uploadVideo"
@@ -46,6 +88,7 @@
         :key="definition.id || index"
         :definition="definition"
         :allow-edit="allowEdit"
+        :inline-edit="inlineEdit"
         @save="saveDefinition"
         @delete="deleteDefinition"
         @upload-video="uploadVideo"
@@ -56,9 +99,20 @@
     </q-list>
     <!-- Translations of the sense -->
     <div class="column">
+      <q-btn
+        v-if="inlineEdit && allowEdit && definitions.length > 0"
+        flat
+        dense
+        icon="add"
+        color="primary"
+        :label="translate('addDefinition')"
+        class="q-mb-md self-start"
+        @click="addDefinition"
+      />
       <GlossTranslationsComponent
         :gloss-data="glossData"
         :edit-mode="editMode"
+        :inline-edit="inlineEdit"
         @update:gloss-data="emit('update:glossData', $event)"
       />
     </div>
@@ -174,8 +228,14 @@ const props = defineProps<{
   allowEdit: boolean;
   editMode: boolean;
   glossData: GlossData;
+  inlineEdit?: boolean;
 }>();
 
+const inlineDefinition = ref({
+  title: '',
+  definition: '',
+});
+
 const emit = defineEmits<{
   (e: 'update:glossData', glossData: GlossData): void;
 }>();
@@ -183,9 +243,30 @@ const emit = defineEmits<{
 const definitions = computed(() => props.glossData?.definitions || []);
 
 const addDefinition = () => {
+  if (props.inlineEdit && definitions.value.length === 0) {
+    return;
+  }
   showCreateDefinitionDialog.value = true;
 }
 
+const saveInlineDefinition = async () => {
+  if (!props.glossData?.id || !inlineDefinition.value.definition.trim()) return;
+
+  await handleDefinitionCreated({
+    id: '',
+    title: inlineDefinition.value.title.trim(),
+    definition: inlineDefinition.value.definition.trim(),
+    videoDefinitionUrl: '',
+    priority: 0,
+    glossDataId: props.glossData.id,
+    lexicalCategory: 'NOUN',
+    definitionTranslations: [],
+    isNew: true,
+  } as Definition);
+
+  inlineDefinition.value = { title: '', definition: '' };
+}
+
 const handleDefinitionCreated = async (definition: Definition) => {
   if (!props.glossData?.id) return;
 
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
index ba85dc1..2b91bbf 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
@@ -2,9 +2,9 @@
   <q-item class="q-mb-lg q-pa-md q-hover:bg-grey-1 q-transition-all q-rounded-borders column full-width">
     <EditableModule
       :allow-edit="allowEdit"
-      :show-delete="true"
-      :custom-edit-label="translate('editExample')"
-      :custom-delete-label="translate('deleteExample')"
+      :inline-edit="inlineEdit"
+      :initial-edit-state="example.isNew"
+      :show-delete="!inlineEdit || Boolean(example.id) || example.isNew"
       @save="() => $emit('save', example)"
       @delete="() => $emit('delete', example)"
     >
@@ -88,6 +88,7 @@ import { getVideoUrl } from 'src/utils/videoUrl';
 const props = defineProps<{
   example: Example;
   allowEdit: boolean;
+  inlineEdit?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
index 4a8f1e4..17ec3c0 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
@@ -2,9 +2,9 @@
   <q-item class="q-mb-md q-pa-md q-hover:bg-grey-1 q-transition-all q-rounded-borders column">
     <EditableModule
       :allow-edit="allowEdit"
-      :show-delete="true"
-      :custom-edit-label="translate('editExample')"
-      :custom-delete-label="translate('deleteExample')"
+      :inline-edit="inlineEdit"
+      :initial-edit-state="example.isNew"
+      :show-delete="!inlineEdit || Boolean(example.id) || example.isNew"
       @save="() => $emit('save', example)"
       @delete="() => $emit('delete', example)"
     >
@@ -88,6 +88,7 @@ import { getVideoUrl } from 'src/utils/videoUrl';
 const props = defineProps<{
   example: Example;
   allowEdit: boolean;
+  inlineEdit?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
index 7a558fa..9ea0e73 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
@@ -1,6 +1,9 @@
 <template>
   <q-card-section>
-    <div class="text-h5 q-mb-md row justify-between items-center">
+    <div
+      v-if="!inlineEdit"
+      class="text-h5 q-mb-md row justify-between items-center"
+    >
       {{ translate('examples') }}
       <q-btn
         v-if="editMode"
@@ -11,6 +14,21 @@
         @click="addExample"
       />
     </div>
+    <div
+      v-else
+      class="row justify-between items-center q-mb-md"
+    >
+      <span class="text-body2 text-grey-7">{{ translate('optional') }}</span>
+      <q-btn
+        v-if="editMode"
+        flat
+        dense
+        icon="add"
+        color="primary"
+        :label="translate('addExample')"
+        @click="addExample"
+      />
+    </div>
 
     <q-list
       class="row q-col-gutter-md"
@@ -25,6 +43,7 @@
           v-if="$q.screen.gt.sm"
           :example="example"
           :allow-edit="editMode"
+          :inline-edit="inlineEdit"
           @save="saveExample"
           @delete="deleteExample"
           @upload-video="uploadVideo"
@@ -37,6 +56,7 @@
           v-else
           :example="example"
           :allow-edit="editMode"
+          :inline-edit="inlineEdit"
           @save="saveExample"
           @delete="deleteExample"
           @upload-video="uploadVideo"
@@ -75,6 +95,7 @@ const selectedExample = ref<Example | null>(null);
 const props = defineProps<{
   glossData: GlossData;
   editMode: boolean;
+  inlineEdit?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/GlossHeader.vue b/frontend/src/components/GlossDetail/components/GlossHeader.vue
index 1b6f9fb..c6eea41 100644
--- a/frontend/src/components/GlossDetail/components/GlossHeader.vue
+++ b/frontend/src/components/GlossDetail/components/GlossHeader.vue
@@ -2,12 +2,15 @@
   <q-card-section class="row justify-between items-center">
     <div class="column">
       <div class="row justify-between items-center">
-        <div class="text-h4" v-if="!editMode">
+        <div
+          v-if="!editMode || !allowEdit"
+          class="text-h4"
+        >
           {{ localGlossData.gloss }}
         </div>
-      
+
         <q-input
-          v-else
+          v-else-if="editMode && allowEdit"
           v-model="localGlossData.gloss"
           :label="translate('gloss')"
           outlined
@@ -85,7 +88,7 @@
         @click="submitRequest"
       />
 
-      <template v-if="isConfirmRequestPage">
+      <template v-if="isConfirmRequestPage && requestStatus === RequestStatus.WAITING_FOR_APPROVAL">
         <q-btn
           icon="check"
           color="positive"
diff --git a/frontend/src/components/GlossDetail/components/GlossRequestProgress.vue b/frontend/src/components/GlossDetail/components/GlossRequestProgress.vue
new file mode 100644
index 0000000..d8bd5fd
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/GlossRequestProgress.vue
@@ -0,0 +1,73 @@
+<template>
+  <q-card
+    flat
+    bordered
+    class="q-mb-md progress-card"
+  >
+    <q-card-section class="q-py-sm">
+      <div class="text-subtitle2 text-weight-medium q-mb-sm">
+        {{ translate('creationProgress') }}
+      </div>
+      <div class="row q-col-gutter-sm">
+        <div
+          v-for="item in items"
+          :key="item.key"
+          class="col-6 col-sm-3"
+        >
+          <div
+            class="progress-item row items-center no-wrap"
+            :class="{ done: item.done }"
+          >
+            <q-icon
+              :name="item.done ? 'check_circle' : 'radio_button_unchecked'"
+              :color="item.done ? 'positive' : 'grey-5'"
+              size="20px"
+              class="q-mr-xs"
+            />
+            <span class="text-caption">{{ item.label }}</span>
+          </div>
+        </div>
+      </div>
+    </q-card-section>
+  </q-card>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { GlossData } from 'src/types/models';
+import translate from 'src/utils/translate';
+
+const props = defineProps<{
+  glossData: GlossData;
+}>();
+
+const items = computed(() => {
+  const data = props.glossData;
+  const hasGloss = Boolean(data.gloss?.trim());
+  const hasDefinition = data.definitions?.some(d => d.definition?.trim());
+  const hasTranslation = data.glossTranslations?.some(t => t.translation?.trim());
+  const hasVideo = data.glossVideos?.some(v => v.videos?.some(vid => vid.url?.trim()));
+
+  return [
+    { key: 'gloss', label: translate('gloss'), done: hasGloss },
+    { key: 'definition', label: translate('definition'), done: hasDefinition },
+    { key: 'translation', label: translate('translation'), done: hasTranslation },
+    { key: 'video', label: translate('video'), done: hasVideo },
+  ];
+});
+</script>
+
+<style scoped>
+.progress-card {
+  border-radius: var(--sb-card-radius, 12px);
+  background: #fff;
+}
+
+.progress-item {
+  color: #666;
+}
+
+.progress-item.done {
+  color: #333;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
index aed6a92..04b3a87 100644
--- a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
@@ -1,32 +1,39 @@
 <template>
-  <q-card-section>
-    <div class="text-h5 q-mb-md row justify-between items-center">
+  <q-card-section class="q-pt-none">
+    <div
+      v-if="!inlineEdit"
+      class="text-h5 q-mb-md row justify-between items-center"
+    >
       {{ translate('glossTranslations') }}
       <q-btn
         v-if="editMode"
         flat
-        round
+        dense
         icon="add"
         :label="translate('addSenseTranslation')"
         @click="addTranslation"
       />
     </div>
+    <div
+      v-else
+      class="text-subtitle1 text-weight-medium q-mb-md"
+    >
+      {{ translate('glossTranslations') }}
+    </div>
 
     <q-list class="row q-col-gutter-md">
       <q-item
         v-for="(translation, index) in glossTranslations"
         :key="translation.id || index"
         class="col-12 col-md-6 q-pa-none"
-        style="min-width: 300px"
         dense
       >
         <EditableModule
           :allow-edit="editMode"
+          :inline-edit="inlineEdit"
           :initial-edit-state="translation.isNew as boolean"
-          :show-delete="true"
-          :custom-edit-label="translate('editTranslation')"
-          :custom-delete-label="translate('deleteTranslation')"
-          class="full-width q-pa-none"
+          :show-delete="Boolean(translation.id) || glossTranslations.length > 1"
+          class="full-width"
           @save="() => saveTranslation(translation)"
           @cancel="() => cancelTranslation(translation)"
           @delete="() => deleteTranslation(translation)"
@@ -36,7 +43,6 @@
               bordered
               flat
               class="full-width q-pa-md"
-              style="min-height: 120px"
             >
               <div class="row justify-between items-center q-mb-sm">
                 <LanguageSelector
@@ -44,7 +50,7 @@
                   v-model="translation.language"
                   class="col"
                 />
-                <q-chip>
+                <q-chip v-else dense>
                   {{ translate(translation.language) }}
                 </q-chip>
               </div>
@@ -55,7 +61,6 @@
                 :label="translate('translation')"
                 outlined
                 dense
-                class="col-12"
               />
               <div
                 v-else
@@ -68,6 +73,17 @@
         </EditableModule>
       </q-item>
     </q-list>
+
+    <q-btn
+      v-if="inlineEdit && editMode && glossTranslations.length > 0"
+      flat
+      dense
+      icon="add"
+      color="primary"
+      :label="translate('addSenseTranslation')"
+      class="q-mt-sm"
+      @click="addTranslation"
+    />
   </q-card-section>
 </template>
 
@@ -78,7 +94,7 @@ import { api } from 'src/services/api';
 import { useQuasar } from 'quasar';
 import LanguageSelector from './LanguageSelector.vue';
 import EditableModule from 'src/components/Shared/EditableModule.vue';
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 
 const $q = useQuasar();
 const loading = ref(false);
@@ -86,6 +102,7 @@ const loading = ref(false);
 const props = defineProps<{
   glossData: GlossData;
   editMode: boolean;
+  inlineEdit?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -109,6 +126,12 @@ const glossTranslations = computed(() => {
   });
 });
 
+onMounted(() => {
+  if (props.inlineEdit && props.editMode && glossTranslations.value.length === 0) {
+    addTranslation();
+  }
+});
+
 const addTranslation = () => {
   if (!localGlossData.value.glossTranslations) {
     localGlossData.value.glossTranslations = [];
diff --git a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
index 59adf50..dedb7aa 100644
--- a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
+++ b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
@@ -1,70 +1,187 @@
 <template>
   <div>
-    <q-tabs
-      v-model="selectedContent"
-      class="text-primary"
-      active-color="primary"
-      indicator-color="primary"
-      align="justify"
-      narrow-indicator
-    >
-      <q-tab
-        name="definitions"
-        :label="translate('definitions')"
-      />
-      <q-tab
-        name="videos"
-        :label="translate('videos')"
-      />
-      <q-tab
-        name="examples"
-        :label="translate('examples')"
-      />
-      <q-tab
-        name="related"
-        :label="translate('relatedGlosses')"
-      />
-    </q-tabs>
-
-    <q-tab-panels
-      v-model="selectedContent"
+    <!-- Draft creation: guided stepper -->
+    <q-stepper
+      v-if="isDraft"
+      v-model="step"
+      color="primary"
       animated
+      flat
+      bordered
+      class="creation-stepper"
     >
-      <q-tab-panel name="definitions">
+      <q-step
+        :name="1"
+        :title="translate('stepCore')"
+        icon="description"
+        :done="step > 1"
+      >
         <DefinitionsComponent
           :gloss-data="localGlossData"
           :edit-mode="editMode"
           :allow-edit="editMode"
+          :inline-edit="true"
           @update:gloss-data="updateGlossData"
         />
-      </q-tab-panel>
 
-      <q-tab-panel name="videos">
+        <q-stepper-navigation class="row justify-end q-mt-md">
+          <q-btn
+            color="primary"
+            unelevated
+            :label="translate('next')"
+            icon-right="arrow_forward"
+            @click="step = 2"
+          />
+        </q-stepper-navigation>
+      </q-step>
+
+      <q-step
+        :name="2"
+        :title="translate('stepVideo')"
+        icon="videocam"
+        :done="step > 2"
+      >
         <VideosComponent
           v-model="localGlossData"
           :edit-mode="editMode"
+          :inline-edit="true"
           @update:gloss-data="updateGlossData"
         />
-      </q-tab-panel>
 
-      <q-tab-panel name="examples">
-        <ExamplesComponent
-          :gloss-data="localGlossData"
-          :edit-mode="editMode"
-          @update:gloss-data="updateGlossData"
-        />
-      </q-tab-panel>
+        <q-stepper-navigation class="row justify-between q-mt-md">
+          <q-btn
+            flat
+            color="primary"
+            :label="translate('back')"
+            icon="arrow_back"
+            @click="step = 1"
+          />
+          <q-btn
+            color="primary"
+            unelevated
+            :label="translate('next')"
+            icon-right="arrow_forward"
+            @click="step = 3"
+          />
+        </q-stepper-navigation>
+      </q-step>
 
-      <q-tab-panel name="related">
-        <RelatedGlosses
-          :related-glosses="localGlossData.relationsAsSource || []"
-          :minimal-pairs="localGlossData.minimalPairsAsSource || []"
-          :edit-mode="editMode"
-          :gloss-id="localGlossData.id || ''"
-          @update:gloss-data="updateGlossData"
+      <q-step
+        :name="3"
+        :title="translate('stepOptional')"
+        icon="more_horiz"
+        optional
+      >
+        <q-expansion-item
+          expand-separator
+          icon="format_quote"
+          :label="translate('examples')"
+          header-class="text-subtitle1"
+          default-opened
+        >
+          <ExamplesComponent
+            :gloss-data="localGlossData"
+            :edit-mode="editMode"
+            :inline-edit="true"
+            @update:gloss-data="updateGlossData"
+          />
+        </q-expansion-item>
+
+        <q-expansion-item
+          expand-separator
+          icon="link"
+          :label="translate('relatedGlosses')"
+          header-class="text-subtitle1"
+        >
+          <RelatedGlosses
+            :related-glosses="localGlossData.relationsAsSource || []"
+            :minimal-pairs="localGlossData.minimalPairsAsSource || []"
+            :edit-mode="editMode"
+            :gloss-id="localGlossData.id || ''"
+            @update:gloss-data="updateGlossData"
+          />
+        </q-expansion-item>
+
+        <q-stepper-navigation class="row justify-start q-mt-md">
+          <q-btn
+            flat
+            color="primary"
+            :label="translate('back')"
+            icon="arrow_back"
+            @click="step = 2"
+          />
+        </q-stepper-navigation>
+      </q-step>
+    </q-stepper>
+
+    <!-- Published / read-only: tabbed layout -->
+    <template v-else>
+      <q-tabs
+        v-model="selectedContent"
+        class="text-primary"
+        active-color="primary"
+        indicator-color="primary"
+        align="justify"
+        narrow-indicator
+      >
+        <q-tab
+          name="definitions"
+          :label="translate('definitions')"
         />
-      </q-tab-panel>
-    </q-tab-panels>
+        <q-tab
+          name="videos"
+          :label="translate('videos')"
+        />
+        <q-tab
+          name="examples"
+          :label="translate('examples')"
+        />
+        <q-tab
+          name="related"
+          :label="translate('relatedGlosses')"
+        />
+      </q-tabs>
+
+      <q-tab-panels
+        v-model="selectedContent"
+        animated
+      >
+        <q-tab-panel name="definitions">
+          <DefinitionsComponent
+            :gloss-data="localGlossData"
+            :edit-mode="editMode"
+            :allow-edit="editMode"
+            @update:gloss-data="updateGlossData"
+          />
+        </q-tab-panel>
+
+        <q-tab-panel name="videos">
+          <VideosComponent
+            v-model="localGlossData"
+            :edit-mode="editMode"
+            @update:gloss-data="updateGlossData"
+          />
+        </q-tab-panel>
+
+        <q-tab-panel name="examples">
+          <ExamplesComponent
+            :gloss-data="localGlossData"
+            :edit-mode="editMode"
+            @update:gloss-data="updateGlossData"
+          />
+        </q-tab-panel>
+
+        <q-tab-panel name="related">
+          <RelatedGlosses
+            :related-glosses="localGlossData.relationsAsSource || []"
+            :minimal-pairs="localGlossData.minimalPairsAsSource || []"
+            :edit-mode="editMode"
+            :gloss-id="localGlossData.id || ''"
+            @update:gloss-data="updateGlossData"
+          />
+        </q-tab-panel>
+      </q-tab-panels>
+    </template>
   </div>
 </template>
 
@@ -78,13 +195,16 @@ import RelatedGlosses from './RelatedGlosses.vue';
 import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vue';
 
 const selectedContent = ref<string>('definitions')
+const step = ref(1)
+
 const emit = defineEmits<{
   (e: 'update:glossData', glossData: GlossData): void
 }>();
 
-const { glossData, editMode } = defineProps<{
+const { glossData, editMode, isDraft = false } = defineProps<{
   glossData: GlossData;
   editMode: boolean;
+  isDraft?: boolean;
 }>();
 
 const localGlossData = ref<GlossData>(glossData);
@@ -98,3 +218,10 @@ const updateGlossData = (updated: GlossData) => {
   emit('update:glossData', updated);
 }
 </script>
+
+<style scoped>
+.creation-stepper {
+  border-radius: var(--sb-card-radius, 12px);
+  background: white;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
index 4303c45..fec47cf 100644
--- a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
+++ b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
@@ -1,19 +1,15 @@
 <template>
-  <q-card-section
-    :style="{
-      maxHeight: '30dvh',
-      overflow: 'auto',
-    }"
-  >
-    <span class="text-bold">
+  <div class="sign-phonology q-mt-sm">
+    <div class="text-subtitle2 text-weight-medium q-mb-sm">
       {{ translate('signFonology') }}
-    </span>
+    </div>
     <PhonologyFilters
       :phonology-data="videoData"
       :is-editable="editMode"
+      :compact="compact"
       @update:phonology-data="$emit('update:video-data', $event)"
     />
-  </q-card-section>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -21,9 +17,10 @@ import { PhonologyData } from 'src/types/models';
 import translate from 'src/utils/translate';
 import PhonologyFilters from 'src/components/Shared/PhonologyFilters.vue';
 
-const { videoData, editMode } = defineProps<{
+defineProps<{
   videoData: PhonologyData;
   editMode: boolean;
+  compact?: boolean;
 }>();
 
 defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/VideosComponent.vue b/frontend/src/components/GlossDetail/components/VideosComponent.vue
index 077ca2c..3ad1d6b 100644
--- a/frontend/src/components/GlossDetail/components/VideosComponent.vue
+++ b/frontend/src/components/GlossDetail/components/VideosComponent.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="videos-component q-pa-sm">
-    <div class="text-h5 q-mb-md">
+    <div
+      v-if="!inlineEdit"
+      class="text-h5 q-mb-md"
+    >
       {{ translate('videos') }}
     </div>
 
@@ -35,6 +38,7 @@
       >
         <EditableModule
           :allow-edit="editMode"
+          :inline-edit="inlineEdit"
           :initial-edit-state="video.isNew ?? false"
           :show-delete="Boolean(video.id)"
           :validate-before-save="() => validateVideo(video)"
@@ -48,7 +52,7 @@
                 {{ video.title }}
               </div>
               <div
-                v-if="editMode && !video.isNew"
+                v-if="editMode && !video.isNew && !inlineEdit"
                 class="row"
               >
                 <q-btn
@@ -95,6 +99,7 @@
               <SignFonologyComponent
                 :video-data="video.videoData"
                 :edit-mode="isEditing"
+                :compact="inlineEdit"
                 @update:video-data="updateVideoData(index, $event)"
               />
             </div>
@@ -111,7 +116,7 @@ import translate from 'src/utils/translate';
 import GlossVideoComponent from './GlossVideoComponent.vue';
 import SignFonologyComponent from './SignFonologyComponent.vue';
 import EditableModule from 'src/components/Shared/EditableModule.vue';
-import { ref, watch, computed } from 'vue';
+import { ref, watch, computed, onMounted } from 'vue';
 import { useQuasar } from 'quasar';
 import api from 'src/services/api';
 import { Hand, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from 'src/types/enums';
@@ -120,8 +125,9 @@ const glossData = defineModel<GlossData>({ required: true });
 const emit = defineEmits<{
   (e: 'update:glossData', glossData: GlossData): void
 }>();
-const { editMode } = defineProps<{
+const { editMode, inlineEdit = false } = defineProps<{
   editMode: boolean;
+  inlineEdit?: boolean;
 }>();
 
 const $q = useQuasar();
@@ -146,6 +152,12 @@ watch(() => glossData.value.glossVideos, (newVideos) => {
   videosBackup.value = JSON.parse(JSON.stringify(newVideos));
 }, { deep: true });
 
+onMounted(() => {
+  if (inlineEdit && editMode && videos.value.length === 0) {
+    addVideo();
+  }
+});
+
 const updateLocalVideo = (newVideo: SignVideo, index: number) => {
   glossData.value.glossVideos[index] = newVideo;
 };
diff --git a/frontend/src/components/Shared/EditableModule.vue b/frontend/src/components/Shared/EditableModule.vue
index 3f4cabe..a9f27e3 100644
--- a/frontend/src/components/Shared/EditableModule.vue
+++ b/frontend/src/components/Shared/EditableModule.vue
@@ -1,65 +1,86 @@
 <template>
   <q-form
-    class="editable-module q-pa-sm"
+    class="editable-module"
+    :class="{ editing: effectiveEditing, 'inline-mode': inlineEdit }"
     @submit="saveEdit"
   >
-    <!-- Header with title and action buttons -->
     <div class="column no-wrap">
       <div class="row items-start justify-between q-mb-sm">
         <slot name="header" />
         <div
-          v-if="allowEdit && !isEditing"
-          class="row items-center action-buttons q-py-sm"
+          v-if="allowEdit && !effectiveEditing"
+          class="row items-center action-buttons"
         >
           <q-btn
             flat
             dense
-            size="sm"
+            round
             icon="edit"
             color="primary"
-            :label="customEditLabel || translate('edit')"
-            class="edit-button"
+            :aria-label="customEditLabel || translate('edit')"
             @click="startEdit"
-          >
-            <q-tooltip>{{ customEditLabel || translate('edit') }}</q-tooltip>
-          </q-btn>
+          />
           <q-btn
             v-if="showDelete"
             flat
             dense
-            size="sm"
+            round
             icon="delete"
             color="negative"
-            :label="customDeleteLabel || translate('delete')"
-            class="delete-button"
+            :aria-label="customDeleteLabel || translate('delete')"
             @click="confirmDelete"
-          >
-            <q-tooltip>{{ customDeleteLabel || translate('delete') }}</q-tooltip>
-          </q-btn>
+          />
+        </div>
+        <div
+          v-else-if="inlineEdit && allowEdit && showDelete"
+          class="row items-center"
+        >
+          <q-btn
+            flat
+            dense
+            round
+            icon="delete"
+            color="negative"
+            :aria-label="customDeleteLabel || translate('delete')"
+            @click="confirmDelete"
+          />
         </div>
       </div>
 
-      <!-- Content area -->
       <div class="editable-content col">
-        <slot :is-editing="isEditing" />
+        <slot :is-editing="effectiveEditing" />
       </div>
     </div>
 
-    <!-- Action buttons when editing -->
     <div
-      v-if="isEditing"
+      v-if="effectiveEditing && allowEdit && !inlineEdit"
       class="row justify-end q-gutter-sm q-mt-md editing-actions"
     >
       <q-btn
         flat
         dense
-        color="negative"
+        color="grey-7"
         :label="translate('cancel')"
         @click="cancelEdit"
       />
       <q-btn
         dense
+        unelevated
+        color="primary"
+        :label="translate('save')"
+        type="submit"
+      />
+    </div>
+
+    <div
+      v-else-if="inlineEdit && allowEdit"
+      class="row justify-end q-mt-sm"
+    >
+      <q-btn
+        dense
+        unelevated
         color="primary"
+        icon="save"
         :label="translate('save')"
         type="submit"
       />
@@ -68,7 +89,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed, watch } from 'vue'
 import translate from 'src/utils/translate'
 import { useQuasar } from 'quasar'
 
@@ -76,6 +97,7 @@ const $q = useQuasar()
 const props = defineProps<{
   allowEdit: boolean
   initialEditState?: boolean
+  inlineEdit?: boolean
   showDelete?: boolean
   customEditLabel?: string
   customDeleteLabel?: string
@@ -88,7 +110,13 @@ const emit = defineEmits<{
   (e: 'delete'): void
 }>()
 
-const isEditing = ref(props.initialEditState ?? false)
+const isEditing = ref(props.inlineEdit || props.initialEditState || false)
+
+watch(() => props.inlineEdit, (value) => {
+  if (value) isEditing.value = true
+})
+
+const effectiveEditing = computed(() => props.inlineEdit || isEditing.value)
 
 function startEdit() {
   isEditing.value = true
@@ -116,9 +144,11 @@ function saveEdit() {
       return
     }
   }
-  
+
   emit('save')
-  isEditing.value = false
+  if (!props.inlineEdit) {
+    isEditing.value = false
+  }
 }
 
 function cancelEdit() {
@@ -151,38 +181,26 @@ function confirmDelete() {
 .editable-module {
   position: relative;
   border-radius: 8px;
-  transition: all 0.3s ease;
+  transition: background 0.2s ease;
 }
 
-.editable-module:hover .action-buttons {
-  opacity: 1;
+.editable-module.inline-mode {
+  background: white;
+  border: 1px solid rgba(0, 0, 0, 0.08);
+  padding: 12px;
+  border-radius: var(--sb-card-radius, 12px);
 }
 
-.action-buttons {
-  opacity: 0.4;
-  transition: opacity 0.3s ease;
-}
-
-.action-buttons .q-btn {
-  min-height: 24px;
-  padding: 0 8px;
+.editable-module:not(.inline-mode):hover .action-buttons {
+  opacity: 1;
 }
 
-.action-buttons .q-btn :deep(.q-btn__wrapper) {
-  padding: 4px 8px;
-  min-height: unset;
+.action-buttons {
+  opacity: 0.5;
+  transition: opacity 0.2s ease;
 }
 
 .editing-actions .q-btn {
   min-height: 32px;
 }
-
-.editable-module:hover {
-  background: rgba(0, 0, 0, 0.02);
-}
-
-.editable-module.editing {
-  background: rgba(0, 0, 0, 0.03);
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1);
-}
-</style> 
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/Shared/PhonologyFilters.vue b/frontend/src/components/Shared/PhonologyFilters.vue
index 1795ec6..4ebba28 100644
--- a/frontend/src/components/Shared/PhonologyFilters.vue
+++ b/frontend/src/components/Shared/PhonologyFilters.vue
@@ -79,7 +79,10 @@
       </div>
 
       <!-- Configuration Changes -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -130,7 +133,10 @@
       </div>
 
       <!-- Relation Between Articulators -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -204,7 +210,10 @@
       </div>
 
       <!-- Movement Related Orientation -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -241,7 +250,10 @@
       </div>
 
       <!-- Orientation Related To Location -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -278,7 +290,10 @@
       </div>
 
       <!-- Orientation Change -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -315,7 +330,10 @@
       </div>
 
       <!-- Contact Type -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -389,7 +407,10 @@
       </div>
 
       <!-- Movement Direction -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -426,7 +447,10 @@
       </div>
 
       <!-- Vocalization -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -458,7 +482,10 @@
       </div>
 
       <!-- Non Manual Component -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -490,7 +517,10 @@
       </div>
 
       <!-- Inicialization -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           v-if="!isEditable"
           caption
@@ -522,7 +552,10 @@
       </div>
 
       <!-- Repeated Movement -->
-      <div class="col-12 col-sm-6 col-md-4">
+      <div
+        v-if="!compact"
+        class="col-12 col-sm-6 col-md-4"
+      >
         <q-item-label
           caption
         >
@@ -559,6 +592,189 @@
           @update:model-value="updateBooleanField('repeatedMovement', $event)"
         />
       </div>
+
+      <!-- Advanced phonology (compact creation mode) -->
+      <div
+        v-if="compact && isEditable"
+        class="col-12"
+      >
+        <q-expansion-item
+          expand-separator
+          icon="tune"
+          :label="translate('advancedPhonology')"
+          header-class="text-subtitle2"
+        >
+          <div class="column q-col-gutter-md q-pt-sm">
+            <!-- Configuration Changes -->
+            <div class="col-12 col-sm-6">
+              <q-select
+                v-model="localData.configurationChanges"
+                :options="filteredOptions.configurationChanges"
+                :label="translate('configurationChanges')"
+                clearable
+                emit-value
+                map-options
+                options-dense
+                outlined
+                dense
+                use-input
+                input-debounce="300"
+                @filter="(val, update) => filterFn(val, update, phonologyOptions.configurationChangeOptions, 'configurationChanges')"
+                @update:model-value="updateField('configurationChanges', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-select
+                v-model="localData.relationBetweenArticulators"
+                :options="filteredOptions.relationBetweenArticulators"
+                :label="translate('relationBetweenArticulators')"
+                clearable
+                emit-value
+                map-options
+                options-dense
+                outlined
+                dense
+                use-input
+                input-debounce="300"
+                @filter="(val, update) => filterFn(val, update, phonologyOptions.relationBetweenArticulatorsOptions, 'relationBetweenArticulators')"
+                @update:model-value="updateField('relationBetweenArticulators', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-select
+                v-model="localData.movementRelatedOrientation"
+                :options="filteredOptions.movementRelatedOrientation"
+                :label="translate('movementRelatedOrientation')"
+                clearable
+                emit-value
+                map-options
+                options-dense
+                outlined
+                dense
+                use-input
+                input-debounce="300"
+                @filter="(val, update) => filterFn(val, update, phonologyOptions.movementRelatedOrientationOptions, 'movementRelatedOrientation')"
+                @update:model-value="updateField('movementRelatedOrientation', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-select
+                v-model="localData.orientationRelatedToLocation"
+                :options="filteredOptions.orientationRelatedToLocation"
+                :label="translate('orientationRelatedToLocation')"
+                clearable
+                emit-value
+                map-options
+                options-dense
+                outlined
+                dense
+                use-input
+                input-debounce="300"
+                @filter="(val, update) => filterFn(val, update, phonologyOptions.orientationRelatedToLocationOptions, 'orientationRelatedToLocation')"
+                @update:model-value="updateField('orientationRelatedToLocation', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-select
+                v-model="localData.orientationChange"
+                :options="filteredOptions.orientationChange"
+                :label="translate('orientationChange')"
+                clearable
+                emit-value
+                map-options
+                options-dense
+                outlined
+                dense
+                use-input
+                input-debounce="300"
+                @filter="(val, update) => filterFn(val, update, phonologyOptions.orientationChangeOptions, 'orientationChange')"
+                @update:model-value="updateField('orientationChange', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-select
+                v-model="localData.contactType"
+                :options="filteredOptions.contactType"
+                :label="translate('contactType')"
+                clearable
+                emit-value
+                map-options
+                options-dense
+                outlined
+                dense
+                use-input
+                input-debounce="300"
+                @filter="(val, update) => filterFn(val, update, phonologyOptions.contactTypeOptions, 'contactType')"
+                @update:model-value="updateField('contactType', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-select
+                v-model="localData.movementDirection"
+                :options="filteredOptions.movementDirection"
+                :label="translate('movementDirection')"
+                clearable
+                emit-value
+                map-options
+                options-dense
+                outlined
+                dense
+                use-input
+                input-debounce="300"
+                @filter="(val, update) => filterFn(val, update, phonologyOptions.movementDirectionOptions, 'movementDirection')"
+                @update:model-value="updateField('movementDirection', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-input
+                v-model="localData.vocalization"
+                :label="translate('vocalization')"
+                clearable
+                outlined
+                dense
+                @update:model-value="updateField('vocalization', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-input
+                v-model="localData.nonManualComponent"
+                :label="translate('nonManualComponent')"
+                clearable
+                outlined
+                dense
+                @update:model-value="updateField('nonManualComponent', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-input
+                v-model="localData.inicialization"
+                :label="translate('inicialization')"
+                clearable
+                outlined
+                dense
+                @update:model-value="updateField('inicialization', $event)"
+              />
+            </div>
+            <div class="col-12 col-sm-6">
+              <q-btn-toggle
+                v-model="localData.repeatedMovement"
+                :options="[
+                  { label: translate('yes'), value: true },
+                  { label: translate('no'), value: false }
+                ]"
+                spread
+                no-caps
+                unelevated
+                toggle-color="primary"
+                color="grey-3"
+                text-color="grey-8"
+                class="full-width"
+                @update:model-value="updateBooleanField('repeatedMovement', $event)"
+              />
+            </div>
+          </div>
+        </q-expansion-item>
+      </div>
     </div>
   </div>
 </template>
@@ -581,6 +797,7 @@ interface SelectOption {
 const props = defineProps<{
   phonologyData: PhonologyData;
   isEditable?: boolean;
+  compact?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index 0685d21..444aec0 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -414,6 +414,16 @@ const translations: TranslateKeys = {
   retry: 'Tornar a intentar',
   searchEmptyHint: 'Proveu amb altres termes o ajusteu els filtres de fonologia',
   signBank: 'SignBank',
+  stepCore: 'Definició i traducció',
+  stepVideo: 'Vídeo i fonologia',
+  stepOptional: 'Informació addicional',
+  creationProgress: 'Progrés de la sol·licitud',
+  next: 'Següent',
+  back: 'Enrere',
+  advancedPhonology: 'Fonologia avançada',
+  createGlossHint: 'Després creareu la definició, el vídeo i la traducció en un procés guiat pas a pas.',
+  requestAlreadyAccepted: 'Aquesta sol·licitud ja ha estat acceptada. El contingut és només de lectura.',
+  requestAlreadyReviewed: 'Aquesta sol·licitud ja ha estat revisada. El contingut és només de lectura.',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 8d86e72..407e10f 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -346,6 +346,16 @@ const translations: TranslateKeys = {
   retry: 'Reintentar',
   searchEmptyHint: 'Prueba con otros términos o ajusta los filtros de fonología',
   signBank: 'SignBank',
+  stepCore: 'Definición y traducción',
+  stepVideo: 'Vídeo y fonología',
+  stepOptional: 'Información adicional',
+  creationProgress: 'Progreso de la solicitud',
+  next: 'Siguiente',
+  back: 'Atrás',
+  advancedPhonology: 'Fonología avanzada',
+  createGlossHint: 'Después crearás la definición, el vídeo y la traducción en un proceso guiado paso a paso.',
+  requestAlreadyAccepted: 'Esta solicitud ya ha sido aceptada. El contenido es solo de lectura.',
+  requestAlreadyReviewed: 'Esta solicitud ya ha sido revisada. El contenido es solo de lectura.',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index 6dce90b..adc5765 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -862,6 +862,16 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   retry: string;
   searchEmptyHint: string;
   signBank: string;
+  stepCore: string;
+  stepVideo: string;
+  stepOptional: string;
+  creationProgress: string;
+  next: string;
+  back: string;
+  advancedPhonology: string;
+  createGlossHint: string;
+  requestAlreadyAccepted: string;
+  requestAlreadyReviewed: string;
 }
 
 export default TranslateKeys;
\ No newline at end of file
diff --git a/frontend/src/pages/CreateGlossRequest.vue b/frontend/src/pages/CreateGlossRequest.vue
index 8080bb7..2cb065e 100644
--- a/frontend/src/pages/CreateGlossRequest.vue
+++ b/frontend/src/pages/CreateGlossRequest.vue
@@ -8,9 +8,12 @@
     <div class="row justify-center">
       <div class="col-12 col-md-8 col-lg-6">
         <q-card class="q-pa-lg">
-          <div class="text-h4 q-mb-xl">
+          <div class="text-h4 q-mb-sm">
             {{ translate('createNewGloss') }}
           </div>
+          <p class="text-body2 text-grey-7 q-mb-lg">
+            {{ translate('createGlossHint') }}
+          </p>
           
           <q-form
             class="q-gutter-md"
diff --git a/frontend/src/pages/EditGlossRequest.vue b/frontend/src/pages/EditGlossRequest.vue
index 4a415f4..c53aa3a 100644
--- a/frontend/src/pages/EditGlossRequest.vue
+++ b/frontend/src/pages/EditGlossRequest.vue
@@ -102,12 +102,9 @@ const fetchGlossRequest = async () => {
 
 const saveGloss = async (updatedGlossData: GlossData) => {
   try {
-    loading.value = true
     const response = await api.glossData.editGloss(updatedGlossData.id || '', updatedGlossData)
     glossData.value = response.data
-    editMode.value = false
-    
-    // Show success notification
+
     $q.notify({
       type: 'positive',
       message: translate('glossSavedSuccessfully')
@@ -115,14 +112,11 @@ const saveGloss = async (updatedGlossData: GlossData) => {
   } catch (err) {
     console.error(err)
     error.value = translate('errors.failedToSaveGloss')
-    
-    // Show error notification
+
     $q.notify({
       type: 'negative',
       message: translate('errors.failedToSaveGloss')
     })
-  } finally {
-    loading.value = false
   }
 }
 
diff --git a/frontend/src/pages/ReviewGlossRequest.vue b/frontend/src/pages/ReviewGlossRequest.vue
index dad4839..ff80855 100644
--- a/frontend/src/pages/ReviewGlossRequest.vue
+++ b/frontend/src/pages/ReviewGlossRequest.vue
@@ -25,11 +25,10 @@
       </div>
 
       <template v-else>
-        <!-- Admin Review Header -->
         <div class="q-pa-md full-width">
           <div class="row items-center justify-between">
             <div class="text-h5">
-              {{ translate('reviewRequest') }}
+              {{ isPendingReview ? translate('reviewRequest') : translate('details') }}
             </div>
             <q-btn
               flat
@@ -39,18 +38,43 @@
             />
           </div>
           <div class="text-body2 text-grey-6 q-mt-sm">
-            {{ translate('requestedBy') }}: {{ glossRequest?.creator?.username }} 
+            {{ translate('requestedBy') }}: {{ glossRequest?.creator?.username }}
             ({{ new Date(glossRequest?.createdAt || '').toLocaleDateString() }})
           </div>
+
+          <q-banner
+            v-if="!isPendingReview"
+            class="q-mt-md"
+            rounded
+            :class="glossRequest?.status === 'ACCEPTED' ? 'bg-positive text-white' : 'bg-grey-3'"
+          >
+            <template #avatar>
+              <q-icon
+                :name="glossRequest?.status === 'ACCEPTED' ? 'check_circle' : 'info'"
+                :color="glossRequest?.status === 'ACCEPTED' ? 'white' : 'grey-7'"
+              />
+            </template>
+            {{ glossRequest?.status === 'ACCEPTED' ? translate('requestAlreadyAccepted') : translate('requestAlreadyReviewed') }}
+            <template
+              v-if="glossRequest?.glossId"
+              #action
+            >
+              <q-btn
+                flat
+                :color="glossRequest?.status === 'ACCEPTED' ? 'white' : 'primary'"
+                :label="translate('viewGloss')"
+                :to="`/gloss/${glossRequest.glossId}`"
+              />
+            </template>
+          </q-banner>
         </div>
 
-        <!-- Gloss Detail Component -->
         <GlossDetailComponent
-          v-model:edit-mode="editMode"
           class="col full-width"
           :gloss-data="glossData"
+          :edit-mode="false"
           :allow-edit="false"
-          :is-confirm-request-page="true"
+          :is-confirm-request-page="isPendingReview"
           :request-status="glossRequest?.status"
           @accept-request="acceptRequest"
           @decline-request="declineRequest"
@@ -61,9 +85,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import GlossDetailComponent from 'src/components/GlossDetail/GlossDetailComponent.vue';
-import { GlossData, GlossRequest } from 'src/types/models';
+import { GlossData, GlossRequest, RequestStatus } from 'src/types/models';
 import api from 'src/services/api';
 import useUserStore from 'src/stores/user.store';
 import { useRouter, useRoute } from 'vue-router';
@@ -77,7 +101,6 @@ const $q = useQuasar();
 
 const loading = ref(true);
 const error = ref<string | null>(null);
-const editMode = ref(true);
 const glossRequest = ref<GlossRequest | null>(null);
 const glossData = ref<GlossData>({
   id: '',
@@ -96,13 +119,18 @@ const glossData = ref<GlossData>({
   glossTranslations: [],
   glossRequest: null,
   isCreatedFromEdit: false,
+  glossVideos: [],
 });
 
+const isPendingReview = computed(() =>
+  glossRequest.value?.status === RequestStatus.WAITING_FOR_APPROVAL
+);
+
 const fetchGlossRequest = async () => {
   try {
     const requestId = route.params.id as string;
     const response = await api.glossRequests.get(requestId);
-    glossRequest.value = response.data as any as GlossRequest;
+    glossRequest.value = response.data as GlossRequest;
     glossData.value = response.data.requestedGlossData;
   } catch (err) {
     console.error('Error fetching gloss request:', err);
@@ -113,21 +141,21 @@ const fetchGlossRequest = async () => {
 };
 
 const acceptRequest = async () => {
+  if (!isPendingReview.value) return;
+
   try {
     loading.value = true;
     const requestId = route.params.id as string;
     await api.glossRequests.accept(requestId);
-    
-    // Show success notification
+
     $q.notify({
       type: 'positive',
       message: translate('requestAcceptedSuccessfully')
     });
-    
-    // Redirect to pending requests page
+
     router.push('/confirm-requests').catch((err) => {
-      console.error(err)
-    })
+      console.error(err);
+    });
   } catch (err) {
     console.error('Error accepting request:', err);
     $q.notify({
@@ -139,71 +167,59 @@ const acceptRequest = async () => {
   }
 };
 
-const declineRequest =  () => {
-  try {
-    // Show dialog to get decline reason
-    $q.dialog({
-      title: translate('declineRequest'),
-      message: translate('enterDeclineReason'),
-      prompt: {
-        model: '',
-        type: 'text'
-      },
-      cancel: true,
-      persistent: true
-    }).onOk( (reason: string) => {
-      if (!reason.trim()) {
-        $q.notify({
-          type: 'negative',
-          message: translate('declineReasonRequired')
-        });
-        return;
-      }
-      
-      try {
-        loading.value = true;
-        const requestId = route.params.id as string;
-        api.glossRequests.decline(requestId, { denyReason: reason }).catch((err) => {
-          console.error('Error declining request:', err);
-          $q.notify({
-            type: 'negative',
-            message: translate('errors.failedToDeclineRequest')
-          });
-        });
-        
-        // Show success notification
-        $q.notify({
-          type: 'positive',
-          message: translate('requestDeclinedSuccessfully')
-        });
-        
-        // Redirect to pending requests page
-        router.push('/confirm-requests').catch((err) => {
-          console.error(err)
-        })
-      } catch (err) {
-        console.error('Error declining request:', err);
-        $q.notify({
-          type: 'negative',
-          message: translate('errors.failedToDeclineRequest')
-        });
-      } finally {
-        loading.value = false;
-      }
-    });
-  } catch (err) {
-    console.error('Error in decline dialog:', err);
-  }
+const declineRequest = () => {
+  if (!isPendingReview.value) return;
+
+  $q.dialog({
+    title: translate('declineRequest'),
+    message: translate('enterDeclineReason'),
+    prompt: {
+      model: '',
+      type: 'text'
+    },
+    cancel: true,
+    persistent: true
+  }).onOk(async (reason: string) => {
+    if (!reason.trim()) {
+      $q.notify({
+        type: 'negative',
+        message: translate('declineReasonRequired')
+      });
+      return;
+    }
+
+    try {
+      loading.value = true;
+      const requestId = route.params.id as string;
+      await api.glossRequests.decline(requestId, { denyReason: reason });
+
+      $q.notify({
+        type: 'positive',
+        message: translate('requestDeclinedSuccessfully')
+      });
+
+      router.push('/confirm-requests').catch((err) => {
+        console.error(err);
+      });
+    } catch (err) {
+      console.error('Error declining request:', err);
+      $q.notify({
+        type: 'negative',
+        message: translate('errors.failedToDeclineRequest')
+      });
+    } finally {
+      loading.value = false;
+    }
+  });
 };
 
 onMounted(async () => {
-  // Check if user is admin
   if (!userStore.isAdmin) {
     router.push('/').catch((err) => {
-      console.error(err)
-    })
+      console.error(err);
+    });
     return;
   }
   await fetchGlossRequest();
 });
-</script> 
\ No newline at end of file
+</script>
diff --git a/frontend/src/pages/ViewRequestGlossPage.vue b/frontend/src/pages/ViewRequestGlossPage.vue
index 7c69310..a97d532 100644
--- a/frontend/src/pages/ViewRequestGlossPage.vue
+++ b/frontend/src/pages/ViewRequestGlossPage.vue
@@ -27,12 +27,11 @@
     >
       <GlossDetailComponent
         v-if="glossData"
-        v-model:edit-mode="editMode"
         class="col full-width"
         :gloss-data="glossData"
-        :allow-edit="true"
-        @accept-request="acceptRequest"
-        @decline-request="declineRequest"
+        :edit-mode="false"
+        :allow-edit="false"
+        :request-status="requestStatus"
       />
     </div>
   </q-page>
@@ -45,17 +44,15 @@ import translate from 'src/utils/translate'
 import LoadingComponent from 'src/components/LoadingComponent.vue'
 import GlossDetailComponent from 'src/components/GlossDetail/GlossDetailComponent.vue'
 import { api } from 'src/services/api'
-import type { GlossData } from 'src/types/models'
-import { useQuasar } from 'quasar'
+import type { GlossData, RequestStatus } from 'src/types/models'
 
 const route = useRoute()
 const router = useRouter()
-const $q = useQuasar()
 
 // State
 const loading = ref(true)
 const error = ref<string | null>(null)
-const editMode = ref(false)
+const requestStatus = ref<RequestStatus>()
 const glossData = ref<GlossData>()
 
 onMounted(() => {
@@ -67,6 +64,7 @@ function getGlossRequestData() {
     api.glossRequests.get(route.params.id as string)
       .then((response) => {
         glossData.value = response.data.requestedGlossData
+        requestStatus.value = response.data.status
       })
       .catch((err) => {
         console.error(err)
@@ -77,63 +75,4 @@ function getGlossRequestData() {
   }
 }
 
-const acceptRequest = async () => {
-  try {
-    loading.value = true
-    await api.glossRequests.accept(route.params.id as string)
-    
-    // Show success notification
-    $q.notify({
-      type: 'positive',
-      message: translate('requestAcceptedSuccessfully')
-    })
-    
-    // Redirect to pending requests page
-    router.push('/confirm-requests').catch((err) => {
-      console.error(err)
-    })
-  } catch (err) {
-    console.error(err)
-    error.value = translate('errors.failedToAcceptRequest')
-    
-    // Show error notification
-    $q.notify({
-      type: 'negative',
-      message: translate('errors.failedToAcceptRequest')
-    })
-  } finally {
-    loading.value = false
-  }
-}
-
-const declineRequest = async () => {
-  try {
-    loading.value = true
-    const requestId = route.params.id as string
-    await api.glossRequests.decline(requestId, { denyReason: 'Declined by admin' })
-    
-    // Show success notification
-    $q.notify({
-      type: 'positive',
-      message: translate('requestDeclinedSuccessfully')
-    })
-    
-    // Redirect to pending requests page
-    router.push('/confirm-requests').catch((err) => {
-      console.error(err)
-    })
-  } catch (err) {
-    console.error(err)
-    error.value = translate('errors.failedToDeclineRequest')
-    
-    // Show error notification
-    $q.notify({
-      type: 'negative',
-      message: translate('errors.failedToDeclineRequest')
-    })
-  } finally {
-    loading.value = false
-  }
-}
-
 </script>
\ No newline at end of file

From 71da3f4e68a249c275202e45f06d85252731dcad Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Wed, 17 Jun 2026 18:14:36 +0200
Subject: [PATCH 04/17] feat: improvements on creating glosses

---
 .../GlossDetail/GlossDetailComponent.vue      |   3 +
 .../DefinitionsComponent.vue                  | 102 +++++++++++++++---
 .../ExamplesComponent/ExamplesComponent.vue   |  32 ++++--
 .../GlossDetail/components/GlossHeader.vue    |   5 +-
 .../components/GlossTranslationsComponent.vue |  40 +++++--
 .../components/MoreContentComponent.vue       |  88 ++++++++++++++-
 .../components/VideosComponent.vue            |  56 ++++++++--
 .../src/components/Shared/EditableModule.vue  |  21 ++--
 8 files changed, 284 insertions(+), 63 deletions(-)

diff --git a/frontend/src/components/GlossDetail/GlossDetailComponent.vue b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
index 19f74ff..064773f 100644
--- a/frontend/src/components/GlossDetail/GlossDetailComponent.vue
+++ b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
@@ -13,6 +13,7 @@
       :edit-mode="editMode"
       :allow-edit="allowEdit"
       :is-confirm-request-page="isConfirmRequestPage"
+      :is-draft="isDraft"
       :request-status="requestStatus"
       :submitting="submitting"
       @edit-gloss="editGloss"
@@ -32,7 +33,9 @@
       :gloss-data="glossData"
       :edit-mode="contentEditable"
       :is-draft="isDraft"
+      :submitting="submitting"
       @update:gloss-data="handleGlossDataUpdate"
+      @submit-request="submitRequest"
     />
   </q-card>
 </template>
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
index db94d86..5d08479 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
@@ -52,17 +52,6 @@
         class="q-mb-md"
         :rules="[val => !!val || translate('required')]"
       />
-      <div class="row justify-end">
-        <q-btn
-          color="primary"
-          unelevated
-          icon="save"
-          :label="translate('save')"
-          :loading="loading"
-          :disable="!inlineDefinition.definition.trim()"
-          @click="saveInlineDefinition"
-        />
-      </div>
     </q-card>
 
     <q-list v-if="!isMobile">
@@ -110,6 +99,7 @@
         @click="addDefinition"
       />
       <GlossTranslationsComponent
+        ref="glossTranslationsRef"
         :gloss-data="glossData"
         :edit-mode="editMode"
         :inline-edit="inlineEdit"
@@ -202,6 +192,7 @@ import CreateDefinitionDialog from './CreateDefinitionDialog.vue';
 
 const $q = useQuasar()
 const loading = ref(false)
+const glossTranslationsRef = ref<InstanceType<typeof GlossTranslationsComponent> | null>(null)
 const showCreateDefinitionDialog = ref(false)
 const showVideoDialog = ref(false)
 const selectedVideoUrl = ref('')
@@ -307,7 +298,7 @@ const isGlossData = (data: any): data is GlossData => {
     'definitions' in data;
 }
 
-const saveDefinition = async (definition: Definition) => {
+const saveDefinition = async (definition: Definition, silent = false) => {
   if (!props.glossData?.id) return;
 
   try {
@@ -327,10 +318,12 @@ const saveDefinition = async (definition: Definition) => {
     if (response.data && isGlossData(response.data)) {
       emit('update:glossData', response.data);
 
-      $q.notify({
-        type: 'positive',
-        message: translate('definitionSavedSuccessfully')
-      });
+      if (!silent) {
+        $q.notify({
+          type: 'positive',
+          message: translate('definitionSavedSuccessfully')
+        });
+      }
     }
   } catch (error) {
     console.error('Error saving definition:', error);
@@ -511,6 +504,83 @@ const saveSortDefinitions = async () => {
     loading.value = false
   }
 }
+
+async function saveDefinitionTranslations(definition: Definition, silent = false) {
+  if (!definition.id) return
+
+  for (const dt of definition.definitionTranslations || []) {
+    if (!dt.translation?.trim()) continue
+
+    try {
+      if (dt.id) {
+        await api.definitions.updateTranslation(definition.id, dt.id, {
+          translation: dt.translation,
+          language: dt.language,
+        })
+      } else {
+        await api.definitions.createTranslation(definition.id, {
+          translation: dt.translation,
+          language: dt.language,
+        })
+      }
+    } catch (error) {
+      console.error('Error saving definition translation:', error)
+      if (!silent) {
+        $q.notify({
+          type: 'negative',
+          message: translate('errors.failedToSaveTranslation'),
+        })
+      }
+      throw error
+    }
+  }
+}
+
+function getStepValidationErrors(): string[] {
+  const errors: string[] = []
+  const hasDefinition = definitions.value.some(d => d.definition?.trim())
+    || inlineDefinition.value.definition.trim()
+
+  if (!hasDefinition) {
+    errors.push(translate('validation.definitionRequired', { senseTitle: props.glossData.gloss }))
+  }
+
+  errors.push(...(glossTranslationsRef.value?.getStepValidationErrors() ?? []))
+
+  return errors
+}
+
+async function saveAll(silent = false): Promise<boolean> {
+  try {
+    loading.value = true
+
+    if (definitions.value.length === 0) {
+      if (!inlineDefinition.value.definition.trim()) return false
+      await saveInlineDefinition()
+    } else {
+      for (const definition of definitions.value) {
+        await saveDefinition(definition, silent)
+        await saveDefinitionTranslations(definition, silent)
+      }
+    }
+
+    await glossTranslationsRef.value?.saveAll(silent)
+    return true
+  } catch (error) {
+    console.error('Error saving definitions step:', error)
+    if (!silent) {
+      $q.notify({
+        type: 'negative',
+        message: translate('errors.failedToSaveDefinition'),
+      })
+    }
+    return false
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({ saveAll, getStepValidationErrors })
 </script>
 
 <style scoped>
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
index 9ea0e73..d819e3d 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
@@ -124,7 +124,7 @@ const addExample = () => {
   });
 };
 
-const saveExample = async (example: Example) => {
+const saveExample = async (example: Example, silent = false) => {
   try {
     loading.value = true;
     let response;
@@ -143,22 +143,36 @@ const saveExample = async (example: Example) => {
 
     if (response.data) {
       emit('update:glossData', response.data);
-      $q.notify({
-        type: 'positive',
-        message: translate(example.id ? 'exampleUpdatedSuccessfully' : 'exampleCreatedSuccessfully'),
-      });
+      if (!silent) {
+        $q.notify({
+          type: 'positive',
+          message: translate(example.id ? 'exampleUpdatedSuccessfully' : 'exampleCreatedSuccessfully'),
+        });
+      }
     }
   } catch (error) {
     console.error('Error saving example:', error);
-    $q.notify({
-      type: 'negative',
-      message: translate('errors.failedToSaveExample'),
-    });
+    if (!silent) {
+      $q.notify({
+        type: 'negative',
+        message: translate('errors.failedToSaveExample'),
+      });
+    }
+    throw error;
   } finally {
     loading.value = false;
   }
 };
 
+async function saveAll(silent = false): Promise<void> {
+  for (const example of examples.value) {
+    if (!example.example?.trim()) continue;
+    await saveExample(example, silent);
+  }
+}
+
+defineExpose({ saveAll });
+
 const deleteExample = async (example: Example) => {
   if (!example.id) {
     const index = localGlossData.value.examples.findIndex((e) => e === example);
diff --git a/frontend/src/components/GlossDetail/components/GlossHeader.vue b/frontend/src/components/GlossDetail/components/GlossHeader.vue
index c6eea41..3571cf5 100644
--- a/frontend/src/components/GlossDetail/components/GlossHeader.vue
+++ b/frontend/src/components/GlossDetail/components/GlossHeader.vue
@@ -77,9 +77,9 @@
         :label="translate('exitEditMode')"
         @click="emit('cancelGloss')"
       />
-      <!-- Send Request Button - shown when request is not completed -->
+      <!-- Send Request — only outside the draft stepper (submit lives on last step) -->
       <q-btn
-        v-if="requestStatus === 'NOT_COMPLETED'"
+        v-if="requestStatus === 'NOT_COMPLETED' && !isDraft"
         color="primary"
         icon="send"
         :label="translate('sendRequest')"
@@ -138,6 +138,7 @@ const props = defineProps<{
   glossData: GlossData,
   editMode: boolean,
   isConfirmRequestPage?: boolean,
+  isDraft?: boolean,
   requestStatus?: RequestStatus | undefined,
   submitting?: boolean | undefined,
   allowEdit: boolean
diff --git a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
index 04b3a87..e890c68 100644
--- a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
@@ -146,7 +146,7 @@ const addTranslation = () => {
   });
 };
 
-const saveTranslation = async (translation: GlossTranslation) => {
+const saveTranslation = async (translation: GlossTranslation, silent = false) => {
   try {
     loading.value = true;
     let response;
@@ -165,22 +165,44 @@ const saveTranslation = async (translation: GlossTranslation) => {
 
     if (response.data) {
       emit('update:glossData', response.data);
-      $q.notify({
-        type: 'positive',
-        message: translate(translation.id ? 'translationUpdatedSuccessfully' : 'translationCreatedSuccessfully'),
-      });
+      if (!silent) {
+        $q.notify({
+          type: 'positive',
+          message: translate(translation.id ? 'translationUpdatedSuccessfully' : 'translationCreatedSuccessfully'),
+        });
+      }
     }
   } catch (error) {
     console.error('Error saving translation:', error);
-    $q.notify({
-      type: 'negative',
-      message: translate('errors.failedToSaveTranslation'),
-    });
+    if (!silent) {
+      $q.notify({
+        type: 'negative',
+        message: translate('errors.failedToSaveTranslation'),
+      });
+    }
+    throw error;
   } finally {
     loading.value = false;
   }
 };
 
+async function saveAll(silent = false): Promise<void> {
+  for (const translation of glossTranslations.value) {
+    if (!translation.translation?.trim()) continue;
+    await saveTranslation(translation, silent);
+  }
+}
+
+function getStepValidationErrors(): string[] {
+  const hasTranslation = glossTranslations.value.some(t => t.translation?.trim());
+  if (!hasTranslation) {
+    return [translate('validation.senseTranslationRequired', { senseTitle: localGlossData.value.gloss })];
+  }
+  return [];
+}
+
+defineExpose({ saveAll, getStepValidationErrors });
+
 const deleteTranslation = async (translation: GlossTranslation) => {
   if (!translation.id) {
     const index = localGlossData.value.glossTranslations?.findIndex((t) => t === translation) ?? -1;
diff --git a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
index dedb7aa..359a412 100644
--- a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
+++ b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
@@ -17,6 +17,7 @@
         :done="step > 1"
       >
         <DefinitionsComponent
+          ref="definitionsRef"
           :gloss-data="localGlossData"
           :edit-mode="editMode"
           :allow-edit="editMode"
@@ -30,7 +31,8 @@
             unelevated
             :label="translate('next')"
             icon-right="arrow_forward"
-            @click="step = 2"
+            :loading="stepLoading"
+            @click="goToStep(2)"
           />
         </q-stepper-navigation>
       </q-step>
@@ -42,6 +44,7 @@
         :done="step > 2"
       >
         <VideosComponent
+          ref="videosRef"
           v-model="localGlossData"
           :edit-mode="editMode"
           :inline-edit="true"
@@ -54,6 +57,7 @@
             color="primary"
             :label="translate('back')"
             icon="arrow_back"
+            :disable="stepLoading"
             @click="step = 1"
           />
           <q-btn
@@ -61,7 +65,8 @@
             unelevated
             :label="translate('next')"
             icon-right="arrow_forward"
-            @click="step = 3"
+            :loading="stepLoading"
+            @click="goToStep(3)"
           />
         </q-stepper-navigation>
       </q-step>
@@ -80,6 +85,7 @@
           default-opened
         >
           <ExamplesComponent
+            ref="examplesRef"
             :gloss-data="localGlossData"
             :edit-mode="editMode"
             :inline-edit="true"
@@ -102,14 +108,23 @@
           />
         </q-expansion-item>
 
-        <q-stepper-navigation class="row justify-start q-mt-md">
+        <q-stepper-navigation class="row justify-between q-mt-md">
           <q-btn
             flat
             color="primary"
             :label="translate('back')"
             icon="arrow_back"
+            :disable="stepLoading || submitting"
             @click="step = 2"
           />
+          <q-btn
+            color="primary"
+            unelevated
+            icon="send"
+            :label="translate('sendRequest')"
+            :loading="stepLoading || submitting"
+            @click="handleSend"
+          />
         </q-stepper-navigation>
       </q-step>
     </q-stepper>
@@ -189,22 +204,31 @@
 import translate from 'src/utils/translate';
 import { ref, watch } from 'vue';
 import type { GlossData } from 'src/types/models';
+import { useQuasar } from 'quasar';
 import ExamplesComponent from './ExamplesComponent/ExamplesComponent.vue';
 import VideosComponent from './VideosComponent.vue';
 import RelatedGlosses from './RelatedGlosses.vue';
 import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vue';
 
+const $q = useQuasar()
 const selectedContent = ref<string>('definitions')
 const step = ref(1)
+const stepLoading = ref(false)
+
+const definitionsRef = ref<InstanceType<typeof DefinitionsComponent> | null>(null)
+const videosRef = ref<InstanceType<typeof VideosComponent> | null>(null)
+const examplesRef = ref<InstanceType<typeof ExamplesComponent> | null>(null)
 
 const emit = defineEmits<{
   (e: 'update:glossData', glossData: GlossData): void
+  (e: 'submitRequest'): void
 }>();
 
-const { glossData, editMode, isDraft = false } = defineProps<{
+const { glossData, editMode, isDraft = false, submitting = false } = defineProps<{
   glossData: GlossData;
   editMode: boolean;
   isDraft?: boolean;
+  submitting?: boolean;
 }>();
 
 const localGlossData = ref<GlossData>(glossData);
@@ -217,6 +241,62 @@ const updateGlossData = (updated: GlossData) => {
   localGlossData.value = updated;
   emit('update:glossData', updated);
 }
+
+function showValidationErrors(errors: string[]) {
+  $q.dialog({
+    title: translate('validationErrors'),
+    message: `
+      <ul style="list-style-type: disc; margin: 0; padding-left: 20px;">
+        ${errors.map(error => `<li>${error}</li>`).join('')}
+      </ul>
+    `,
+    html: true,
+    style: 'min-width: 300px',
+    ok: {
+      label: translate('ok'),
+      flat: true,
+      color: 'primary',
+    },
+  })
+}
+
+async function goToStep(targetStep: number) {
+  stepLoading.value = true
+  try {
+    if (targetStep === 2) {
+      const errors = definitionsRef.value?.getStepValidationErrors() ?? []
+      if (errors.length > 0) {
+        showValidationErrors(errors)
+        return
+      }
+      const saved = await definitionsRef.value?.saveAll(true)
+      if (saved === false) return
+    }
+
+    if (targetStep === 3) {
+      const errors = videosRef.value?.getStepValidationErrors() ?? []
+      if (errors.length > 0) {
+        showValidationErrors(errors)
+        return
+      }
+      await videosRef.value?.saveAll(true)
+    }
+
+    step.value = targetStep
+  } finally {
+    stepLoading.value = false
+  }
+}
+
+async function handleSend() {
+  stepLoading.value = true
+  try {
+    await examplesRef.value?.saveAll(true)
+    emit('submitRequest')
+  } finally {
+    stepLoading.value = false
+  }
+}
 </script>
 
 <style scoped>
diff --git a/frontend/src/components/GlossDetail/components/VideosComponent.vue b/frontend/src/components/GlossDetail/components/VideosComponent.vue
index 3ad1d6b..708765e 100644
--- a/frontend/src/components/GlossDetail/components/VideosComponent.vue
+++ b/frontend/src/components/GlossDetail/components/VideosComponent.vue
@@ -233,7 +233,7 @@ const removeVideo = async (index: number) => {
   }
 }
 
-const updateSignVideo = async (video: SignVideo, index: number) => {
+const updateSignVideo = async (video: SignVideo, index: number, silent = false) => {
   try {
     const currentVideo = glossData.value.glossVideos[index];
     if (!currentVideo) return;
@@ -281,19 +281,57 @@ const updateSignVideo = async (video: SignVideo, index: number) => {
       isCreatingVideo.value = false;
     }
 
-    $q.notify({
-      type: 'positive',
-      message: currentVideo.id ? translate('videoUpdated') : translate('videoCreated')
-    });
+    if (!silent) {
+      $q.notify({
+        type: 'positive',
+        message: currentVideo.id ? translate('videoUpdated') : translate('videoCreated')
+      });
+    }
   } catch (error) {
     console.error('Error saving video:', error);
-    $q.notify({
-      type: 'negative',
-      message: translate('errorSavingVideo')
-    });
+    if (!silent) {
+      $q.notify({
+        type: 'negative',
+        message: translate('errorSavingVideo')
+      });
+    }
+    throw error;
   }
 }
 
+function getStepValidationErrors(): string[] {
+  const errors: string[] = []
+  const videos = glossData.value.glossVideos || []
+
+  if (!videos.length) {
+    errors.push(translate('validation.videoRequired'))
+    return errors
+  }
+
+  for (const video of videos) {
+    const { isValid, errors: videoErrors } = validateVideo(video)
+    if (!isValid) {
+      errors.push(...videoErrors)
+    }
+  }
+
+  return errors
+}
+
+async function saveAll(silent = false): Promise<boolean> {
+  const list = [...glossData.value.glossVideos]
+  for (let index = 0; index < list.length; index++) {
+    const video = glossData.value.glossVideos[index]
+    if (!video) continue
+    const hasContent = video.videos?.some(v => v.url?.trim())
+    if (!hasContent && !video.id) continue
+    await updateSignVideo(video, index, silent)
+  }
+  return true
+}
+
+defineExpose({ saveAll, getStepValidationErrors })
+
 const updateVideoData = (index: number, videoData: PhonologyData) => {
   if (glossData.value.glossVideos[index]) {
     glossData.value.glossVideos[index].videoData = videoData;
diff --git a/frontend/src/components/Shared/EditableModule.vue b/frontend/src/components/Shared/EditableModule.vue
index a9f27e3..81e47b6 100644
--- a/frontend/src/components/Shared/EditableModule.vue
+++ b/frontend/src/components/Shared/EditableModule.vue
@@ -2,7 +2,7 @@
   <q-form
     class="editable-module"
     :class="{ editing: effectiveEditing, 'inline-mode': inlineEdit }"
-    @submit="saveEdit"
+    @submit.prevent="handleSubmit"
   >
     <div class="column no-wrap">
       <div class="row items-start justify-between q-mb-sm">
@@ -72,19 +72,6 @@
       />
     </div>
 
-    <div
-      v-else-if="inlineEdit && allowEdit"
-      class="row justify-end q-mt-sm"
-    >
-      <q-btn
-        dense
-        unelevated
-        color="primary"
-        icon="save"
-        :label="translate('save')"
-        type="submit"
-      />
-    </div>
   </q-form>
 </template>
 
@@ -122,6 +109,12 @@ function startEdit() {
   isEditing.value = true
 }
 
+function handleSubmit() {
+  if (!props.inlineEdit) {
+    saveEdit()
+  }
+}
+
 function saveEdit() {
   if (props.validateBeforeSave) {
     const { isValid, errors } = props.validateBeforeSave()

From 8d8fbacff039cf4efb95ec51531d3e8ae18a5854 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Wed, 17 Jun 2026 19:00:54 +0200
Subject: [PATCH 05/17] feat: more UI improvements on loss view

---
 .../skills/signbank-dev-environment/SKILL.md  |   2 +-
 .env.example                                  |   3 +-
 .../migration.sql                             |   0
 backend/src/auth/auth.controller.ts           |  20 +-
 backend/src/auth/auth.service.ts              |  18 +-
 backend/src/auth/dto/login.dto.ts             |  10 +
 .../src/typesense/types/gloss-index.type.ts   |   1 +
 backend/src/typesense/typesense.config.ts     |   1 +
 backend/src/typesense/typesense.service.ts    |  85 +++++-
 docker-compose-local.yaml                     |   6 +-
 frontend/Dockerfile.local                     |   2 -
 frontend/eslint.config.js                     |  27 +-
 frontend/package.json                         |   2 +-
 frontend/quasar.config.ts                     |  11 +-
 .../GlossDetail/GlossDetailComponent.vue      |  30 +-
 .../DefinitionCardDesktop.vue                 |  30 +-
 .../DefinitionCardMobile.vue                  |  24 +-
 .../DefinitionsComponent.vue                  |  15 +-
 .../ExampleTranslationsComponent.vue          |  67 +++--
 .../ExamplesComponent/ExampleCardDesktop.vue  |  15 +-
 .../ExamplesComponent/ExampleCardMobile.vue   |   8 +-
 .../ExamplesComponent/ExamplesComponent.vue   |   8 +-
 .../components/GlossTranslationsComponent.vue |  54 +++-
 .../components/GlossVideoComponent.vue        | 194 ++++++++++---
 .../GlossDetail/components/MainContent.vue    | 274 ++++++++++++++++--
 .../components/MoreContentComponent.vue       |   4 +-
 .../GlossDetail/components/RelatedGlosses.vue |   6 +-
 .../GlossDetail/components/SignVideoAside.vue |  84 ++++++
 .../components/VideosComponent.vue            |  38 ++-
 frontend/src/components/HeaderComponent.vue   |  32 +-
 .../Search/components/ResultCard.vue          |  81 +++---
 .../Search/components/SearchInput.vue         |  12 -
 frontend/src/hooks/useAuthentication.ts       |   3 +
 frontend/src/i18n/ca-ES/index.ts              |   2 +
 frontend/src/i18n/en-US/index.ts              |   2 +
 frontend/src/i18n/es-ES/index.ts              |   2 +
 frontend/src/i18n/translateKeys.ts            |   2 +
 frontend/src/layouts/MainLayout.vue           |   2 +-
 frontend/src/pages/GlossPage.vue              |  47 +--
 frontend/src/services/search.service.ts       |   1 +
 nginx/default.conf                            |   5 +-
 41 files changed, 939 insertions(+), 291 deletions(-)
 rename backend/prisma/migrations/{20260321121000_init => 20250101000001_init}/migration.sql (100%)
 create mode 100644 backend/src/auth/dto/login.dto.ts
 create mode 100644 frontend/src/components/GlossDetail/components/SignVideoAside.vue

diff --git a/.cursor/skills/signbank-dev-environment/SKILL.md b/.cursor/skills/signbank-dev-environment/SKILL.md
index 703912d..8109de1 100644
--- a/.cursor/skills/signbank-dev-environment/SKILL.md
+++ b/.cursor/skills/signbank-dev-environment/SKILL.md
@@ -86,7 +86,7 @@ openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
 
 | Symptom | Check |
 |---------|-------|
-| 502 from nginx | `make logs`, ensure backend/frontend are healthy |
+| Frontend changes not hot-reloading (Windows/macOS) | Ensure `CHOKIDAR_USEPOLLING=true` in local compose; recreate frontend: `make rebuild s=frontend` |
 | DB connection errors | `DATABASE_URL_DOCKER` in backend env, postgres healthcheck |
 | Search empty/stale | Typesense init runs on backend boot; see `signbank-search-typesense` skill |
 | Videos 404 | Dufs volume `./FileServer`; nginx path `/lscassets` → dufs |
diff --git a/.env.example b/.env.example
index fbc8b6c..3be52a5 100644
--- a/.env.example
+++ b/.env.example
@@ -14,9 +14,10 @@ POSTGRES_DB=signbank
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/signbank
 DATABASE_URL_DOCKER=postgresql://postgres:postgres@postgres:5432/signbank
 
-# --- Admin account (created on first startup via seed) ---
+# --- Admin bootstrap (only used when no admin exists in DB; local seed creates admin1–10) ---
 ADMIN_EMAIL=admin@example.com
 ADMIN_PASSWORD=changeme
+# Local dev login after seed: admin1@signbank.com / admin1123 (pattern admin{N}@signbank.com / admin{N}123)
 
 # --- Typesense search engine ---
 TYPESENSE_API_KEY=your-typesense-api-key-here
diff --git a/backend/prisma/migrations/20260321121000_init/migration.sql b/backend/prisma/migrations/20250101000001_init/migration.sql
similarity index 100%
rename from backend/prisma/migrations/20260321121000_init/migration.sql
rename to backend/prisma/migrations/20250101000001_init/migration.sql
diff --git a/backend/src/auth/auth.controller.ts b/backend/src/auth/auth.controller.ts
index c193c8e..78e1345 100644
--- a/backend/src/auth/auth.controller.ts
+++ b/backend/src/auth/auth.controller.ts
@@ -1,9 +1,17 @@
 // src/auth/auth.controller.ts
-import { Body, Controller, Post, Get, UseGuards, Req } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Post,
+  Get,
+  UseGuards,
+  UnauthorizedException,
+} from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { JwtGuard } from './guard/jwt.guard';
 import { GetUser } from './decorator/get-user.decorator';
 import { Public } from './decorator/public.decorator';
+import { LoginDto } from './dto/login.dto';
 
 @Controller('auth')
 export class AuthController {
@@ -11,16 +19,16 @@ export class AuthController {
 
   @Public()
   @Post('login')
-  async login(@Body() loginDto: { email: string; password: string }) {
+  async login(@Body() loginDto: LoginDto) {
     const user = await this.authService.validateUser(
       loginDto.email,
-      loginDto.password
+      loginDto.password,
     );
-    
+
     if (!user) {
-      return { message: 'Invalid credentials' };
+      throw new UnauthorizedException('Invalid credentials');
     }
-    
+
     return this.authService.login(user);
   }
 
diff --git a/backend/src/auth/auth.service.ts b/backend/src/auth/auth.service.ts
index 892ba2d..384e275 100644
--- a/backend/src/auth/auth.service.ts
+++ b/backend/src/auth/auth.service.ts
@@ -14,10 +14,20 @@ export class AuthService {
   ) {}
 
   async validateUser(email: string, password: string): Promise<any> {
-    const user = await this.users.findByEmail(email);
-    if (!user) return null;
-    const isPasswordValid = await argon2.verify(user.password, password);
-    if (!isPasswordValid) return null;
+    if (!email?.trim() || password == null || password === '') {
+      return null;
+    }
+
+    const user = await this.users.findByEmail(email.trim());
+    if (!user?.password) return null;
+
+    try {
+      const isPasswordValid = await argon2.verify(user.password, password);
+      if (!isPasswordValid) return null;
+    } catch {
+      return null;
+    }
+
     const { password: _, ...result } = user;
     return result;
   }
diff --git a/backend/src/auth/dto/login.dto.ts b/backend/src/auth/dto/login.dto.ts
new file mode 100644
index 0000000..77c0139
--- /dev/null
+++ b/backend/src/auth/dto/login.dto.ts
@@ -0,0 +1,10 @@
+import { IsEmail, IsString, MinLength } from 'class-validator';
+
+export class LoginDto {
+  @IsEmail()
+  email: string;
+
+  @IsString()
+  @MinLength(1)
+  password: string;
+}
diff --git a/backend/src/typesense/types/gloss-index.type.ts b/backend/src/typesense/types/gloss-index.type.ts
index c5c001b..aa8c120 100644
--- a/backend/src/typesense/types/gloss-index.type.ts
+++ b/backend/src/typesense/types/gloss-index.type.ts
@@ -21,6 +21,7 @@ export interface GlossIndex {
   url: string;
   signVideoTitle: string;
   lexicalCategory: LexicalCategory | string;
+  lexicalCategories: (LexicalCategory | string)[];
   description: string;
   hands: Hand;
   configuration: HandConfiguration | '';
diff --git a/backend/src/typesense/typesense.config.ts b/backend/src/typesense/typesense.config.ts
index 6fb8ef9..99e4a28 100644
--- a/backend/src/typesense/typesense.config.ts
+++ b/backend/src/typesense/typesense.config.ts
@@ -11,6 +11,7 @@ export const videosSchema: CollectionCreateSchema = {
     { name: 'url', type: 'string' },
     { name: 'signVideoTitle', type: 'string', facet: true, sort: true },
     { name: 'lexicalCategory', type: 'string', facet: true },
+    { name: 'lexicalCategories', type: 'string[]', facet: true, optional: true },
     { name: 'description', type: 'string', facet: true },
     { name: 'hands', type: 'string', facet: true },
     { name: 'configuration', type: 'string', facet: true },
diff --git a/backend/src/typesense/typesense.service.ts b/backend/src/typesense/typesense.service.ts
index 820e952..9c32b9c 100644
--- a/backend/src/typesense/typesense.service.ts
+++ b/backend/src/typesense/typesense.service.ts
@@ -140,6 +140,13 @@ export class TypesenseService implements OnModuleInit {
     }
 
     const videoData = primarySignVideo.videoData;
+    const lexicalCategories = [
+      ...new Set(
+        glossData.definitions
+          .map((definition) => definition.lexicalCategory)
+          .filter((category): category is NonNullable<typeof category> => Boolean(category)),
+      ),
+    ];
 
     return {
       id: glossData.id,
@@ -147,7 +154,8 @@ export class TypesenseService implements OnModuleInit {
       gloss: glossData.gloss,
       url: primaryVideo?.url ?? '',
       signVideoTitle: primarySignVideo.title,
-      lexicalCategory: primaryDefinition?.lexicalCategory ?? '',
+      lexicalCategory: primaryDefinition?.lexicalCategory ?? lexicalCategories[0] ?? '',
+      lexicalCategories,
       description,
       hands: videoData?.hands ?? Hand.RIGHT,
       configuration: videoData?.configuration ?? '',
@@ -201,13 +209,36 @@ export class TypesenseService implements OnModuleInit {
     return { success: true, action: 'upserted' as const };
   }
 
+  private getMissingSchemaFields(fields: { name: string }[]): string[] {
+    const actualFieldNames = new Set(fields.map((field) => field.name));
+    return videosSchema.fields
+      .map((field) => field.name)
+      .filter((name) => name !== 'id' && !actualFieldNames.has(name));
+  }
+
   async ensureCollectionExists() {
     try {
-      await this.client.collections(VIDEOS_COLLECTION_NAME).retrieve();
+      const collection = await this.client
+        .collections(VIDEOS_COLLECTION_NAME)
+        .retrieve();
+      const missingFields = this.getMissingSchemaFields(collection.fields);
+
+      if (missingFields.length === 0) {
+        return {
+          success: true,
+          created: false,
+          message: 'Collection already exists',
+        };
+      }
+
+      this.logger.warn(
+        `Typesense schema out of date (missing: ${missingFields.join(', ')}). Recreating collection...`,
+      );
+      await this.recreateCollection();
       return {
         success: true,
-        created: false,
-        message: 'Collection already exists',
+        created: true,
+        message: 'Collection recreated due to schema changes',
       };
     } catch (error) {
       if (error.httpStatus !== 404) {
@@ -285,6 +316,49 @@ export class TypesenseService implements OnModuleInit {
     }
   }
 
+  private async listIndexedDocumentIds(): Promise<string[]> {
+    const ids: string[] = [];
+    const perPage = 250;
+    let page = 1;
+
+    while (true) {
+      const results = await this.client
+        .collections(VIDEOS_COLLECTION_NAME)
+        .documents()
+        .search({
+          q: '*',
+          query_by: 'gloss',
+          per_page: perPage,
+          page,
+        });
+
+      const hits = results.hits ?? [];
+      for (const hit of hits) {
+        ids.push((hit.document as { id: string }).id);
+      }
+
+      if (hits.length < perPage) {
+        break;
+      }
+      page++;
+    }
+
+    return ids;
+  }
+
+  private async removeOrphanedDocuments(validIds: Set<string>) {
+    const indexedIds = await this.listIndexedDocumentIds();
+    const orphanedIds = indexedIds.filter((id) => !validIds.has(id));
+
+    if (orphanedIds.length === 0) {
+      return 0;
+    }
+
+    await Promise.all(orphanedIds.map((id) => this.deleteDocument(id)));
+    this.logger.log(`Removed ${orphanedIds.length} stale documents from search index`);
+    return orphanedIds.length;
+  }
+
   async syncAllVideos() {
     this.logger.log('Starting gloss search sync...');
     try {
@@ -303,6 +377,9 @@ export class TypesenseService implements OnModuleInit {
         }
       }
 
+      const validIds = new Set(documents.map((document) => document.id));
+      await this.removeOrphanedDocuments(validIds);
+
       const BATCH_SIZE = 100;
       for (let i = 0; i < documents.length; i += BATCH_SIZE) {
         await this.importDocuments(documents.slice(i, i + BATCH_SIZE));
diff --git a/docker-compose-local.yaml b/docker-compose-local.yaml
index 620735c..2074b2b 100644
--- a/docker-compose-local.yaml
+++ b/docker-compose-local.yaml
@@ -18,7 +18,7 @@ services:
       - TYPESENSE_PORT=${TYPESENSE_PORT}
       - JWT_SECRET=${JWT_SECRET}
       - JWT_EXPIRATION=${JWT_EXPIRATION:-24h}
-      - SEED_DB=true
+      - SEED_DB=${SEED_DB:-false}
     ports:
       - 9229:9229
     cap_add:
@@ -52,6 +52,9 @@ services:
     container_name: frontend
     environment:
       - BASE_URL=${BASE_URL}
+      # Required on Windows/macOS Docker bind mounts — inotify events don't reach the container
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
     networks:
       - signbank
     volumes:
@@ -112,6 +115,7 @@ services:
       - signbank
     depends_on:
       - backend
+      - frontend
 
   db-backup:
     image: kartoza/pg-backup:17-3.5
diff --git a/frontend/Dockerfile.local b/frontend/Dockerfile.local
index dce309c..97e61d2 100644
--- a/frontend/Dockerfile.local
+++ b/frontend/Dockerfile.local
@@ -3,8 +3,6 @@ FROM node:22-alpine
 WORKDIR /app
 COPY package*.json ./
 
-ENV BASE_URL={BASE_URL}
-
 COPY . .
 RUN yarn install
 RUN yarn global add @quasar/cli 
diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js
index 7ca1959..d761b4b 100644
--- a/frontend/eslint.config.js
+++ b/frontend/eslint.config.js
@@ -1,9 +1,13 @@
 import js from '@eslint/js'
 import globals from 'globals'
+import { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import pluginVue from 'eslint-plugin-vue'
 import pluginQuasar from '@quasar/app-vite/eslint'
 import vueTsEslintConfig from '@vue/eslint-config-typescript'
 
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
 export default [
   {
     /**
@@ -38,35 +42,14 @@ export default [
 
   // https://github.com/vuejs/eslint-config-typescript
   ...vueTsEslintConfig({
-    // Optional: extend additional configurations from typescript-eslint'.
-    // Supports all the configurations in
-    // https://typescript-eslint.io/users/configs#recommended-configurations
     extends: [
-      // By default, only the 'recommendedTypeChecked' rules are enabled.
       'recommendedTypeChecked'
-      // You can also manually enable the stylistic rules.
-      // "stylistic",
-
-      // Other utility configurations, such as 'eslintRecommended', (note that it's in camelCase)
-      // are also extendable here. But we don't recommend using them directly.
     ],
-    // Add parserOptions for TypeScript type checking
-    parserOptions: {
-      project: ['./tsconfig.eslint.json'],
-      tsconfigRootDir: '.',
-      extraFileExtensions: ['.vue']
-    }
+    rootDir: __dirname,
   }),
 
   {
     files: ['**/*.ts', '**/*.vue'],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.eslint.json'],
-        tsconfigRootDir: '.',
-        extraFileExtensions: ['.vue']
-      }
-    },
     rules: {
       '@typescript-eslint/consistent-type-imports': [
         'error',
diff --git a/frontend/package.json b/frontend/package.json
index 81de781..fb0cb66 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,7 +27,7 @@
     "eslint": "^9.14.0",
     "eslint-plugin-vue": "^9.30.0",
     "globals": "^15.12.0",
-    "vue-tsc": "^2.0.29",
+    "vue-tsc": "^3.0.0",
     "@vue/eslint-config-typescript": "^14.1.3",
     "vite-plugin-checker": "^0.8.0",
     "@types/node": "^20.5.9",
diff --git a/frontend/quasar.config.ts b/frontend/quasar.config.ts
index f86411b..cf86527 100644
--- a/frontend/quasar.config.ts
+++ b/frontend/quasar.config.ts
@@ -71,7 +71,16 @@ export default defineConfig(() => {
       // polyfillModulePreload: true,
       // distDir
 
-      // extendViteConf (viteConf) {},
+      extendViteConf (viteConf) {
+        if (process.env.CHOKIDAR_USEPOLLING === 'true') {
+          viteConf.server = viteConf.server ?? {};
+          viteConf.server.watch = {
+            ...viteConf.server.watch,
+            usePolling: true,
+            interval: Number(process.env.CHOKIDAR_INTERVAL) || 1000,
+          };
+        }
+      },
       // viteVuePluginOptions: {},
 
       vitePlugins: [
diff --git a/frontend/src/components/GlossDetail/GlossDetailComponent.vue b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
index 064773f..10b1fcb 100644
--- a/frontend/src/components/GlossDetail/GlossDetailComponent.vue
+++ b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
@@ -2,6 +2,7 @@
   <q-card
     flat
     class="gloss-detail-card"
+    :class="{ 'gloss-detail-card--constrained': constrainedLayout }"
   >
     <GlossRequestProgress
       v-if="isDraft"
@@ -26,10 +27,12 @@
 
     <MainContent
       v-if="!contentEditable"
+      class="gloss-detail-card__main"
       :gloss-data="glossData"
     />
 
     <MoreContentComponent
+      v-if="contentEditable || isDraft"
       :gloss-data="glossData"
       :edit-mode="contentEditable"
       :is-draft="isDraft"
@@ -59,13 +62,14 @@ const emit = defineEmits<{
   (e: 'submitRequest'): void
 }>()
 
-const { glossData, editMode, allowEdit = true, isConfirmRequestPage = false, requestStatus, submitting = false } = defineProps<{
+const { glossData, editMode, allowEdit = true, isConfirmRequestPage = false, requestStatus, submitting = false, constrainedLayout = false } = defineProps<{
   glossData: GlossData,
   editMode: boolean,
   allowEdit: boolean,
   isConfirmRequestPage?: boolean | undefined,
   requestStatus?: RequestStatus | undefined,
-  submitting?: boolean | undefined
+  submitting?: boolean | undefined,
+  constrainedLayout?: boolean | undefined,
 }>()
 
 const isDraft = computed(() =>
@@ -129,4 +133,26 @@ const handleGlossDataUpdate = (updatedGlossData: GlossData) => {
   width: 100%;
   margin: 0 auto;
 }
+
+.gloss-detail-card--constrained {
+  flex: 1 1 0;
+  min-height: 0;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.gloss-detail-card--constrained > :not(.gloss-detail-card__main) {
+  flex: 0 0 auto;
+}
+
+.gloss-detail-card--constrained .gloss-detail-card__main {
+  flex: 1 1 0;
+  min-height: 0;
+  height: 100%;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
 </style>
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
index 42bf9ba..96280a3 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
@@ -26,10 +26,16 @@
           {{ definition.title }}
         </div>
 
-        <!-- Definition Content - Side by Side Layout -->
-        <div class="row q-gutter-md q-mb-lg q-items-start">
+        <!-- Definition Content -->
+        <div
+          class="q-mb-lg"
+          :class="hideDefinitionVideo ? 'column' : 'row q-gutter-md q-items-start'"
+        >
           <!-- Definition Video Section -->
-          <div class="col-auto" v-if="definition.videoDefinitionUrl || isEditing">
+          <div
+            v-if="!hideDefinitionVideo && (definition.videoDefinitionUrl || isEditing)"
+            class="col-auto"
+          >
             <UploadVideoComponent
               v-if="isEditing && !definition.videoDefinitionUrl"
               video-type="definition"
@@ -44,11 +50,10 @@
                 ref="videoPlayer"
                 controls
                 autoplay
-                class="rounded-borders shadow-2"
+                class="rounded-borders shadow-2 definition-video"
                 :src="getVideoUrl(definition.videoDefinitionUrl)"
                 muted
                 @error="$emit('videoError', $event)"
-                style="max-width: 100%; max-height: 250px; width: auto; height: auto;"
               />
               <q-btn
                 v-if="isEditing"
@@ -63,7 +68,7 @@
           </div>
 
           <!-- Definition Text Section -->
-          <div class="col">
+          <div :class="hideDefinitionVideo ? '' : 'col'">
             <q-input
               v-if="isEditing"
               v-model="definition.definition"
@@ -107,6 +112,7 @@ const props = defineProps<{
   definition: Definition;
   allowEdit: boolean;
   inlineEdit?: boolean;
+  hideDefinitionVideo?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -117,4 +123,14 @@ const emit = defineEmits<{
   (e: 'videoError', event: Event): void;
   (e: 'updateTranslations', definition: Definition, translations: DefinitionTranslation[]): void;
 }>();
-</script> 
\ No newline at end of file
+</script>
+
+<style scoped>
+.definition-video {
+  max-width: 100%;
+  max-height: 250px;
+  width: auto;
+  height: auto;
+  object-fit: contain;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
index 6946d90..f6693d7 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
@@ -24,9 +24,9 @@
           {{ definition.title }}
         </div>
 
-        <!-- Definition Content - Stacked Layout for Mobile -->
+        <!-- Definition Content -->
         <div class="column q-gutter-md q-mb-lg">
-          <!-- Definition Text Section (First on Mobile) -->
+          <!-- Definition Text Section -->
           <div class="col">
             <q-input
               v-if="isEditing"
@@ -45,8 +45,11 @@
             </div>
           </div>
 
-          <!-- Definition Video Section (Second on Mobile) -->
-          <div class="col" v-if="definition.videoDefinitionUrl || isEditing">
+          <!-- Definition Video Section -->
+          <div
+            v-if="!hideDefinitionVideo && (definition.videoDefinitionUrl || isEditing)"
+            class="col"
+          >
             <UploadVideoComponent
               v-if="isEditing && !definition.videoDefinitionUrl"
               video-type="definition"
@@ -61,11 +64,10 @@
                 ref="videoPlayer"
                 controls
                 autoplay
-                class="rounded-borders shadow-2 full-width"
+                class="rounded-borders shadow-2 definition-video"
                 :src="getVideoUrl(definition.videoDefinitionUrl)"
                 muted
                 @error="$emit('videoError', $event)"
-                style="max-width: 100%; max-height: 200px; width: 100%; height: auto; object-fit: contain;"
               />
               <q-btn
                 v-if="isEditing"
@@ -105,6 +107,7 @@ const props = defineProps<{
   definition: Definition;
   allowEdit: boolean;
   inlineEdit?: boolean;
+  hideDefinitionVideo?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -118,4 +121,11 @@ const emit = defineEmits<{
 </script>
 
 <style scoped>
-</style> 
\ No newline at end of file
+.definition-video {
+  max-width: 100%;
+  max-height: 200px;
+  width: 100%;
+  height: auto;
+  object-fit: contain;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
index 5d08479..ca351b5 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
@@ -1,7 +1,7 @@
 <template>
   <q-card-section class="column">
     <div
-      v-if="!inlineEdit"
+      v-if="!inlineEdit && !hideSectionTitle"
       class="text-h5 q-mb-md row justify-between items-center"
     >
       {{ translate('definitions') }}
@@ -62,6 +62,7 @@
           :definition="definition"
           :allow-edit="allowEdit"
           :inline-edit="inlineEdit"
+          :hide-definition-video="hideDefinitionVideo"
           @save="saveDefinition"
           @delete="deleteDefinition"
           @upload-video="uploadVideo"
@@ -78,6 +79,7 @@
         :definition="definition"
         :allow-edit="allowEdit"
         :inline-edit="inlineEdit"
+        :hide-definition-video="hideDefinitionVideo"
         @save="saveDefinition"
         @delete="deleteDefinition"
         @upload-video="uploadVideo"
@@ -86,8 +88,11 @@
         @update-translations="updateDefinitionTranslations"
       />
     </q-list>
-    <!-- Translations of the sense -->
-    <div class="column">
+    <!-- Sense-level gloss translations -->
+    <div
+      v-if="!hideGlossTranslations"
+      class="column"
+    >
       <q-btn
         v-if="inlineEdit && allowEdit && definitions.length > 0"
         flat
@@ -103,6 +108,7 @@
         :gloss-data="glossData"
         :edit-mode="editMode"
         :inline-edit="inlineEdit"
+        :hide-section-title="hideSectionTitle"
         @update:gloss-data="emit('update:glossData', $event)"
       />
     </div>
@@ -220,6 +226,9 @@ const props = defineProps<{
   editMode: boolean;
   glossData: GlossData;
   inlineEdit?: boolean;
+  hideSectionTitle?: boolean;
+  hideGlossTranslations?: boolean;
+  hideDefinitionVideo?: boolean;
 }>();
 
 const inlineDefinition = ref({
diff --git a/frontend/src/components/GlossDetail/components/ExampleTranslationsComponent.vue b/frontend/src/components/GlossDetail/components/ExampleTranslationsComponent.vue
index a4d0213..d8c1003 100644
--- a/frontend/src/components/GlossDetail/components/ExampleTranslationsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/ExampleTranslationsComponent.vue
@@ -1,32 +1,17 @@
 <template>
-  <q-expansion-item 
+  <div
     v-if="translations.length > 0 || allowEdit"
-    :label="translate('translations')"
+    class="example-translations"
   >
-    <template #header>
-      <div class="text-subtitle1 q-mb-sm">
-        {{ translate('translations') }}
-      </div>
-    </template>
     <div
-      v-for="(translation, index) in translations.sort((a, b) => {
-        // First sort by isNew (new items first)
-        if (a.isNew && !b.isNew) return -1;
-        if (!a.isNew && b.isNew) return 1;
-        
-        // Then sort by language: Catalan, Spanish, English
-        const languageOrder: Record<string, number> = { 'CATALAN': 1, 'SPANISH': 2, 'ENGLISH': 3 };
-        const aOrder = languageOrder[a.language] || 999;
-        const bOrder = languageOrder[b.language] || 999;
-        return aOrder - bOrder;
-      })"
+      v-for="(translation, index) in sortedTranslations"
       :key="translation.id || index"
       class="q-mb-sm"
     >
       <EditableModule
         :allow-edit="allowEdit"
-        :initial-edit-state="translation.isNew || false" 
-        :show-delete="true"
+        :initial-edit-state="translation.isNew || false"
+        :show-delete="allowEdit"
         :custom-edit-label="translate('editTranslation')"
         :custom-delete-label="translate('deleteTranslation')"
         @save="() => saveTranslation(translation)"
@@ -35,7 +20,7 @@
       >
         <template #default="{ isEditing }">
           <div class="q-mx-md">
-            <div class="row items-center q-gutter-sm ">
+            <div class="row items-center q-gutter-sm">
               <LanguageSelector
                 v-if="isEditing"
                 v-model="translation.language"
@@ -43,6 +28,7 @@
               />
               <q-chip
                 v-else
+                dense
               >
                 {{ translate(translation.language) }}
               </q-chip>
@@ -58,7 +44,7 @@
             />
             <div
               v-else
-              class="text-body1"
+              class="text-body1 q-mt-xs"
             >
               {{ translation.translation }}
             </div>
@@ -67,7 +53,6 @@
       </EditableModule>
     </div>
 
-    <!-- Add Translation Button -->
     <q-btn
       v-if="allowEdit"
       flat
@@ -76,7 +61,7 @@
       class="q-mt-sm"
       @click="addTranslation"
     />
-  </q-expansion-item>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -101,13 +86,25 @@ const $q = useQuasar();
 
 const translations = computed(() => props.example.exampleTranslations || []);
 
+const sortedTranslations = computed(() => {
+  return [...translations.value].sort((a, b) => {
+    if (a.isNew && !b.isNew) return -1;
+    if (!a.isNew && b.isNew) return 1;
+
+    const languageOrder: Record<string, number> = { CATALAN: 1, SPANISH: 2, ENGLISH: 3 };
+    const aOrder = languageOrder[a.language] || 999;
+    const bOrder = languageOrder[b.language] || 999;
+    return aOrder - bOrder;
+  });
+});
+
 const addTranslation = () => {
   translations.value.push({
     id: '',
     translation: '',
     language: 'CATALAN',
     exampleId: props.example.id || '',
-    isNew: true
+    isNew: true,
   });
 };
 
@@ -117,12 +114,12 @@ const saveTranslation = async (translation: ExampleTranslation) => {
     if (translation.id) {
       response = await api.exampleTranslations.updateExampleTranslation(translation.id, {
         translation: translation.translation,
-        language: translation.language as Language
+        language: translation.language as Language,
       });
     } else {
       response = await api.exampleTranslations.createExampleTranslation(props.example.id || '', {
         translation: translation.translation,
-        language: translation.language as Language
+        language: translation.language as Language,
       });
     }
 
@@ -130,14 +127,14 @@ const saveTranslation = async (translation: ExampleTranslation) => {
       emit('update:glossData', response.data);
       $q.notify({
         type: 'positive',
-        message: translate(translation.id ? 'translationUpdatedSuccessfully' : 'translationCreatedSuccessfully')
+        message: translate(translation.id ? 'translationUpdatedSuccessfully' : 'translationCreatedSuccessfully'),
       });
     }
   } catch (error) {
     console.error('Error saving translation:', error);
     $q.notify({
       type: 'negative',
-      message: translate('errors.failedToSaveTranslation')
+      message: translate('errors.failedToSaveTranslation'),
     });
   }
 };
@@ -157,14 +154,14 @@ const deleteTranslation = async (translation: ExampleTranslation) => {
       emit('update:glossData', response.data);
       $q.notify({
         type: 'positive',
-        message: translate('translationDeletedSuccessfully')
+        message: translate('translationDeletedSuccessfully'),
       });
     }
   } catch (error) {
     console.error('Error deleting translation:', error);
     $q.notify({
       type: 'negative',
-      message: translate('errors.failedToDeleteTranslation')
+      message: translate('errors.failedToDeleteTranslation'),
     });
   }
 };
@@ -177,4 +174,10 @@ const cancelTranslation = (translation: ExampleTranslation) => {
     }
   }
 };
-</script> 
\ No newline at end of file
+</script>
+
+<style scoped>
+.example-translations {
+  margin-top: 4px;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
index 2b91bbf..f1209d3 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
@@ -9,10 +9,16 @@
       @delete="() => $emit('delete', example)"
     >
       <template #default="{ isEditing }">
-        <!-- Example Content - Side by Side Layout -->
-        <div class="row q-gutter-md q-mb-lg q-items-start">
+        <!-- Example Content -->
+        <div
+          class="q-mb-lg"
+          :class="hideExampleVideo ? 'column' : 'row q-gutter-md q-items-start'"
+        >
           <!-- Example Video Section -->
-          <div class="col-auto" v-if="example.exampleVideoURL || isEditing">
+          <div
+            v-if="!hideExampleVideo && (example.exampleVideoURL || isEditing)"
+            class="col-auto"
+          >
             <UploadVideoComponent
               v-if="isEditing && !example.exampleVideoURL"
               video-type="example"
@@ -46,7 +52,7 @@
           </div>
 
           <!-- Example Text Section -->
-          <div class="col">
+          <div :class="hideExampleVideo ? '' : 'col'">
             <q-input
               v-if="isEditing"
               v-model="example.example"
@@ -89,6 +95,7 @@ const props = defineProps<{
   example: Example;
   allowEdit: boolean;
   inlineEdit?: boolean;
+  hideExampleVideo?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
index 17ec3c0..6c5977a 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
@@ -30,8 +30,11 @@
             </div>
           </div>
 
-          <!-- Example Video Section (Second on Mobile) -->
-          <div class="col" v-if="example.exampleVideoURL || isEditing">
+          <!-- Example Video Section -->
+          <div
+            v-if="!hideExampleVideo && (example.exampleVideoURL || isEditing)"
+            class="col"
+          >
             <UploadVideoComponent
               v-if="isEditing && !example.exampleVideoURL"
               video-type="example"
@@ -89,6 +92,7 @@ const props = defineProps<{
   example: Example;
   allowEdit: boolean;
   inlineEdit?: boolean;
+  hideExampleVideo?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
index d819e3d..e848598 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExamplesComponent.vue
@@ -1,7 +1,7 @@
 <template>
   <q-card-section>
     <div
-      v-if="!inlineEdit"
+      v-if="!inlineEdit && !hideSectionTitle"
       class="text-h5 q-mb-md row justify-between items-center"
     >
       {{ translate('examples') }}
@@ -15,7 +15,7 @@
       />
     </div>
     <div
-      v-else
+      v-else-if="inlineEdit"
       class="row justify-between items-center q-mb-md"
     >
       <span class="text-body2 text-grey-7">{{ translate('optional') }}</span>
@@ -44,6 +44,7 @@
           :example="example"
           :allow-edit="editMode"
           :inline-edit="inlineEdit"
+          :hide-example-video="hideExampleVideo"
           @save="saveExample"
           @delete="deleteExample"
           @upload-video="uploadVideo"
@@ -57,6 +58,7 @@
           :example="example"
           :allow-edit="editMode"
           :inline-edit="inlineEdit"
+          :hide-example-video="hideExampleVideo"
           @save="saveExample"
           @delete="deleteExample"
           @upload-video="uploadVideo"
@@ -96,6 +98,8 @@ const props = defineProps<{
   glossData: GlossData;
   editMode: boolean;
   inlineEdit?: boolean;
+  hideSectionTitle?: boolean;
+  hideExampleVideo?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
index e890c68..8c4b8b2 100644
--- a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
@@ -1,7 +1,10 @@
 <template>
-  <q-card-section class="q-pt-none">
+  <q-card-section
+    class="gloss-translations"
+    :class="{ 'gloss-translations--compact q-px-none q-pb-none': compact }"
+  >
     <div
-      v-if="!inlineEdit"
+      v-if="!inlineEdit && !hideSectionTitle"
       class="text-h5 q-mb-md row justify-between items-center"
     >
       {{ translate('glossTranslations') }}
@@ -15,17 +18,41 @@
       />
     </div>
     <div
-      v-else
+      v-else-if="inlineEdit"
       class="text-subtitle1 text-weight-medium q-mb-md"
     >
       {{ translate('glossTranslations') }}
     </div>
 
-    <q-list class="row q-col-gutter-md">
+    <template v-if="compact && !editMode">
+      <div
+        v-for="(translation, index) in glossTranslations"
+        :key="translation.id || index"
+        class="gloss-translations__item q-mb-sm"
+      >
+        <q-chip
+          dense
+          outline
+          color="primary"
+          class="q-mb-xs"
+        >
+          {{ translate(translation.language) }}
+        </q-chip>
+        <div class="text-body1">
+          {{ translation.translation }}
+        </div>
+      </div>
+    </template>
+
+    <q-list
+      v-else
+      class="row q-col-gutter-md"
+    >
       <q-item
         v-for="(translation, index) in glossTranslations"
         :key="translation.id || index"
-        class="col-12 col-md-6 q-pa-none"
+        class="col-12 q-pa-none"
+        :class="{ 'col-md-6': !compact }"
         dense
       >
         <EditableModule
@@ -50,7 +77,10 @@
                   v-model="translation.language"
                   class="col"
                 />
-                <q-chip v-else dense>
+                <q-chip
+                  v-else
+                  dense
+                >
                   {{ translate(translation.language) }}
                 </q-chip>
               </div>
@@ -103,6 +133,8 @@ const props = defineProps<{
   glossData: GlossData;
   editMode: boolean;
   inlineEdit?: boolean;
+  hideSectionTitle?: boolean;
+  compact?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -243,3 +275,13 @@ const cancelTranslation = (translation: GlossTranslation) => {
   }
 };
 </script>
+
+<style scoped>
+.gloss-translations--compact {
+  padding-top: 12px;
+}
+
+.gloss-translations__item:last-child {
+  margin-bottom: 0;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
index 707c2ed..cad9060 100644
--- a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
@@ -1,28 +1,39 @@
 <template>
   <q-card-section class="column no-wrap fit">
-    <video
-      v-if="selectedVideoData?.url"
-      class="col fit"
-      loop
-      autoplay
-      muted
-      :src="getVideoUrl(selectedVideoData.url)"
-      :style="{
-        objectFit: 'contain',
-        maxHeight: '40dvh',
-      }"
-    />
     <div
-      v-else-if="editMode"
-      class="col fit row justify-center items-center"
+      v-if="hasAnyVideoUrl || editMode"
+      class="video-angle-container"
+      :style="containerStyle"
     >
-      <UploadVideoComponent
-        video-type="gloss"
-        :custom-label="translate('addGlossVideo')"
-        @upload-complete="(url) => uploadVideo(url)"
+      <video
+        v-for="video in sortedVideosWithUrl"
+        :key="video.id"
+        :ref="(el) => registerVideoRef(video.id, el)"
+        class="angle-video"
+        :class="{ 'angle-video--active': video.id === selectedVideo }"
+        loop
+        muted
+        playsinline
+        preload="auto"
+        :src="getVideoUrl(video.url)"
       />
+
+      <div
+        v-if="editMode && !selectedVideoData?.url"
+        class="video-angle-upload"
+      >
+        <UploadVideoComponent
+          video-type="gloss"
+          :custom-label="translate('addGlossVideo')"
+          @upload-complete="(url) => uploadVideo(url)"
+        />
+      </div>
     </div>
-    <div class="column col justify-start items-start" v-if="editMode || sortedVideos.length > 1">
+
+    <div
+      v-if="editMode || sortedVideos.length > 1"
+      class="column col justify-start items-start q-mt-sm"
+    >
       <div class="row justify-between items-center full-width">
         <span class="text-bold">
           {{ translate('videoAngles') }}
@@ -36,9 +47,16 @@
           @click="addAngle"
         />
       </div>
-      <div class="row justify-center items-center q-pt-md">
+      <div
+        class="row justify-center items-center q-pt-md full-width"
+        :class="{ 'angle-toggle--compact': compact }"
+      >
         <q-btn-toggle
           v-model="selectedVideo"
+          spread
+          no-caps
+          toggle-color="primary"
+          class="full-width"
           :options="sortedVideos.map((video) => ({
             label: video.angle,
             value: video.id,
@@ -95,7 +113,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, onMounted, nextTick, type ComponentPublicInstance, type StyleValue } from 'vue';
 import { SignVideo } from 'src/types/models';
 import translate from 'src/utils/translate';
 import UploadVideoComponent from 'src/components/UploadVideoComponent.vue';
@@ -106,6 +124,7 @@ import { useQuasar } from 'quasar';
 const props = defineProps<{
   signVideo: SignVideo;
   editMode: boolean;
+  compact?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -114,36 +133,89 @@ const emit = defineEmits<{
 
 const $q = useQuasar();
 
-// Create a local copy of the signVideo data
 const localSignVideo = ref<SignVideo>({ ...props.signVideo });
 
-// Watch for changes in the prop and update local copy
 watch(() => props.signVideo, (newSignVideo) => {
   localSignVideo.value = { ...newSignVideo };
 }, { deep: true });
 
 const selectedVideo = ref<string>(localSignVideo.value?.videos[0]?.id || '');
+const videoRefs = new Map<string, HTMLVideoElement>();
 
 const sortedVideos = computed(() => {
   return [...(localSignVideo.value?.videos || [])].sort((a, b) => (a.priority || 0) - (b.priority || 0));
 });
 
+const sortedVideosWithUrl = computed(() =>
+  sortedVideos.value.filter((video) => video.url?.trim())
+);
+
+const hasAnyVideoUrl = computed(() => sortedVideosWithUrl.value.length > 0);
+
 const selectedVideoData = computed(() => {
   return sortedVideos.value.find((video) => video.id === selectedVideo.value) || sortedVideos.value[0];
 });
 
+const containerStyle = computed<StyleValue>(() => ({
+  height: props.compact ? '240px' : '40dvh',
+  maxHeight: props.compact ? '240px' : '40dvh',
+  width: '100%',
+}));
+
+function registerVideoRef(id: string, el: Element | ComponentPublicInstance | null) {
+  if (el instanceof HTMLVideoElement) {
+    videoRefs.set(id, el);
+    return;
+  }
+  videoRefs.delete(id);
+}
+
+async function syncVideoPlayback(activeId: string) {
+  await nextTick();
+
+  for (const [id, element] of videoRefs.entries()) {
+    if (id === activeId) {
+      try {
+        await element.play();
+      } catch {
+        // Autoplay may be blocked until user interaction.
+      }
+      continue;
+    }
+
+    element.pause();
+  }
+}
+
+watch(selectedVideo, (activeId) => {
+  if (activeId) {
+    void syncVideoPlayback(activeId);
+  }
+});
+
+watch(sortedVideosWithUrl, () => {
+  if (selectedVideo.value) {
+    void syncVideoPlayback(selectedVideo.value);
+  }
+});
+
+onMounted(() => {
+  if (selectedVideo.value) {
+    void syncVideoPlayback(selectedVideo.value);
+  }
+});
+
 const getVideoIndex = (videoId: string) => {
   return sortedVideos.value.findIndex(video => video.id === videoId);
 };
 
 const uploadVideo = (url: string) => {
-  // Update the local state first
   const videoToUpdate = localSignVideo.value.videos?.find(video => video.id === selectedVideo.value)
   if (videoToUpdate) {
     videoToUpdate.url = url
   }
-  // Then emit the updated state
   emit('update:signVideo', localSignVideo.value)
+  void syncVideoPlayback(selectedVideo.value);
 }
 
 const addAngle = () => {
@@ -166,32 +238,31 @@ const removeAngle = () => {
     localSignVideo.value.videos.splice(index, 1)
     selectedVideo.value = localSignVideo.value.videos[0]?.id || ''
     emit('update:signVideo', localSignVideo.value)
+    void syncVideoPlayback(selectedVideo.value);
   }
 }
 
 const moveVideoLeft = async () => {
   const currentIndex = getVideoIndex(selectedVideo.value);
   if (currentIndex <= 0) return;
-  
+
   const currentVideo = sortedVideos.value[currentIndex];
   const previousVideo = sortedVideos.value[currentIndex - 1];
-  
+
   if (!currentVideo?.id || !previousVideo?.id) return;
-  
+
   try {
-    // Swap priorities
     const tempPriority = currentVideo.priority || 0;
     currentVideo.priority = previousVideo.priority || 0;
     previousVideo.priority = tempPriority;
-    
-    // Update in backend
+
     await Promise.all([
       api.videoPriority.update(currentVideo.id, { priority: currentVideo.priority }),
       api.videoPriority.update(previousVideo.id, { priority: previousVideo.priority })
     ]);
-    
+
     emit('update:signVideo', localSignVideo.value)
-    
+
     $q.notify({
       type: 'positive',
       message: translate('videoOrderUpdated'),
@@ -210,26 +281,24 @@ const moveVideoLeft = async () => {
 const moveVideoRight = async () => {
   const currentIndex = getVideoIndex(selectedVideo.value);
   if (currentIndex >= sortedVideos.value.length - 1) return;
-  
+
   const currentVideo = sortedVideos.value[currentIndex];
   const nextVideo = sortedVideos.value[currentIndex + 1];
-  
+
   if (!currentVideo?.id || !nextVideo?.id) return;
-  
+
   try {
-    // Swap priorities
     const tempPriority = currentVideo.priority || 0;
     currentVideo.priority = nextVideo.priority || 0;
     nextVideo.priority = tempPriority;
-    
-    // Update in backend
+
     await Promise.all([
       api.videoPriority.update(currentVideo.id, { priority: currentVideo.priority }),
       api.videoPriority.update(nextVideo.id, { priority: nextVideo.priority })
     ]);
-    
+
     emit('update:signVideo', localSignVideo.value)
-    
+
     $q.notify({
       type: 'positive',
       message: translate('videoOrderUpdated'),
@@ -245,3 +314,46 @@ const moveVideoRight = async () => {
   }
 }
 </script>
+
+<style scoped>
+.video-angle-container {
+  position: relative;
+  width: 100%;
+  background: transparent;
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+}
+
+.angle-video {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  opacity: 0;
+  visibility: hidden;
+  pointer-events: none;
+}
+
+.angle-video--active {
+  opacity: 1;
+  visibility: visible;
+  pointer-events: auto;
+  z-index: 1;
+}
+
+.video-angle-upload {
+  position: absolute;
+  inset: 0;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(255, 255, 255, 0.96);
+}
+
+.angle-toggle--compact :deep(.q-btn) {
+  font-size: 0.75rem;
+  padding: 4px 6px;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/MainContent.vue b/frontend/src/components/GlossDetail/components/MainContent.vue
index 5d60bc8..51757d0 100644
--- a/frontend/src/components/GlossDetail/components/MainContent.vue
+++ b/frontend/src/components/GlossDetail/components/MainContent.vue
@@ -1,51 +1,269 @@
 <template>
-  <q-card-section class="row justify-between items-center">
-    <q-card
-      class="col"
-      flat
+  <q-card-section class="gloss-view-layout">
+    <div
+      v-if="primaryDefinition"
+      class="row justify-start items-center q-mb-md gloss-view-layout__header"
     >
-      <q-card-section
-        v-if="primaryDefinition"
-        class="row justify-start items-center"
+      <q-chip
+        outline
+        color="primary"
       >
-        <q-chip
-          outline
-          color="primary"
+        {{ translate(primaryDefinition.lexicalCategory) }}
+      </q-chip>
+      <span class="text-h6 q-ml-sm">
+        {{ primaryDefinition.title || glossData.gloss }}
+      </span>
+    </div>
+
+    <div
+      class="gloss-view-layout__body"
+      :class="{ 'gloss-view-layout__body--all-videos': showAllVideos }"
+    >
+      <template v-if="showAllVideos">
+        <div class="gloss-all-videos-view">
+          <q-btn
+            flat
+            no-caps
+            color="primary"
+            class="gloss-all-videos-back q-mb-sm"
+            :label="translate('backToMainVideo')"
+            icon="arrow_back"
+            @click="showAllVideos = false"
+          />
+
+          <div class="gloss-all-videos-scroll">
+            <VideosComponent
+              :model-value="glossData"
+              :edit-mode="false"
+              hide-section-title
+              horizontal-scroll
+            />
+          </div>
+        </div>
+      </template>
+
+      <template v-else>
+        <div
+          v-if="showSidebar"
+          class="gloss-video-column"
         >
-          {{ translate(primaryDefinition.lexicalCategory) }}
-        </q-chip>
-        <span class="text-h6">
-          {{ primaryDefinition.title || glossData.gloss }}
-        </span>
-      </q-card-section>
-      <q-card-section class="column">
-        <GlossVideoComponent
-          v-if="glossData?.glossVideos?.[0]"
-          :sign-video="glossData.glossVideos.sort((a, b) => a.priority - b.priority)[0] || glossData.glossVideos[0]"
-          :edit-mode="false"
-        />
-      </q-card-section>
-    </q-card>
+          <SignVideoAside
+            :gloss-data="glossData"
+            @show-all-videos="showAllVideos = true"
+          />
+        </div>
+
+        <div class="gloss-content-column">
+          <q-tabs
+            v-model="selectedTab"
+            class="gloss-content-tabs text-primary q-mb-sm"
+            active-color="primary"
+            indicator-color="primary"
+            dense
+            align="left"
+            narrow-indicator
+            outside-arrows
+            mobile-arrows
+          >
+            <q-tab
+              name="definitions"
+              :label="translate('definitions')"
+            />
+            <q-tab
+              name="examples"
+              :label="translate('examples')"
+            />
+            <q-tab
+              name="related"
+              :label="translate('relatedGlosses')"
+            />
+          </q-tabs>
+
+          <div class="gloss-content-scroll">
+            <q-tab-panels
+              v-model="selectedTab"
+              animated
+              class="gloss-tab-panels"
+            >
+              <q-tab-panel
+                name="definitions"
+                class="q-pa-none"
+              >
+                <DefinitionsComponent
+                  :gloss-data="glossData"
+                  :edit-mode="false"
+                  :allow-edit="false"
+                  hide-section-title
+                  hide-definition-video
+                  hide-gloss-translations
+                />
+              </q-tab-panel>
+
+              <q-tab-panel
+                name="examples"
+                class="q-pa-none"
+              >
+                <ExamplesComponent
+                  :gloss-data="glossData"
+                  :edit-mode="false"
+                  hide-section-title
+                  hide-example-video
+                />
+              </q-tab-panel>
+
+              <q-tab-panel
+                name="related"
+                class="q-pa-none"
+              >
+                <RelatedGlosses
+                  :related-glosses="glossData.relationsAsSource || []"
+                  :minimal-pairs="glossData.minimalPairsAsSource || []"
+                  :edit-mode="false"
+                  :gloss-id="glossData.id || ''"
+                  hide-section-title
+                />
+              </q-tab-panel>
+            </q-tab-panels>
+          </div>
+        </div>
+      </template>
+    </div>
   </q-card-section>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { GlossData } from 'src/types/models'
-import GlossVideoComponent from './GlossVideoComponent.vue'
-import translate from 'src/utils/translate';
+import SignVideoAside from './SignVideoAside.vue'
+import VideosComponent from './VideosComponent.vue'
+import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vue'
+import ExamplesComponent from './ExamplesComponent/ExamplesComponent.vue'
+import RelatedGlosses from './RelatedGlosses.vue'
+import translate from 'src/utils/translate'
 
 const { glossData } = defineProps<{
   glossData: GlossData
 }>()
 
+const selectedTab = ref('definitions')
+const showAllVideos = ref(false)
+
 const primaryDefinition = computed(() =>
   [...(glossData.definitions || [])].sort((a, b) => a.priority - b.priority)[0]
 )
+
+const hasSignVideos = computed(() => (glossData.glossVideos?.length ?? 0) > 0)
+
+const hasGlossTranslations = computed(() =>
+  (glossData.glossTranslations?.length ?? 0) > 0
+)
+
+const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.value)
 </script>
 
 <style scoped>
-.full-height {
+.gloss-view-layout {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 0;
+  min-height: 0;
   height: 100%;
+  padding-top: 0;
+  overflow: hidden;
+}
+
+.gloss-view-layout__header {
+  flex: 0 0 auto;
+}
+
+.gloss-view-layout__body {
+  display: flex;
+  flex: 1 1 0;
+  min-height: 0;
+  gap: 24px;
+  overflow: hidden;
+}
+
+.gloss-view-layout__body--all-videos {
+  gap: 0;
+}
+
+.gloss-video-column {
+  flex: 0 0 42%;
+  min-width: 0;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.gloss-content-column {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 0;
+  min-width: 0;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.gloss-all-videos-view {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 0;
+  min-width: 0;
+  min-height: 0;
+  width: 100%;
+  overflow: hidden;
+  align-items: flex-start;
+}
+
+.gloss-all-videos-back {
+  flex: 0 0 auto;
+}
+
+.gloss-all-videos-scroll {
+  flex: 1 1 0;
+  min-height: 0;
+  width: 100%;
+  align-self: stretch;
+  overflow-x: auto;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+
+.gloss-content-tabs {
+  flex: 0 0 auto;
+}
+
+.gloss-content-tabs :deep(.q-tab) {
+  min-height: 40px;
+  padding: 0 12px;
+  font-weight: 500;
+}
+
+.gloss-content-scroll {
+  flex: 1 1 0;
+  min-height: 0;
+  overflow-y: auto;
+  overflow-x: hidden;
+  -webkit-overflow-scrolling: touch;
+}
+
+.gloss-tab-panels {
+  background: transparent;
+}
+
+@media (max-width: 1023px) {
+  .gloss-view-layout__body:not(.gloss-view-layout__body--all-videos) {
+    flex-direction: column;
+  }
+
+  .gloss-video-column {
+    flex: 0 0 auto;
+    width: 100%;
+  }
+
+  .gloss-content-column {
+    flex: 1 1 0;
+    width: 100%;
+  }
 }
 </style>
diff --git a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
index 359a412..16f0378 100644
--- a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
+++ b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
@@ -129,8 +129,8 @@
       </q-step>
     </q-stepper>
 
-    <!-- Published / read-only: tabbed layout -->
-    <template v-else>
+    <!-- Published edit mode: tabbed layout for admin editing -->
+    <template v-else-if="editMode">
       <q-tabs
         v-model="selectedContent"
         class="text-primary"
diff --git a/frontend/src/components/GlossDetail/components/RelatedGlosses.vue b/frontend/src/components/GlossDetail/components/RelatedGlosses.vue
index e67d7d4..d7ba7fc 100644
--- a/frontend/src/components/GlossDetail/components/RelatedGlosses.vue
+++ b/frontend/src/components/GlossDetail/components/RelatedGlosses.vue
@@ -1,6 +1,9 @@
 <template>
   <q-card-section class="related-glosses">
-    <div class="text-h5 q-mb-md">
+    <div
+      v-if="!hideSectionTitle"
+      class="text-h5 q-mb-md"
+    >
       {{ t('relatedGlosses') }}
     </div>
 
@@ -367,6 +370,7 @@ const props = defineProps<{
   minimalPairs: MinimalPair[];
   editMode: boolean;
   glossId: string;
+  hideSectionTitle?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/SignVideoAside.vue b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
new file mode 100644
index 0000000..31423ec
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="sign-video-panel">
+    <q-card
+      v-if="primarySignVideo"
+      flat
+      bordered
+      class="sign-video-aside"
+    >
+      <GlossVideoComponent
+        :sign-video="primarySignVideo"
+        :edit-mode="false"
+      />
+    </q-card>
+
+    <q-btn
+      v-if="showDetailsButton"
+      flat
+      no-caps
+      color="primary"
+      class="q-mt-sm full-width"
+      :label="detailsButtonLabel"
+      icon="videocam"
+      @click="emit('showAllVideos')"
+    />
+
+    <GlossTranslationsComponent
+      v-if="hasGlossTranslations"
+      :gloss-data="glossData"
+      :edit-mode="false"
+      hide-section-title
+      compact
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { GlossData } from 'src/types/models'
+import GlossVideoComponent from './GlossVideoComponent.vue'
+import GlossTranslationsComponent from './GlossTranslationsComponent.vue'
+import translate from 'src/utils/translate'
+
+const { glossData } = defineProps<{
+  glossData: GlossData
+}>()
+
+const emit = defineEmits<{
+  (e: 'showAllVideos'): void
+}>()
+
+const primarySignVideo = computed(() => {
+  const videos = glossData.glossVideos || []
+  if (!videos.length) return null
+  return [...videos].sort((a, b) => a.priority - b.priority)[0] ?? null
+})
+
+const hasMultipleSignVideos = computed(() => (glossData.glossVideos?.length ?? 0) > 1)
+
+const hasGlossTranslations = computed(() =>
+  (glossData.glossTranslations?.length ?? 0) > 0
+)
+
+const showDetailsButton = computed(() =>
+  Boolean(primarySignVideo.value) && (glossData.glossVideos?.length ?? 0) > 0
+)
+
+const detailsButtonLabel = computed(() =>
+  hasMultipleSignVideos.value
+    ? translate('seeOtherVideos')
+    : translate('signFonology')
+)
+</script>
+
+<style scoped>
+.sign-video-aside {
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+}
+
+.sign-video-panel {
+  height: 100%;
+  max-height: 100%;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/VideosComponent.vue b/frontend/src/components/GlossDetail/components/VideosComponent.vue
index 708765e..64d7c1c 100644
--- a/frontend/src/components/GlossDetail/components/VideosComponent.vue
+++ b/frontend/src/components/GlossDetail/components/VideosComponent.vue
@@ -1,13 +1,15 @@
 <template>
   <div class="videos-component q-pa-sm">
     <div
-      v-if="!inlineEdit"
+      v-if="!inlineEdit && !hideSectionTitle"
       class="text-h5 q-mb-md"
     >
       {{ translate('videos') }}
     </div>
 
-    <div class="row q-col-gutter-md no-wrap overflow-auto">
+    <div
+      :class="videosRowClass"
+    >
       <!-- Add video button - visible when editMode is true and not creating a video -->
       <div
         v-if="editMode && !isCreatingVideo"
@@ -34,7 +36,7 @@
       <div
         v-for="(video, index) in sortedVideos"
         :key="video.id || index"
-        class="col-12 col-sm-6 col-md-4"
+        :class="videoItemClass"
       >
         <EditableModule
           :allow-edit="editMode"
@@ -125,11 +127,26 @@ const glossData = defineModel<GlossData>({ required: true });
 const emit = defineEmits<{
   (e: 'update:glossData', glossData: GlossData): void
 }>();
-const { editMode, inlineEdit = false } = defineProps<{
+const { editMode, inlineEdit = false, hideSectionTitle = false, stacked = false, horizontalScroll = false } = defineProps<{
   editMode: boolean;
   inlineEdit?: boolean;
+  hideSectionTitle?: boolean;
+  stacked?: boolean;
+  horizontalScroll?: boolean;
 }>();
 
+const videosRowClass = computed(() => {
+  if (stacked) return 'column q-gutter-md';
+  if (horizontalScroll) return 'row q-col-gutter-md no-wrap videos-row--horizontal-scroll';
+  return 'row q-col-gutter-md no-wrap overflow-auto';
+});
+
+const videoItemClass = computed(() => {
+  if (stacked) return 'col-12';
+  if (horizontalScroll) return 'videos-row__item';
+  return 'col-12 col-sm-6 col-md-4';
+});
+
 const $q = useQuasar();
 
 // Keep a backup of videos for cancellation
@@ -455,6 +472,19 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
   width: 100%;
 }
 
+.videos-row--horizontal-scroll {
+  overflow-x: auto;
+  overflow-y: hidden;
+  padding-bottom: 8px;
+  width: 100%;
+}
+
+.videos-row__item {
+  flex: 0 0 420px;
+  width: 420px;
+  max-width: 420px;
+}
+
 .overflow-auto {
   scrollbar-position: top;
 }
diff --git a/frontend/src/components/HeaderComponent.vue b/frontend/src/components/HeaderComponent.vue
index fdfa9ea..9e1293d 100644
--- a/frontend/src/components/HeaderComponent.vue
+++ b/frontend/src/components/HeaderComponent.vue
@@ -1,7 +1,7 @@
 <template>
   <q-header
     class="bg-secondary text-black app-header"
-    elevated
+    bordered
   >
     <loginComponent v-model="isLoginDialogOpen" />
 
@@ -13,22 +13,6 @@
       overlay
       class="bg-secondary"
     >
-      <q-toolbar class="q-px-md">
-        <q-toolbar-title class="text-subtitle1 text-weight-bold">
-          {{ translate('signBank') }}
-        </q-toolbar-title>
-        <q-btn
-          flat
-          dense
-          round
-          icon="close"
-          :aria-label="translate('closeMenu')"
-          @click="isSidebarOpen = false"
-        />
-      </q-toolbar>
-
-      <q-separator />
-
       <q-list padding>
         <q-item-label
           header
@@ -149,12 +133,6 @@
           alt="UPF"
           @click="navigateTo('/')"
         />
-        <span
-          class="app-title cursor-pointer gt-xs"
-          @click="navigateTo('/')"
-        >
-          {{ translate('signBank') }}
-        </span>
       </q-toolbar-title>
 
       <q-btn
@@ -198,6 +176,7 @@ const isActive = (path: string) => route.path === path || route.path.startsWith(
 <style scoped>
 .app-header {
   min-height: 64px;
+  box-shadow: none;
 }
 
 .header-logo {
@@ -208,13 +187,6 @@ const isActive = (path: string) => route.path === path || route.path.startsWith(
   transform: scale(1.05);
 }
 
-.app-title {
-  font-size: 1.1rem;
-  font-weight: 600;
-  letter-spacing: 0.02em;
-  user-select: none;
-}
-
 .nav-item-active {
   background: rgba(200, 16, 47, 0.08);
   color: var(--primary);
diff --git a/frontend/src/components/Search/components/ResultCard.vue b/frontend/src/components/Search/components/ResultCard.vue
index 95f6b41..418025b 100644
--- a/frontend/src/components/Search/components/ResultCard.vue
+++ b/frontend/src/components/Search/components/ResultCard.vue
@@ -9,10 +9,6 @@
     @click="emitViewDetails"
     @keydown.enter="emitViewDetails"
     @keydown.space.prevent="emitViewDetails"
-    @mouseenter="playVideo"
-    @mouseleave="pauseVideo"
-    @focus="playVideo"
-    @blur="pauseVideo"
   >
     <q-card-section
       v-if="document.url"
@@ -25,6 +21,7 @@
           :src="getVideoUrl(document.url)"
           preload="metadata"
           loop
+          autoplay
           muted
           playsinline
           @error="handleVideoError"
@@ -45,17 +42,6 @@
             size="2em"
           />
         </div>
-        <div
-          v-if="!isLoading && !hasVideoError"
-          class="play-hint absolute-bottom-right q-ma-sm"
-        >
-          <q-icon
-            name="play_circle"
-            color="white"
-            size="sm"
-            style="filter: drop-shadow(0 1px 2px rgba(0,0,0,0.5));"
-          />
-        </div>
       </div>
     </q-card-section>
 
@@ -84,15 +70,21 @@
         {{ document.description }}
       </div>
 
-      <q-chip
-        v-if="document.lexicalCategory"
-        dense
-        color="primary"
-        text-color="white"
-        size="sm"
+      <div
+        v-if="lexicalCategories.length"
+        class="lexical-categories row q-gutter-xs"
       >
-        {{ translate(document.lexicalCategory) }}
-      </q-chip>
+        <q-chip
+          v-for="category in lexicalCategories"
+          :key="category"
+          dense
+          color="primary"
+          text-color="white"
+          size="sm"
+        >
+          {{ translate(category) }}
+        </q-chip>
+      </div>
     </q-card-section>
   </q-card>
 </template>
@@ -101,11 +93,10 @@
 import translate from 'src/utils/translate';
 import { getVideoUrl } from 'src/utils/videoUrl';
 import type { SearchResult } from 'src/services/search.service';
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 
 const t = (key: string) => translate(key);
 const isLoading = ref(true);
-const hasVideoError = ref(false);
 const videoRef = ref<HTMLVideoElement | null>(null);
 
 const props = defineProps<{
@@ -121,24 +112,27 @@ const emitViewDetails = () => {
   emit('view-details', props.document.glossId);
 };
 
-const playVideo = () => {
-  videoRef.value?.play().catch(() => {});
-};
+const lexicalCategories = computed(() => {
+  const { lexicalCategories: categories, lexicalCategory } = props.document;
 
-const pauseVideo = () => {
-  if (videoRef.value) {
-    videoRef.value.pause();
-    videoRef.value.currentTime = 0;
+  if (categories?.length) {
+    return categories;
   }
-};
+
+  if (lexicalCategory) {
+    return [lexicalCategory];
+  }
+
+  return [];
+});
 
 const handleVideoError = () => {
-  hasVideoError.value = true;
   isLoading.value = false;
 };
 
 const handleVideoLoaded = () => {
   isLoading.value = false;
+  videoRef.value?.play().catch(() => {});
 };
 </script>
 
@@ -169,16 +163,6 @@ const handleVideoLoaded = () => {
   object-fit: contain;
 }
 
-.play-hint {
-  opacity: 0.7;
-  pointer-events: none;
-}
-
-.result-card:hover .play-hint,
-.result-card:focus-visible .play-hint {
-  opacity: 0;
-}
-
 .content-section {
   flex: 1;
   display: flex;
@@ -198,6 +182,15 @@ const handleVideoLoaded = () => {
   overflow: hidden;
 }
 
+.lexical-categories {
+  flex-wrap: wrap;
+}
+
+.lexical-categories :deep(.q-chip) {
+  width: fit-content;
+  max-width: 100%;
+}
+
 @media (max-width: 599px) {
   .video-container {
     height: 150px;
diff --git a/frontend/src/components/Search/components/SearchInput.vue b/frontend/src/components/Search/components/SearchInput.vue
index e734c51..5557556 100644
--- a/frontend/src/components/Search/components/SearchInput.vue
+++ b/frontend/src/components/Search/components/SearchInput.vue
@@ -14,17 +14,6 @@
         <template #prepend>
           <q-icon name="search" color="grey-6" />
         </template>
-        <template #append>
-          <q-btn
-            flat
-            dense
-            round
-            icon="search"
-            color="primary"
-            :aria-label="t('search')"
-            @click="$emit('search')"
-          />
-        </template>
       </q-input>
     </div>
     <div class="col-auto gt-xs">
@@ -32,7 +21,6 @@
         color="primary"
         unelevated
         :label="t('search')"
-        icon="search"
         @click="$emit('search')"
       />
     </div>
diff --git a/frontend/src/hooks/useAuthentication.ts b/frontend/src/hooks/useAuthentication.ts
index 00493d0..50f5ef6 100644
--- a/frontend/src/hooks/useAuthentication.ts
+++ b/frontend/src/hooks/useAuthentication.ts
@@ -38,6 +38,9 @@ export function useAuthentication() {
       isLoading.value = true
       error.value = null
       const { data } = await api.auth.login({ email, password })
+      if (!data?.access_token || !data?.refresh_token || !data?.user) {
+        throw new Error('Invalid credentials')
+      }
       userStore.setUserData(data)
       return data
     } catch (err: any) {
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index 444aec0..c5882f7 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -56,6 +56,8 @@ const translations: TranslateKeys = {
   login: 'Iniciar sessió',
   glossTranslations: 'Traduccions de glossa',
   seeExampleVideo: 'Veure vídeo d\'exemple',
+  seeOtherVideos: 'Veure altres vídeos',
+  backToMainVideo: 'Tornar al vídeo principal',
   spanish: 'Espanyol',
   english: 'Anglès',
   french: 'Francès',
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index 60ff0e8..bdc7ee2 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -59,6 +59,8 @@ const translations: TranslateKeys = {
   login: 'Login',
   glossTranslations: 'Gloss translations',
   seeExampleVideo: 'See example video',
+  seeOtherVideos: 'See other videos',
+  backToMainVideo: 'Back to main video',
   spanish: 'Spanish',
   english: 'English',
   french: 'French',
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 407e10f..7938142 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -53,6 +53,8 @@ const translations: TranslateKeys = {
   login: 'Iniciar sesión',
   glossTranslations: 'Traducciones de glosa',
   seeExampleVideo: 'Ver vídeo de ejemplo',
+  seeOtherVideos: 'Ver otros vídeos',
+  backToMainVideo: 'Volver al vídeo principal',
   spanish: 'Español',
   english: 'Inglés',
   french: 'Francés',
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index adc5765..923db66 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -524,6 +524,8 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   reason: string;
   glossTranslations: string;
   seeExampleVideo: string;
+  seeOtherVideos: string;
+  backToMainVideo: string;
   spanish: string;
   english: string;
   french: string;
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index fa1d071..52fa7b9 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -1,5 +1,5 @@
 <template>
-  <q-layout view="lHh Lpr lFf">
+  <q-layout view="lfh Lpr lFf">
     <HeaderComponent />
     <q-page-container class="page-container">
       <router-view />
diff --git a/frontend/src/pages/GlossPage.vue b/frontend/src/pages/GlossPage.vue
index 5fa8da9..70412f8 100644
--- a/frontend/src/pages/GlossPage.vue
+++ b/frontend/src/pages/GlossPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <q-page>
+  <q-page class="gloss-page column">
     <LoadingComponent
       v-if="loading"
       :loading="loading"
@@ -35,21 +35,16 @@
       </div>
     </div>
 
-    <div
-      v-else
-      class="column full-width justify-center items-center"
-      style="height: fit-content"
-    >
-      <GlossDetailComponent
-        v-if="glossData"
-        v-model:edit-mode="editMode"
-        class="col full-width"
-        :gloss-data="glossData"
-        :allow-edit="true"
-        @save-gloss="saveGloss"
-        @update:gloss-data="updateGlossData"
-      />
-    </div>
+    <GlossDetailComponent
+      v-else-if="glossData"
+      v-model:edit-mode="editMode"
+      class="gloss-page__detail col column"
+      :gloss-data="glossData"
+      :allow-edit="true"
+      :constrained-layout="!editMode"
+      @save-gloss="saveGloss"
+      @update:gloss-data="updateGlossData"
+    />
   </q-page>
 </template>
 
@@ -65,7 +60,6 @@ import type { GlossData } from 'src/types/models'
 const route = useRoute()
 const router = useRouter()
 
-// State
 const loading = ref(true)
 const error = ref<string | null>(null)
 const editMode = ref(false)
@@ -115,4 +109,21 @@ const saveGloss = async (updatedGlossData: GlossData) => {
 const updateGlossData = (updatedGlossData: GlossData) => {
   glossData.value = updatedGlossData
 }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.gloss-page {
+  height: calc(100vh - 64px);
+  max-height: calc(100vh - 64px);
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.gloss-page__detail {
+  flex: 1 1 0;
+  min-height: 0;
+  height: 100%;
+  overflow: hidden;
+}
+</style>
diff --git a/frontend/src/services/search.service.ts b/frontend/src/services/search.service.ts
index 9cf6297..2fb4395 100644
--- a/frontend/src/services/search.service.ts
+++ b/frontend/src/services/search.service.ts
@@ -27,6 +27,7 @@ export interface SearchResult {
   nonManualComponent: string | null;
   inicialization: string | null;
   lexicalCategory: string;
+  lexicalCategories?: string[];
   glossId: string;
   gloss: string;
   description: string;
diff --git a/nginx/default.conf b/nginx/default.conf
index 5c7cdc9..9378397 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -24,12 +24,13 @@ server {
         proxy_read_timeout     60;
         proxy_connect_timeout  60;
         proxy_redirect         off;
-        # this magic is needed for WebSocket
         proxy_http_version  1.1;
         proxy_set_header    Upgrade $http_upgrade;
         proxy_set_header    Connection "upgrade";
-        proxy_set_header    Host $http_host;
+        proxy_set_header    Host $host;
         proxy_set_header    X-Real-IP $remote_addr;
+        proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header    X-Forwarded-Proto $scheme;
     }
 
     location / {

From 52e6a3884c450e51df52f28eddebfdd9f58db3f2 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Wed, 17 Jun 2026 19:18:10 +0200
Subject: [PATCH 06/17] feat: UI improvements

---
 .../GlossDetail/GlossDetailComponent.vue      |   5 +
 .../DefinitionCardDesktop.vue                 |  18 +-
 .../DefinitionCardMobile.vue                  |  18 +-
 .../DefinitionsComponent.vue                  |   2 +
 .../components/GlossVideoComponent.vue        |  12 +-
 .../GlossDetail/components/MainContent.vue    |  74 +-----
 .../components/SignVideosBrowseView.vue       | 241 ++++++++++++++++++
 frontend/src/components/VideoPlayerPopup.vue  |  92 ++++---
 frontend/src/pages/GlossPage.vue              |  13 +-
 9 files changed, 362 insertions(+), 113 deletions(-)
 create mode 100644 frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue

diff --git a/frontend/src/components/GlossDetail/GlossDetailComponent.vue b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
index 10b1fcb..83fc952 100644
--- a/frontend/src/components/GlossDetail/GlossDetailComponent.vue
+++ b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
@@ -33,6 +33,7 @@
 
     <MoreContentComponent
       v-if="contentEditable || isDraft"
+      class="gloss-detail-card__edit"
       :gloss-data="glossData"
       :edit-mode="contentEditable"
       :is-draft="isDraft"
@@ -155,4 +156,8 @@ const handleGlossDataUpdate = (updatedGlossData: GlossData) => {
   display: flex;
   flex-direction: column;
 }
+
+.gloss-detail-card__edit {
+  width: 100%;
+}
 </style>
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
index 96280a3..a2121a7 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardDesktop.vue
@@ -21,9 +21,22 @@
         />
         <div
           v-else
-          class="text-subtitle1 q-mb-md text-weight-medium text-primary"
+          class="row items-center justify-between q-mb-md"
         >
-          {{ definition.title }}
+          <div class="text-subtitle1 text-weight-medium text-primary">
+            {{ definition.title }}
+          </div>
+          <q-btn
+            v-if="hideDefinitionVideo && definition.videoDefinitionUrl"
+            flat
+            no-caps
+            dense
+            color="primary"
+            class="col-auto"
+            :label="translate('seeDefinitionVideo')"
+            icon="videocam"
+            @click="$emit('showVideo', definition)"
+          />
         </div>
 
         <!-- Definition Content -->
@@ -121,6 +134,7 @@ const emit = defineEmits<{
   (e: 'uploadVideo', definition: Definition, url: string): void;
   (e: 'deleteVideo', definition: Definition): void;
   (e: 'videoError', event: Event): void;
+  (e: 'showVideo', definition: Definition): void;
   (e: 'updateTranslations', definition: Definition, translations: DefinitionTranslation[]): void;
 }>();
 </script>
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
index f6693d7..8cde1ab 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionCardMobile.vue
@@ -19,9 +19,22 @@
         />
         <div
           v-else
-          class="q-mb-sm text-subtitle1 text-weight-medium text-primary"
+          class="row items-center justify-between q-mb-sm"
         >
-          {{ definition.title }}
+          <div class="text-subtitle1 text-weight-medium text-primary">
+            {{ definition.title }}
+          </div>
+          <q-btn
+            v-if="hideDefinitionVideo && definition.videoDefinitionUrl"
+            flat
+            no-caps
+            dense
+            color="primary"
+            class="col-auto"
+            :label="translate('seeDefinitionVideo')"
+            icon="videocam"
+            @click="$emit('showVideo', definition)"
+          />
         </div>
 
         <!-- Definition Content -->
@@ -116,6 +129,7 @@ const emit = defineEmits<{
   (e: 'uploadVideo', definition: Definition, url: string): void;
   (e: 'deleteVideo', definition: Definition): void;
   (e: 'videoError', event: Event): void;
+  (e: 'showVideo', definition: Definition): void;
   (e: 'updateTranslations', definition: Definition, translations: DefinitionTranslation[]): void;
 }>();
 </script>
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
index ca351b5..b6eed4a 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
@@ -68,6 +68,7 @@
           @upload-video="uploadVideo"
           @delete-video="deleteDefinitionVideo"
           @video-error="handleVideoError"
+          @show-video="openVideo"
           @update-translations="updateDefinitionTranslations"
         />
       </q-list>
@@ -85,6 +86,7 @@
         @upload-video="uploadVideo"
         @delete-video="deleteDefinitionVideo"
         @video-error="handleVideoError"
+        @show-video="openVideo"
         @update-translations="updateDefinitionTranslations"
       />
     </q-list>
diff --git a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
index cad9060..f49b808 100644
--- a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
@@ -3,7 +3,6 @@
     <div
       v-if="hasAnyVideoUrl || editMode"
       class="video-angle-container"
-      :style="containerStyle"
     >
       <video
         v-for="video in sortedVideosWithUrl"
@@ -113,7 +112,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, onMounted, nextTick, type ComponentPublicInstance, type StyleValue } from 'vue';
+import { ref, computed, watch, onMounted, nextTick, type ComponentPublicInstance } from 'vue';
 import { SignVideo } from 'src/types/models';
 import translate from 'src/utils/translate';
 import UploadVideoComponent from 'src/components/UploadVideoComponent.vue';
@@ -156,12 +155,6 @@ const selectedVideoData = computed(() => {
   return sortedVideos.value.find((video) => video.id === selectedVideo.value) || sortedVideos.value[0];
 });
 
-const containerStyle = computed<StyleValue>(() => ({
-  height: props.compact ? '240px' : '40dvh',
-  maxHeight: props.compact ? '240px' : '40dvh',
-  width: '100%',
-}));
-
 function registerVideoRef(id: string, el: Element | ComponentPublicInstance | null) {
   if (el instanceof HTMLVideoElement) {
     videoRefs.set(id, el);
@@ -319,7 +312,8 @@ const moveVideoRight = async () => {
 .video-angle-container {
   position: relative;
   width: 100%;
-  background: transparent;
+  aspect-ratio: 16 / 9;
+  background: #000;
   border-radius: var(--sb-card-radius, 12px);
   overflow: hidden;
 }
diff --git a/frontend/src/components/GlossDetail/components/MainContent.vue b/frontend/src/components/GlossDetail/components/MainContent.vue
index 51757d0..63c4993 100644
--- a/frontend/src/components/GlossDetail/components/MainContent.vue
+++ b/frontend/src/components/GlossDetail/components/MainContent.vue
@@ -1,45 +1,14 @@
 <template>
   <q-card-section class="gloss-view-layout">
-    <div
-      v-if="primaryDefinition"
-      class="row justify-start items-center q-mb-md gloss-view-layout__header"
-    >
-      <q-chip
-        outline
-        color="primary"
-      >
-        {{ translate(primaryDefinition.lexicalCategory) }}
-      </q-chip>
-      <span class="text-h6 q-ml-sm">
-        {{ primaryDefinition.title || glossData.gloss }}
-      </span>
-    </div>
-
     <div
       class="gloss-view-layout__body"
       :class="{ 'gloss-view-layout__body--all-videos': showAllVideos }"
     >
       <template v-if="showAllVideos">
-        <div class="gloss-all-videos-view">
-          <q-btn
-            flat
-            no-caps
-            color="primary"
-            class="gloss-all-videos-back q-mb-sm"
-            :label="translate('backToMainVideo')"
-            icon="arrow_back"
-            @click="showAllVideos = false"
-          />
-
-          <div class="gloss-all-videos-scroll">
-            <VideosComponent
-              :model-value="glossData"
-              :edit-mode="false"
-              hide-section-title
-              horizontal-scroll
-            />
-          </div>
-        </div>
+        <SignVideosBrowseView
+          :gloss-data="glossData"
+          @back="showAllVideos = false"
+        />
       </template>
 
       <template v-else>
@@ -135,7 +104,7 @@
 import { computed, ref } from 'vue'
 import { GlossData } from 'src/types/models'
 import SignVideoAside from './SignVideoAside.vue'
-import VideosComponent from './VideosComponent.vue'
+import SignVideosBrowseView from './SignVideosBrowseView.vue'
 import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vue'
 import ExamplesComponent from './ExamplesComponent/ExamplesComponent.vue'
 import RelatedGlosses from './RelatedGlosses.vue'
@@ -148,10 +117,6 @@ const { glossData } = defineProps<{
 const selectedTab = ref('definitions')
 const showAllVideos = ref(false)
 
-const primaryDefinition = computed(() =>
-  [...(glossData.definitions || [])].sort((a, b) => a.priority - b.priority)[0]
-)
-
 const hasSignVideos = computed(() => (glossData.glossVideos?.length ?? 0) > 0)
 
 const hasGlossTranslations = computed(() =>
@@ -172,10 +137,6 @@ const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.v
   overflow: hidden;
 }
 
-.gloss-view-layout__header {
-  flex: 0 0 auto;
-}
-
 .gloss-view-layout__body {
   display: flex;
   flex: 1 1 0;
@@ -204,31 +165,6 @@ const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.v
   overflow: hidden;
 }
 
-.gloss-all-videos-view {
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 0;
-  min-width: 0;
-  min-height: 0;
-  width: 100%;
-  overflow: hidden;
-  align-items: flex-start;
-}
-
-.gloss-all-videos-back {
-  flex: 0 0 auto;
-}
-
-.gloss-all-videos-scroll {
-  flex: 1 1 0;
-  min-height: 0;
-  width: 100%;
-  align-self: stretch;
-  overflow-x: auto;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
-}
-
 .gloss-content-tabs {
   flex: 0 0 auto;
 }
diff --git a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
new file mode 100644
index 0000000..8940920
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
@@ -0,0 +1,241 @@
+<template>
+  <div class="sign-videos-browse">
+    <div class="sign-videos-browse__toolbar">
+      <q-btn
+        flat
+        no-caps
+        color="primary"
+        icon="arrow_back"
+        :label="translate('backToMainVideo')"
+        @click="emit('back')"
+      />
+      <span
+        v-if="sortedVideos.length > 1"
+        class="text-body2 text-grey-7"
+      >
+        {{ sortedVideos.length }} {{ translate('videos') }}
+      </span>
+    </div>
+
+    <div
+      v-if="sortedVideos.length > 1"
+      class="sign-videos-browse__gallery"
+    >
+      <button
+        v-for="video in sortedVideos"
+        :key="video.id"
+        type="button"
+        class="sign-videos-browse__card"
+        :class="{ 'sign-videos-browse__card--active': video.id === selectedVideoId }"
+        @click="selectVideo(video.id)"
+      >
+        <div class="sign-videos-browse__card-title ellipsis">
+          {{ video.title || translate('videos') }}
+        </div>
+        <q-card
+          flat
+          bordered
+          class="sign-videos-browse__card-video"
+        >
+          <GlossVideoComponent
+            :sign-video="video"
+            :edit-mode="false"
+            compact
+          />
+        </q-card>
+      </button>
+    </div>
+
+    <div
+      v-else-if="selectedVideo"
+      class="sign-videos-browse__single"
+    >
+      <div
+        v-if="selectedVideo.title"
+        class="text-subtitle1 text-weight-medium q-mb-sm"
+      >
+        {{ selectedVideo.title }}
+      </div>
+      <q-card
+        flat
+        bordered
+        class="sign-videos-browse__single-video"
+      >
+        <GlossVideoComponent
+          :sign-video="selectedVideo"
+          :edit-mode="false"
+        />
+      </q-card>
+    </div>
+
+    <q-card
+      v-if="selectedVideo?.videoData"
+      flat
+      bordered
+      class="sign-videos-browse__phonology"
+    >
+      <SignFonologyComponent
+        :video-data="selectedVideo.videoData"
+        :edit-mode="false"
+      />
+    </q-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { GlossData } from 'src/types/models'
+import GlossVideoComponent from './GlossVideoComponent.vue'
+import SignFonologyComponent from './SignFonologyComponent.vue'
+import translate from 'src/utils/translate'
+
+const { glossData } = defineProps<{
+  glossData: GlossData
+}>()
+
+const emit = defineEmits<{
+  (e: 'back'): void
+}>()
+
+const selectedVideoId = ref<string | null>(null)
+
+const sortedVideos = computed(() =>
+  [...(glossData.glossVideos || [])].sort(
+    (a, b) => (a.priority || 0) - (b.priority || 0)
+  )
+)
+
+const selectedVideo = computed(() =>
+  sortedVideos.value.find((video) => video.id === selectedVideoId.value) ?? null
+)
+
+watch(
+  sortedVideos,
+  (videos) => {
+    if (!videos.length) {
+      selectedVideoId.value = null
+      return
+    }
+
+    if (!videos.some((video) => video.id === selectedVideoId.value)) {
+      selectedVideoId.value = videos[0]?.id ?? null
+    }
+  },
+  { immediate: true }
+)
+
+function selectVideo(videoId: string | undefined) {
+  if (videoId) {
+    selectedVideoId.value = videoId
+  }
+}
+</script>
+
+<style scoped>
+.sign-videos-browse {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 0;
+  min-height: 0;
+  width: 100%;
+  overflow: hidden;
+}
+
+.sign-videos-browse__toolbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex: 0 0 auto;
+  margin-bottom: 12px;
+  gap: 12px;
+}
+
+.sign-videos-browse__gallery {
+  display: flex;
+  gap: 16px;
+  flex: 0 0 auto;
+  overflow-x: auto;
+  overflow-y: hidden;
+  padding-bottom: 8px;
+  margin-bottom: 16px;
+  scrollbar-gutter: stable;
+  -webkit-overflow-scrolling: touch;
+}
+
+.sign-videos-browse__card {
+  flex: 0 0 380px;
+  width: 380px;
+  border: 2px solid transparent;
+  border-radius: var(--sb-card-radius, 12px);
+  background: transparent;
+  cursor: pointer;
+  padding: 4px;
+  text-align: left;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.sign-videos-browse__card:hover {
+  border-color: rgba(200, 16, 47, 0.35);
+}
+
+.sign-videos-browse__card--active {
+  border-color: var(--primary);
+  box-shadow: 0 2px 12px rgba(200, 16, 47, 0.12);
+}
+
+.sign-videos-browse__card-title {
+  font-size: 0.9rem;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.75);
+  margin-bottom: 8px;
+  padding: 0 4px;
+}
+
+.sign-videos-browse__card-video {
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+}
+
+.sign-videos-browse__single {
+  flex: 0 0 auto;
+  margin-bottom: 16px;
+}
+
+.sign-videos-browse__single-video {
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+}
+
+.sign-videos-browse__phonology {
+  flex: 1 1 0;
+  min-height: 0;
+  overflow-y: auto;
+  border-radius: var(--sb-card-radius, 12px);
+  padding: 12px 16px;
+  -webkit-overflow-scrolling: touch;
+}
+
+.sign-videos-browse__phonology :deep(.sign-phonology) {
+  margin-top: 0;
+}
+
+.sign-videos-browse__phonology :deep(.phonology-filters > .column) {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  column-gap: 20px;
+  row-gap: 4px;
+}
+
+.sign-videos-browse__phonology :deep(.q-item-label) {
+  margin-bottom: 2px;
+  font-size: 0.7rem;
+  letter-spacing: 0.02em;
+  text-transform: uppercase;
+  color: rgba(0, 0, 0, 0.5);
+}
+
+.sign-videos-browse__phonology :deep(.q-py-sm) {
+  padding-top: 0 !important;
+  padding-bottom: 10px !important;
+}
+</style>
diff --git a/frontend/src/components/VideoPlayerPopup.vue b/frontend/src/components/VideoPlayerPopup.vue
index 6951e30..6887463 100644
--- a/frontend/src/components/VideoPlayerPopup.vue
+++ b/frontend/src/components/VideoPlayerPopup.vue
@@ -1,35 +1,38 @@
 <template>
   <q-dialog
     v-model="showDialog"
-    persistent
-    transition-show="slide-up"
-    transition-hide="slide-down"
+    transition-show="fade"
+    transition-hide="fade"
   >
-    <q-card class="column">
-      <q-card-section class="row items-start q-pb-none no-wrap">
-        <q-space />
+    <q-card class="video-player-dialog">
+      <q-card-section class="video-player-dialog__header row items-center no-wrap q-pa-md">
+        <div class="text-subtitle1 text-weight-medium col ellipsis">
+          {{ title }}
+        </div>
         <q-btn
           v-close-popup
           icon="close"
           flat
           round
           dense
+          class="col-auto q-ml-sm"
+          :aria-label="translate('cancel')"
         />
       </q-card-section>
 
-      <q-card-section class="col q-pa-md flex flex-center">
-        <video
-          ref="videoPlayer"
-          controls
-          autoplay
-          loop
-          class="video-player"
-          :src="getVideoUrl(videoUrl)"
-          muted
-          @error="handleVideoError"
-        />
-        <div class="text-h6 q-mt-md">
-          {{ title }}
+      <q-card-section class="video-player-dialog__body q-pa-md">
+        <div class="video-player-dialog__frame">
+          <video
+            ref="videoPlayer"
+            controls
+            autoplay
+            loop
+            playsinline
+            class="video-player-dialog__video"
+            :src="getVideoUrl(videoUrl)"
+            muted
+            @error="handleVideoError"
+          />
         </div>
       </q-card-section>
     </q-card>
@@ -37,7 +40,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { ref, watch, nextTick } from 'vue';
 import { useQuasar } from 'quasar';
 import translate from 'src/utils/translate';
 import { getVideoUrl } from 'src/utils/videoUrl'
@@ -57,14 +60,24 @@ const emit = defineEmits<{
 const showDialog = ref(props.showDialog);
 const videoPlayer = ref<HTMLVideoElement | null>(null);
 
-watch(() => props.showDialog, (newValue) => {
+watch(() => props.showDialog, async (newValue) => {
   showDialog.value = newValue;
+
+  if (newValue) {
+    await nextTick();
+    if (videoPlayer.value) {
+      videoPlayer.value.currentTime = 0;
+      void videoPlayer.value.play().catch(() => undefined);
+    }
+  }
 });
 
 watch(showDialog, (newValue) => {
   emit('update:show-dialog', newValue);
+
   if (!newValue && videoPlayer.value) {
     videoPlayer.value.pause();
+    videoPlayer.value.currentTime = 0;
   }
 });
 
@@ -77,15 +90,34 @@ const handleVideoError = () => {
 </script>
 
 <style scoped>
-.video-player {
-  max-width: 100%;
-  max-height: calc(100vh - 150px);
-  width: auto;
-  height: auto;
+.video-player-dialog {
+  width: min(92vw, 720px);
+  max-width: 92vw;
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+  box-shadow: 0 16px 48px rgba(0, 0, 0, 0.18);
+}
+
+.video-player-dialog__header {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+}
+
+.video-player-dialog__body {
+  background: #f7f7f7;
+}
+
+.video-player-dialog__frame {
+  border-radius: calc(var(--sb-card-radius, 12px) - 2px);
+  overflow: hidden;
+  background: #000;
+  line-height: 0;
 }
 
-.q-dialog__inner--maximized > div {
-  max-width: 1200px;
-  margin: 0 auto;
+.video-player-dialog__video {
+  display: block;
+  width: 100%;
+  max-height: min(70vh, 480px);
+  object-fit: contain;
+  vertical-align: middle;
 }
-</style> 
\ No newline at end of file
+</style>
diff --git a/frontend/src/pages/GlossPage.vue b/frontend/src/pages/GlossPage.vue
index 70412f8..202fdcb 100644
--- a/frontend/src/pages/GlossPage.vue
+++ b/frontend/src/pages/GlossPage.vue
@@ -1,5 +1,8 @@
 <template>
-  <q-page class="gloss-page column">
+  <q-page
+    class="column"
+    :class="{ 'gloss-page': !editMode }"
+  >
     <LoadingComponent
       v-if="loading"
       :loading="loading"
@@ -39,6 +42,7 @@
       v-else-if="glossData"
       v-model:edit-mode="editMode"
       class="gloss-page__detail col column"
+      :class="{ 'gloss-page__detail--editing': editMode }"
       :gloss-data="glossData"
       :allow-edit="true"
       :constrained-layout="!editMode"
@@ -126,4 +130,11 @@ const updateGlossData = (updatedGlossData: GlossData) => {
   height: 100%;
   overflow: hidden;
 }
+
+.gloss-page__detail--editing {
+  flex: 1 1 auto;
+  min-height: auto;
+  height: auto;
+  overflow: visible;
+}
 </style>

From b6ec8cb99c5c5d5c187eba33b7db2988a90d708c Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Thu, 18 Jun 2026 18:05:16 +0200
Subject: [PATCH 07/17] doc: add documentation and parsing ENUMS

---
 backend/package.json                          |    5 +-
 backend/scripts/analyze-fitxa-mappings.js     |  219 ++
 backend/scripts/generate-enum-reference.js    |  107 +
 backend/scripts/generate-fitxa-mappings.js    |  301 ++
 backend/src/import/fitxa-enum-mappings.json   | 3448 +++++++++++++++++
 backend/src/import/fitxa-enum-resolver.ts     |  103 +
 docs/fitxas-enum-mappings.md                  |  122 +
 docs/fitxas-import-enums-reference.md         |  530 +++
 docs/fitxas-import-meeting-agenda.md          |  281 ++
 docs/fitxas-import-plan.md                    |  497 +++
 docs/fitxas-mapping-analysis.json             |  666 ++++
 .../GlossDetail/GlossDetailComponent.vue      |   13 +-
 .../components/MoreContentComponent.vue       |   95 +-
 frontend/src/i18n/en-US/index.ts              |    7 +
 14 files changed, 6313 insertions(+), 81 deletions(-)
 create mode 100644 backend/scripts/analyze-fitxa-mappings.js
 create mode 100644 backend/scripts/generate-enum-reference.js
 create mode 100644 backend/scripts/generate-fitxa-mappings.js
 create mode 100644 backend/src/import/fitxa-enum-mappings.json
 create mode 100644 backend/src/import/fitxa-enum-resolver.ts
 create mode 100644 docs/fitxas-enum-mappings.md
 create mode 100644 docs/fitxas-import-enums-reference.md
 create mode 100644 docs/fitxas-import-meeting-agenda.md
 create mode 100644 docs/fitxas-import-plan.md
 create mode 100644 docs/fitxas-mapping-analysis.json

diff --git a/backend/package.json b/backend/package.json
index 0cff4fb..f752662 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -48,7 +48,8 @@
     "ts-loader": "^9.5.2",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "5.7.3"
+    "typescript": "5.7.3",
+    "xlsx": "^0.18.5"
   },
   "jest": {
     "collectCoverageFrom": [
@@ -91,4 +92,4 @@
     "restore:database": "node scripts/restore-database.js"
   },
   "version": "0.0.1"
-}
\ No newline at end of file
+}
diff --git a/backend/scripts/analyze-fitxa-mappings.js b/backend/scripts/analyze-fitxa-mappings.js
new file mode 100644
index 0000000..39ea119
--- /dev/null
+++ b/backend/scripts/analyze-fitxa-mappings.js
@@ -0,0 +1,219 @@
+/**
+ * Reads Traducció etiquetes-Taules.xlsx and compares with SignBank Prisma enums.
+ * Run: node backend/scripts/analyze-fitxa-mappings.js [path-to-xlsx]
+ */
+const fs = require('fs');
+const path = require('path');
+const XLSX = require('xlsx');
+
+const root = path.join(__dirname, '..', '..');
+const xlsxPath =
+  process.argv[2] ||
+  path.join(process.env.USERPROFILE || '', 'Downloads', 'Traducció etiquetes-Taules.xlsx');
+
+const schema = fs.readFileSync(path.join(root, 'backend/prisma/schema.prisma'), 'utf8');
+
+function extractEnum(name) {
+  const re = new RegExp(`enum ${name} \\{([^}]+)\\}`, 's');
+  const m = schema.match(re);
+  if (!m) return [];
+  return m[1]
+    .split('\n')
+    .map((l) => l.trim())
+    .filter((l) => l && !l.startsWith('//'));
+}
+
+function sheetRows(wb, name) {
+  const sheet = wb.Sheets[name];
+  if (!sheet) return [];
+  return XLSX.utils.sheet_to_json(sheet, { defval: '' });
+}
+
+function norm(s) {
+  return String(s ?? '')
+    .trim()
+    .normalize('NFD')
+    .replace(/\p{M}/gu, '')
+    .toLowerCase();
+}
+
+function confFromOrdre(ordre, idConfig) {
+  if (idConfig && /^[0-9]+[A-Za-z0-9]*$/i.test(String(idConfig).trim())) {
+    const id = String(idConfig).trim();
+    if (/^\d+$/.test(id)) return `CONF_${id}`;
+    return `CONF_${id.toUpperCase()}`;
+  }
+  if (ordre === '' || ordre == null) return null;
+  const n = String(ordre).trim();
+  if (/^\d+$/.test(n)) return `CONF_${n}`;
+  return null;
+}
+
+function locationFromEnglish(en) {
+  if (!en || en === '----') return null;
+  return en
+    .trim()
+    .replace(/\s*>\s*/g, '_TO_')
+    .replace(/\s*\+\s*/g, '_AND_')
+    .replace(/\s*\/\s*/g, '_OR_')
+    .replace(/:/g, '')
+    .replace(/'/g, '')
+    .replace(/[^A-Za-z0-9_]/g, '_')
+    .replace(/_+/g, '_')
+    .replace(/^_|_$/g, '')
+    .toUpperCase()
+    .replace(/BACK_OF_HEAD/, 'BACK_OF_HEAD')
+    .replace(/WEAK_HAND_INDEX_FINGER/, 'WEAK_HAND_INDEX_FINGER');
+}
+
+const wb = XLSX.readFile(xlsxPath);
+const report = { sheets: wb.SheetNames, comparisons: {} };
+
+// --- HandConfiguration ---
+const confRows = sheetRows(wb, 'Configuracions');
+const handConfs = extractEnum('HandConfiguration').filter((v) => v !== 'EMPTY');
+const confMappings = [];
+for (const row of confRows) {
+  const ordre = row.ORDRE_ORDENACIO ?? row['ORDRE / ORDENACIO'];
+  const idConfig = row.ID_CONFIGURACIO;
+  const cat = row.CONFIGURACIO_CAT;
+  const en = row['CONFIGURACIÓ_EN'] ?? row.CONFIGURACIO_EN;
+  if (!cat && !en && !ordre) continue;
+  const signbankId = confFromOrdre(ordre, idConfig);
+  confMappings.push({
+    sourceCat: cat,
+    sourceEn: en,
+    ordre,
+    idConfig,
+    signbankId,
+    signbankMatch: signbankId ? handConfs.includes(signbankId) : false,
+  });
+}
+const matchedConf = confMappings.filter((m) => m.signbankMatch);
+const unmatchedConf = confMappings.filter((m) => m.signbankId && !m.signbankMatch);
+const noIdConf = confMappings.filter((m) => !m.signbankId);
+report.comparisons.HandConfiguration = {
+  xlsxRows: confMappings.length,
+  matched: matchedConf.length,
+  unmatchedSignbankId: unmatchedConf,
+  noSignbankId: noIdConf.length,
+  prismaOnly: handConfs.filter(
+    (c) => !confMappings.some((m) => m.signbankId === c),
+  ),
+};
+
+// --- Hand (handedness) ---
+const handRows = sheetRows(wb, 'Handedness-mans');
+const handEnum = extractEnum('Hand');
+report.comparisons.Hand = {
+  note: 'XLSX uses 1/2a/2n/2s/x — SignBank uses RIGHT/LEFT/BOTH. Needs semantic mapping, not 1:1.',
+  xlsxValues: handRows
+    .map((r) => ({ code: r.ANGLÈS || r.ANGLÈS, cat: r.CATALÀ, en: r['DESCRIPCIÓ EN ANGLÈS'] }))
+    .filter((r) => r.code),
+  signbankEnum: handEnum,
+};
+
+// --- LexicalCategory ---
+const lexRows = sheetRows(wb, 'Categoria lèxica');
+const lexEnum = extractEnum('LexicalCategory');
+const lexMap = [];
+for (const row of lexRows) {
+  const en = row.ANGLÈS;
+  const cat = row.CATALÀ;
+  if (!en) continue;
+  const guess = en
+    .toUpperCase()
+    .replace(/[^A-Z]+/g, '_')
+    .replace(/_+/g, '_')
+    .replace(/^_|_$/g, '');
+  lexMap.push({ sourceEn: en, sourceCat: cat, guess, match: lexEnum.includes(guess) });
+}
+report.comparisons.LexicalCategory = {
+  rows: lexMap,
+  unmatched: lexMap.filter((r) => !r.match),
+};
+
+// --- RelationType ---
+const relRows = sheetRows(wb, 'Tipus_relació_altres_signes');
+const relEnum = extractEnum('RelationType');
+report.comparisons.RelationType = {
+  xlsxRows: relRows.filter((r) => r.CATALÀ || r.ANGLÈS),
+  signbankEnum: relEnum,
+};
+
+// --- Location (sample match by English label) ---
+const locRows = sheetRows(wb, 'Localitzacions');
+const locEnum = extractEnum('Location').filter((v) => v !== 'EMPTY');
+const locMappings = [];
+for (const row of locRows) {
+  const en = row.ANGLÈS;
+  const cat = row.CATALÀ;
+  if (!en || en === '----') continue;
+  const guess = locationFromEnglish(en);
+  locMappings.push({
+    sourceEn: en,
+    sourceCat: cat,
+    guess,
+    match: guess ? locEnum.includes(guess) : false,
+  });
+}
+report.comparisons.Location = {
+  xlsxRows: locMappings.length,
+  matched: locMappings.filter((m) => m.match).length,
+  unmatchedSamples: locMappings.filter((m) => !m.match).slice(0, 30),
+  prismaOnlyCount: locEnum.filter((l) => !locMappings.some((m) => m.guess === l)).length,
+};
+
+// Generic sheets for phonology enums
+const phonologySheets = [
+  { sheet: 'Canvi de configuració', enum: 'ConfigurationChange', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+  { sheet: 'Relació entre articuladors', enum: 'RelationBetweenArticulators', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+  { sheet: 'Oirentació relativa_moviment', enum: 'MovementRelatedOrientation', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+  { sheet: 'Orientació relativa_localitzaci', enum: 'OrientationRelatedToLocation', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+  { sheet: 'Canvi_orientació', enum: 'OrientationChange', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+  { sheet: 'Tipus_contacte', enum: 'ContactType', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+  { sheet: 'Forma_moviment', enum: 'MovementType', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+  { sheet: 'Direcció_moviment', enum: 'MovementDirection', enCol: 'ANGLÈS', catCol: 'CATALÀ' },
+];
+
+for (const { sheet, enum: enumName, enCol, catCol } of phonologySheets) {
+  const rows = sheetRows(wb, sheet);
+  const values = extractEnum(enumName).filter((v) => v !== 'EMPTY');
+  const mapped = [];
+  for (const row of rows) {
+    const en = row[enCol];
+    const cat = row[catCol];
+    if (!en || en === '----' || en === '-------------') continue;
+    const guess = en
+      .toUpperCase()
+      .replace(/\s*>\s*/g, '_TO_')
+      .replace(/\s*\+\s*/g, '_AND_')
+      .replace(/\s*\|\s*/g, '_OR_')
+      .replace(/[^A-Z0-9]+/g, '_')
+      .replace(/_+/g, '_')
+      .replace(/^_|_$/g, '');
+    mapped.push({ sourceEn: en, sourceCat: cat, guess, match: values.includes(guess) });
+  }
+  report.comparisons[enumName] = {
+    sheet,
+    xlsxRows: mapped.length,
+    matched: mapped.filter((m) => m.match).length,
+    unmatchedSamples: mapped.filter((m) => !m.match).slice(0, 15),
+    prismaOnlyCount: values.filter((v) => !mapped.some((m) => m.guess === v)).length,
+  };
+}
+
+const outPath = path.join(root, 'docs/fitxas-mapping-analysis.json');
+fs.writeFileSync(outPath, JSON.stringify(report, null, 2));
+
+console.log('Analysis written to', outPath);
+console.log('\nSummary:');
+for (const [k, v] of Object.entries(report.comparisons)) {
+  if (v.matched != null && v.xlsxRows != null) {
+    console.log(`  ${k}: ${v.matched}/${v.xlsxRows} auto-matched`);
+  } else if (v.rows) {
+    console.log(`  ${k}: ${v.rows.filter((r) => r.match).length}/${v.rows.length} auto-matched`);
+  } else {
+    console.log(`  ${k}: see JSON`);
+  }
+}
diff --git a/backend/scripts/generate-enum-reference.js b/backend/scripts/generate-enum-reference.js
new file mode 100644
index 0000000..6b824a3
--- /dev/null
+++ b/backend/scripts/generate-enum-reference.js
@@ -0,0 +1,107 @@
+const fs = require('fs');
+const path = require('path');
+
+const root = path.join(__dirname, '..', '..');
+const schema = fs.readFileSync(path.join(root, 'backend/prisma/schema.prisma'), 'utf8');
+const caPhon = fs.readFileSync(path.join(root, 'frontend/src/i18n/ca-ES/phonology.ts'), 'utf8');
+const caIndex = fs.readFileSync(path.join(root, 'frontend/src/i18n/ca-ES/index.ts'), 'utf8');
+
+function extractEnum(name) {
+  const re = new RegExp(`enum ${name} \\{([^}]+)\\}`, 's');
+  const m = schema.match(re);
+  if (!m) return [];
+  return m[1]
+    .split('\n')
+    .map((l) => l.trim())
+    .filter((l) => l && !l.startsWith('//'));
+}
+
+function extractPhonLabels(section) {
+  const start = caPhon.indexOf(`${section}:`);
+  if (start < 0) return {};
+  const sub = caPhon.slice(start);
+  const end = sub.indexOf('\n    },');
+  const body = sub.slice(0, end);
+  const labels = {};
+  for (const m of body.matchAll(/(\w+):\s*'((?:\\'|[^'])*)'/g)) {
+    if (!m[1].endsWith('_description')) {
+      labels[m[1]] = m[2].replace(/\\'/g, "'");
+    }
+  }
+  return labels;
+}
+
+function indexLabel(key) {
+  const m = caIndex.match(new RegExp(`${key}: '([^']*)'`));
+  return m ? m[1] : '';
+}
+
+const importEnums = [
+  'Language',
+  'LexicalCategory',
+  'RelationType',
+  'Hand',
+  'HandConfiguration',
+  'ConfigurationChange',
+  'RelationBetweenArticulators',
+  'Location',
+  'MovementRelatedOrientation',
+  'OrientationRelatedToLocation',
+  'OrientationChange',
+  'ContactType',
+  'MovementType',
+  'MovementDirection',
+];
+
+const phonSections = {
+  HandConfiguration: 'handConfiguration',
+  ConfigurationChange: 'configurationChange',
+  RelationBetweenArticulators: 'relationBetweenArticulators',
+  Location: 'location',
+  MovementRelatedOrientation: 'movementRelatedOrientation',
+  OrientationRelatedToLocation: 'orientationRelatedToLocation',
+  OrientationChange: 'orientationChange',
+  ContactType: 'contactType',
+  MovementType: 'movementType',
+  MovementDirection: 'movementDirection',
+};
+
+let out = `# SignBank — Referència d'ENUMs per a la importació
+
+Valors tancats definits a \`backend/prisma/schema.prisma\`. Les etiquetes en català són les que mostra l'aplicació avui (\`frontend/src/i18n/ca-ES/\`).
+
+**Generat:** ${new Date().toISOString().slice(0, 10)}
+
+Per cada valor cal decidir a la reunió:
+- **A)** El JSON de les fitxes ja usa aquest vocabulari (o un de equivalent) → només cal una taula de correspondència.
+- **B)** El vocabulari de les fitxes és diferent → cal definir el mapatge fitxa → SignBank, o ampliar els ENUMs de SignBank.
+
+---
+
+`;
+
+for (const en of importEnums) {
+  const vals = extractEnum(en);
+  out += `## ${en} (${vals.length} valors)\n\n`;
+  out += '| SignBank ID | Etiqueta UI (ca) | Notes reunió |\n';
+  out += '|-------------|------------------|-------------|\n';
+  const phon = phonSections[en];
+  const labels = phon ? extractPhonLabels(phon) : {};
+  for (const v of vals) {
+    let label = labels[v] || '';
+    if (!label && (en === 'LexicalCategory' || en === 'RelationType')) {
+      label = indexLabel(v);
+    }
+    if (!label && en === 'Language') {
+      label = { CATALAN: 'Català', SPANISH: 'Castellà', ENGLISH: 'Anglès', OTHER: 'Altre' }[v] || '';
+    }
+    if (!label && en === 'Hand') {
+      label = { RIGHT: 'Mà dreta / dominant?', LEFT: 'Mà esquerra', BOTH: 'Ambdues mans' }[v] || '';
+    }
+    out += `| \`${v}\` | ${label.replace(/\|/g, '\\|')} | |\n`;
+  }
+  out += '\n';
+}
+
+fs.writeFileSync(path.join(root, 'docs/fitxas-import-enums-reference.md'), out);
+console.log('Wrote docs/fitxas-import-enums-reference.md');
diff --git a/backend/scripts/generate-fitxa-mappings.js b/backend/scripts/generate-fitxa-mappings.js
new file mode 100644
index 0000000..5ae3d03
--- /dev/null
+++ b/backend/scripts/generate-fitxa-mappings.js
@@ -0,0 +1,301 @@
+/**
+ * Generates canonical fitxa → SignBank enum mappings from Traducció etiquetes-Taules.xlsx
+ *
+ * Run:
+ *   node backend/scripts/generate-fitxa-mappings.js [path-to-xlsx]
+ *
+ * Output:
+ *   backend/src/import/fitxa-enum-mappings.json
+ */
+const fs = require('fs');
+const path = require('path');
+const XLSX = require('xlsx');
+
+const root = path.join(__dirname, '..', '..');
+const xlsxPath =
+  process.argv[2] ||
+  path.join(process.env.USERPROFILE || '', 'Downloads', 'Traducció etiquetes-Taules.xlsx');
+const outDir = path.join(root, 'backend/src/import');
+const outPath = path.join(outDir, 'fitxa-enum-mappings.json');
+
+const schema = fs.readFileSync(path.join(root, 'backend/prisma/schema.prisma'), 'utf8');
+
+function extractEnum(name) {
+  const re = new RegExp(`enum ${name} \\{([^}]+)\\}`, 's');
+  const m = schema.match(re);
+  if (!m) return [];
+  return m[1]
+    .split('\n')
+    .map((l) => l.trim())
+    .filter((l) => l && !l.startsWith('//'));
+}
+
+function sheetRows(wb, name) {
+  const sheet = wb.Sheets[name];
+  if (!sheet) return [];
+  return XLSX.utils.sheet_to_json(sheet, { defval: '' });
+}
+
+function norm(s) {
+  return String(s ?? '')
+    .trim()
+    .normalize('NFD')
+    .replace(/\p{M}/gu, '')
+    .toLowerCase()
+    .replace(/\s+/g, ' ');
+}
+
+function enToEnumKey(en) {
+  if (!en || en === '----' || en === '---' || en === '-------------') return null;
+  return en
+    .trim()
+    .replace(/\s*>\s*/g, '_TO_')
+    .replace(/\s*\+\s*/g, '_AND_')
+    .replace(/\s*\/\s*/g, '_OR_')
+    .replace(/\s*\|\s*/g, '_OR_')
+    .replace(/:/g, '')
+    .replace(/'/g, '')
+    .replace(/[^A-Za-z0-9_]/g, '_')
+    .replace(/_+/g, '_')
+    .replace(/^_|_$/g, '')
+    .toUpperCase();
+}
+
+function confSignbankId(ordre, idConfig) {
+  const ordreStr = String(ordre ?? '').trim();
+  if (/^\d+$/.test(ordreStr)) return `CONF_${ordreStr}`;
+
+  const id = String(idConfig ?? '').trim();
+  if (!id || id.startsWith('http')) return null;
+  if (/^\d+$/.test(id)) return `CONF_${id}`;
+  if (/^[0-9A-Za-z]+$/.test(id)) return `CONF_${id.toUpperCase()}`;
+
+  return null;
+}
+
+function addEntry(map, signbankId, aliases) {
+  if (!signbankId) return;
+  if (!map[signbankId]) {
+    map[signbankId] = { signbankId, aliases: new Set() };
+  }
+  for (const a of aliases) {
+    const key = norm(a);
+    if (key) map[signbankId].aliases.add(key);
+  }
+}
+
+function finalize(map) {
+  return Object.values(map)
+    .map((e) => ({
+      signbankId: e.signbankId,
+      aliases: [...e.aliases].sort(),
+    }))
+    .sort((a, b) => a.signbankId.localeCompare(b.signbankId));
+}
+
+function buildSimpleEnumMap(wb, sheetName, enumName, extra = {}) {
+  const rows = sheetRows(wb, sheetName);
+  const allowed = new Set(extractEnum(enumName));
+  const bySignbank = {};
+  const unmapped = [];
+
+  for (const row of rows) {
+    const en = row.ANGLÈS;
+    const cat = row.CATALÀ;
+    if (!en || en === '----' || en === '---') continue;
+
+    const signbankId = enToEnumKey(en);
+    const aliases = [en, cat, en.replace(/\+/g, ' + '), en.replace(/>/g, ' > ')];
+    if (cat) aliases.push(cat);
+
+    if (signbankId && allowed.has(signbankId)) {
+      addEntry(bySignbank, signbankId, aliases);
+    } else {
+      unmapped.push({ sourceEn: en, sourceCa: cat, guessedId: signbankId });
+    }
+  }
+
+  return {
+    enum: enumName,
+    sheet: sheetName,
+    entries: finalize(bySignbank),
+    unmapped,
+    ...extra,
+  };
+}
+
+const wb = XLSX.readFile(xlsxPath);
+const output = {
+  meta: {
+    generatedAt: new Date().toISOString(),
+    sourceFile: path.basename(xlsxPath),
+    description:
+      'Maps fitxa/scraper labels (CA/EN) to SignBank Prisma enum IDs. Lookup: normalize input, match aliases[].',
+  },
+  fields: {},
+};
+
+// Handedness — fitxa taxonomy (NOT SignBank Hand enum)
+const handednessRows = sheetRows(wb, 'Handedness-mans');
+output.fields.handedness = {
+  note: 'JSON field phonology.nombre_mans. SignBank Hand (RIGHT/LEFT/BOTH) is a different concept — store handedness code separately or extend schema.',
+  entries: handednessRows
+    .filter((r) => r.ANGLÈS)
+    .map((r) => ({
+      code: String(r.ANGLÈS).trim(),
+      labelCa: r.CATALÀ,
+      labelEn: r['DESCRIPCIÓ EN ANGLÈS'] || r.DESCRIPCIÓ,
+      aliases: [...new Set([r.ANGLÈS, r.CATALÀ].filter(Boolean).map(norm))],
+    })),
+};
+
+// HandConfiguration — from Configuracions sheet
+const confRows = sheetRows(wb, 'Configuracions');
+const confAllowed = new Set(extractEnum('HandConfiguration'));
+const confBySignbank = {};
+const confUnmapped = [];
+for (const row of confRows) {
+  const cat = row.CONFIGURACIO_CAT;
+  const en = row['CONFIGURACIÓ_EN'] ?? row.CONFIGURACIO_EN;
+  const ordre = row.ORDRE_ORDENACIO;
+  const idConfig = row.ID_CONFIGURACIO;
+  if (!cat && !en && !ordre) continue;
+
+  const signbankId = confSignbankId(ordre, idConfig);
+  const catStr = String(cat || '').trim();
+  const enStr = String(en || '').trim();
+  const aliases = [catStr, enStr, `${catStr} (${enStr})`, `${enStr} (${catStr})`].filter(Boolean);
+  if (catStr && enStr) {
+    aliases.push(`${catStr.toUpperCase()} (${enStr})`);
+  }
+
+  if (signbankId && confAllowed.has(signbankId)) {
+    addEntry(confBySignbank, signbankId, aliases);
+  } else {
+    confUnmapped.push({ cat, en, ordre, idConfig, signbankId });
+  }
+}
+output.fields.configuration = {
+  enum: 'HandConfiguration',
+  jsonField: 'phonology.configuracio',
+  alsoMaps: ['configuracio_ma_dominant', 'configuracio_ma_no_dominant'],
+  entries: finalize(confBySignbank),
+  unmapped: confUnmapped,
+};
+
+// Standard phonology enums from English-keyed sheets
+const phonologySheets = [
+  { key: 'configurationChanges', enum: 'ConfigurationChange', sheet: 'Canvi de configuració', jsonField: 'phonology.canvi_configuracio' },
+  { key: 'relationBetweenArticulators', enum: 'RelationBetweenArticulators', sheet: 'Relació entre articuladors', jsonField: 'phonology.relacio_articuladors' },
+  { key: 'location', enum: 'Location', sheet: 'Localitzacions', jsonField: 'phonology.localitzacio' },
+  { key: 'movementRelatedOrientation', enum: 'MovementRelatedOrientation', sheet: 'Oirentació relativa_moviment', jsonField: 'phonology.orientacio_moviment' },
+  { key: 'orientationRelatedToLocation', enum: 'OrientationRelatedToLocation', sheet: 'Orientació relativa_localitzaci', jsonField: 'phonology.orientacio_localitzacio' },
+  { key: 'orientationChange', enum: 'OrientationChange', sheet: 'Canvi_orientació', jsonField: 'phonology.canvi_orientacio' },
+  { key: 'contactType', enum: 'ContactType', sheet: 'Tipus_contacte', jsonField: 'phonology.tipus_contacte' },
+  { key: 'movementType', enum: 'MovementType', sheet: 'Forma_moviment', jsonField: 'phonology.forma_moviment' },
+  { key: 'movementDirection', enum: 'MovementDirection', sheet: 'Direcció_moviment', jsonField: 'phonology.direccio_moviment' },
+];
+
+for (const { key, enum: enumName, sheet, jsonField } of phonologySheets) {
+  output.fields[key] = {
+    ...buildSimpleEnumMap(wb, sheet, enumName),
+    jsonField,
+  };
+}
+
+// Lexical category — manual fixes for typos + Catalan fitxa labels
+const lexManual = {
+  INETERJECTION: 'INTERJECTION',
+  PARTICLE_NOUN_OR_VERB: 'PARTICLE_NOUN_OR_VERB',
+  VERB_AND_ADJECTIVE: 'VERB_OR_ADJECTIVE',
+  ADJECTIVE_AND_VERB: 'VERB_OR_ADJECTIVE',
+  ADVERB_AND_ADJECTIVE: 'ADJECTIVE_OR_ADVERB',
+  ADVERB_AND_VERB: 'VERB_OR_ADVERB',
+  VERB_AND_ADVERB: 'VERB_OR_ADVERB',
+};
+const lexRows = sheetRows(wb, 'Categoria lèxica');
+const lexAllowed = new Set(extractEnum('LexicalCategory'));
+const lexBySignbank = {};
+const lexUnmapped = [];
+for (const row of lexRows) {
+  const en = row.ANGLÈS;
+  const cat = row.CATALÀ;
+  if (!en) continue;
+  let signbankId = enToEnumKey(en);
+  if (lexManual[signbankId]) signbankId = lexManual[signbankId];
+  if (signbankId && lexAllowed.has(signbankId)) {
+    addEntry(lexBySignbank, signbankId, [en, cat, cat?.replace(/ o /gi, ' o ')]);
+  } else {
+    lexUnmapped.push({ sourceEn: en, sourceCa: cat, guessedId: signbankId });
+  }
+}
+output.fields.lexicalCategory = {
+  enum: 'LexicalCategory',
+  jsonField: 'lexical_category',
+  entries: finalize(lexBySignbank),
+  unmapped: lexUnmapped,
+};
+
+// Relation types
+const relManual = {
+  ALL: null,
+  SEE_ALSO: 'ASSOCIATED_CONCEPT',
+};
+const relRows = sheetRows(wb, 'Tipus_relació_altres_signes');
+const relAllowed = new Set(extractEnum('RelationType'));
+const relBySignbank = {};
+const relUnmapped = [];
+for (const row of relRows) {
+  const en = row.ANGLÈS;
+  const cat = row.CATALÀ;
+  if (!en || en === '---') continue;
+  let signbankId = enToEnumKey(en);
+  if (relManual[signbankId] !== undefined) signbankId = relManual[signbankId];
+  const jsonKeys = {
+    SYNONYM: 'SINÒNIM',
+    ANTONYM: 'ANTÒNIM',
+    HOMONYM: 'HOMÒNIM',
+    VARIANT: 'VARIANT',
+    HYPERNYM: 'HIPERÒNIM',
+    HYPONYM: 'HIPÒNIM',
+    ASSOCIATED_CONCEPT: 'VEURE TAMBÉ',
+  };
+  const aliases = [en, cat, jsonKeys[signbankId]].filter(Boolean);
+  if (signbankId && relAllowed.has(signbankId)) {
+    addEntry(relBySignbank, signbankId, aliases);
+  } else if (signbankId) {
+    relUnmapped.push({ sourceEn: en, sourceCa: cat, guessedId: signbankId });
+  }
+}
+output.fields.relationType = {
+  enum: 'RelationType',
+  jsonField: 'related_signs',
+  entries: finalize(relBySignbank),
+  unmapped: relUnmapped,
+};
+
+// Boolean helpers
+output.fields.repeatedMovement = {
+  jsonField: 'phonology.moviment_repetit',
+  entries: [
+    { value: true, aliases: ['sí', 'si', 's', 'yes', 'true', '1'] },
+    { value: false, aliases: ['no', 'n', 'false', '0'] },
+  ],
+};
+
+// Summary stats
+output.summary = {};
+for (const [key, field] of Object.entries(output.fields)) {
+  if (field.entries) {
+    output.summary[key] = {
+      mapped: field.entries.length,
+      aliasCount: field.entries.reduce((n, e) => n + (e.aliases?.length || 0), 0),
+      unmapped: field.unmapped?.length || 0,
+    };
+  }
+}
+
+fs.mkdirSync(outDir, { recursive: true });
+fs.writeFileSync(outPath, JSON.stringify(output, null, 2));
+console.log('Wrote', outPath);
+console.log(JSON.stringify(output.summary, null, 2));
diff --git a/backend/src/import/fitxa-enum-mappings.json b/backend/src/import/fitxa-enum-mappings.json
new file mode 100644
index 0000000..998400a
--- /dev/null
+++ b/backend/src/import/fitxa-enum-mappings.json
@@ -0,0 +1,3448 @@
+{
+  "meta": {
+    "generatedAt": "2026-06-18T15:52:24.429Z",
+    "sourceFile": "Traducció etiquetes-Taules.xlsx",
+    "description": "Maps fitxa/scraper labels (CA/EN) to SignBank Prisma enum IDs. Lookup: normalize input, match aliases[]."
+  },
+  "fields": {
+    "handedness": {
+      "note": "JSON field phonology.nombre_mans. SignBank Hand (RIGHT/LEFT/BOTH) is a different concept — store handedness code separately or extend schema.",
+      "entries": [
+        {
+          "code": "1",
+          "labelCa": 1,
+          "labelEn": "One-handed sign",
+          "aliases": [
+            "1"
+          ]
+        },
+        {
+          "code": "2a",
+          "labelCa": "2a",
+          "labelEn": "Two-handed asymmetrical sing: the weak hand is the location in the sign",
+          "aliases": [
+            "2a"
+          ]
+        },
+        {
+          "code": "2n",
+          "labelCa": "2n",
+          "labelEn": "Two-handed sign in which both hands move but the hands are not mirrored in the sagittal plane. Their handshapes may differ",
+          "aliases": [
+            "2n"
+          ]
+        },
+        {
+          "code": "2s",
+          "labelCa": "2s",
+          "labelEn": "Two-handed symmetrical sing: both hands move and have the same handshape (note: the location may occasionally be non-identical)",
+          "aliases": [
+            "2s"
+          ]
+        },
+        {
+          "code": "x",
+          "labelCa": "x",
+          "labelEn": "Handedness not applicable",
+          "aliases": [
+            "x"
+          ]
+        }
+      ]
+    },
+    "configuration": {
+      "enum": "HandConfiguration",
+      "jsonField": "phonology.configuracio",
+      "alsoMaps": [
+        "configuracio_ma_dominant",
+        "configuracio_ma_no_dominant"
+      ],
+      "entries": [
+        {
+          "signbankId": "CONF_1",
+          "aliases": [
+            "(baby_o)",
+            "baby_o",
+            "baby_o ()"
+          ]
+        },
+        {
+          "signbankId": "CONF_10",
+          "aliases": [
+            "4",
+            "4 (4)"
+          ]
+        },
+        {
+          "signbankId": "CONF_11",
+          "aliases": [
+            "4_curved",
+            "4_curved (4d)",
+            "4d",
+            "4d (4_curved)"
+          ]
+        },
+        {
+          "signbankId": "CONF_12",
+          "aliases": [
+            "5",
+            "5 (5)"
+          ]
+        },
+        {
+          "signbankId": "CONF_13",
+          "aliases": [
+            "5d",
+            "5d (c_spread)",
+            "c_spread",
+            "c_spread (5d)"
+          ]
+        },
+        {
+          "signbankId": "CONF_14",
+          "aliases": [
+            "6",
+            "6 (a)",
+            "a",
+            "a (6)"
+          ]
+        },
+        {
+          "signbankId": "CONF_15",
+          "aliases": [
+            "6d",
+            "6d (6d)"
+          ]
+        },
+        {
+          "signbankId": "CONF_16",
+          "aliases": [
+            "7",
+            "7 (baby_beak_open)",
+            "baby_beak_open",
+            "baby_beak_open (7)"
+          ]
+        },
+        {
+          "signbankId": "CONF_18",
+          "aliases": [
+            "8",
+            "8 (w)",
+            "w",
+            "w (8)"
+          ]
+        },
+        {
+          "signbankId": "CONF_19",
+          "aliases": [
+            "8d",
+            "8d (v_curved)",
+            "v_curved",
+            "v_curved (8d)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D82E",
+          "aliases": [
+            "8t",
+            "8t (l2)",
+            "l2",
+            "l2 (8t)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D834",
+          "aliases": [
+            "2t",
+            "2t (beak2_open)",
+            "beak2_open",
+            "beak2_open (2t)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D86C",
+          "aliases": [
+            "7d",
+            "7d (baby_c)",
+            "baby_c",
+            "baby_c (7d)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D87D",
+          "aliases": [
+            "beak_open",
+            "beak_open (ce)",
+            "ce",
+            "ce (beak_open)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D88E",
+          "aliases": [
+            "9",
+            "9 (9)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D8A7",
+          "aliases": [
+            "5r",
+            "5r (5r)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D8B",
+          "aliases": [
+            "5r_closed",
+            "5r_closed (5r_tancat)",
+            "5r_tancat",
+            "5r_tancat (5r_closed)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D8BA",
+          "aliases": [
+            "ily",
+            "ily (ily)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D8C3",
+          "aliases": [
+            "(cor_e)",
+            "cor_e",
+            "cor_e ()"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D8C5",
+          "aliases": [
+            "5m",
+            "5m (cor)",
+            "cor",
+            "cor (5m)"
+          ]
+        },
+        {
+          "signbankId": "CONF_1D8C7",
+          "aliases": [
+            "cor-e",
+            "cor-e (middle finger)",
+            "middle finger",
+            "middle finger (cor-e)"
+          ]
+        },
+        {
+          "signbankId": "CONF_2",
+          "aliases": [
+            "0e",
+            "0e (baby_beak_closed)",
+            "baby_beak_closed",
+            "baby_beak_closed (0e)"
+          ]
+        },
+        {
+          "signbankId": "CONF_20",
+          "aliases": [
+            "a",
+            "a (e)",
+            "e",
+            "e (a)"
+          ]
+        },
+        {
+          "signbankId": "CONF_21",
+          "aliases": [
+            "b",
+            "b (b)"
+          ]
+        },
+        {
+          "signbankId": "CONF_22",
+          "aliases": [
+            "b_bent",
+            "b_bent (bd)",
+            "bd",
+            "bd (b_bent)"
+          ]
+        },
+        {
+          "signbankId": "CONF_23",
+          "aliases": [
+            "c",
+            "c (c)"
+          ]
+        },
+        {
+          "signbankId": "CONF_24",
+          "aliases": [
+            "d",
+            "d (p)",
+            "p",
+            "p (d)"
+          ]
+        },
+        {
+          "signbankId": "CONF_25",
+          "aliases": [
+            "c_spread",
+            "c_spread (e)",
+            "e",
+            "e (c_spread)"
+          ]
+        },
+        {
+          "signbankId": "CONF_26",
+          "aliases": [
+            "f",
+            "f (f)"
+          ]
+        },
+        {
+          "signbankId": "CONF_27",
+          "aliases": [
+            "baby_c_extended",
+            "baby_c_extended (g_ssi)",
+            "g_ssi",
+            "g_ssi (baby_c_extended)"
+          ]
+        },
+        {
+          "signbankId": "CONF_29",
+          "aliases": [
+            "(id)",
+            "id",
+            "id ()"
+          ]
+        },
+        {
+          "signbankId": "CONF_2A",
+          "aliases": [
+            "baby_beak",
+            "baby_beak (oe)",
+            "oe",
+            "oe (baby_beak)"
+          ]
+        },
+        {
+          "signbankId": "CONF_3",
+          "aliases": [
+            "0_ssi",
+            "0_ssi (o)",
+            "o",
+            "o (0_ssi)"
+          ]
+        },
+        {
+          "signbankId": "CONF_30",
+          "aliases": [
+            "i",
+            "i (i)"
+          ]
+        },
+        {
+          "signbankId": "CONF_31",
+          "aliases": [
+            "k",
+            "k (k)"
+          ]
+        },
+        {
+          "signbankId": "CONF_32",
+          "aliases": [
+            "o",
+            "o (t)",
+            "t",
+            "t (o)"
+          ]
+        },
+        {
+          "signbankId": "CONF_33",
+          "aliases": [
+            "beak",
+            "beak (q)",
+            "q",
+            "q (beak)"
+          ]
+        },
+        {
+          "signbankId": "CONF_34",
+          "aliases": [
+            "r",
+            "r (r)"
+          ]
+        },
+        {
+          "signbankId": "CONF_35",
+          "aliases": [
+            "(s)",
+            "s",
+            "s ()"
+          ]
+        },
+        {
+          "signbankId": "CONF_36",
+          "aliases": [
+            "(t)",
+            "t",
+            "t ()"
+          ]
+        },
+        {
+          "signbankId": "CONF_37",
+          "aliases": [
+            "money",
+            "money (t_antiga)",
+            "t_antiga",
+            "t_antiga (money)"
+          ]
+        },
+        {
+          "signbankId": "CONF_38",
+          "aliases": [
+            "homs",
+            "homs (u)",
+            "u",
+            "u (homs)"
+          ]
+        },
+        {
+          "signbankId": "CONF_39",
+          "aliases": [
+            "y",
+            "y (y_ssi)",
+            "y_ssi",
+            "y_ssi (y)"
+          ]
+        },
+        {
+          "signbankId": "CONF_4",
+          "aliases": [
+            "1",
+            "1 (1)"
+          ]
+        },
+        {
+          "signbankId": "CONF_40",
+          "aliases": [
+            "5m_closed",
+            "5m_closed (polze-cor)",
+            "polze-cor",
+            "polze-cor (5m_closed)"
+          ]
+        },
+        {
+          "signbankId": "CONF_42",
+          "aliases": [
+            "5m_closed",
+            "5m_closed (5m_tancat)",
+            "5m_tancat",
+            "5m_tancat (5m_closed)"
+          ]
+        },
+        {
+          "signbankId": "CONF_5",
+          "aliases": [
+            "1_curved",
+            "1_curved (1d)",
+            "1d",
+            "1d (1_curved)"
+          ]
+        },
+        {
+          "signbankId": "CONF_6",
+          "aliases": [
+            "2",
+            "2 (beak2_open_spread)",
+            "beak2_open_spread",
+            "beak2_open_spread (2)"
+          ]
+        },
+        {
+          "signbankId": "CONF_7",
+          "aliases": [
+            "2d",
+            "2d (c2_spread)",
+            "c2_spread",
+            "c2_spread (2d)"
+          ]
+        },
+        {
+          "signbankId": "CONF_8",
+          "aliases": [
+            "3",
+            "3 (3)"
+          ]
+        },
+        {
+          "signbankId": "CONF_9",
+          "aliases": [
+            "3_curved",
+            "3_curved (3d)",
+            "3d",
+            "3d (3_curved)"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "cat": "ASL_T",
+          "en": "ASL_T",
+          "ordre": "",
+          "idConfig": "https://drive.google.com/open?id=17n4SRrTfsRtPO0P-CwEFur-7LZvvhwl_",
+          "signbankId": null
+        },
+        {
+          "cat": "G",
+          "en": "G",
+          "ordre": "",
+          "idConfig": "https://drive.google.com/open?id=16jXwkZuLMjY9l0cpVc2RDtcOq1i9wbLy",
+          "signbankId": null
+        },
+        {
+          "cat": "8e",
+          "en": "Beak2",
+          "ordre": "",
+          "idConfig": "",
+          "signbankId": null
+        },
+        {
+          "cat": "anular-cor-e",
+          "en": "",
+          "ordre": "",
+          "idConfig": "",
+          "signbankId": null
+        },
+        {
+          "cat": "Ue",
+          "en": "",
+          "ordre": "",
+          "idConfig": "",
+          "signbankId": null
+        },
+        {
+          "cat": "5e",
+          "en": "Beak_open_spread",
+          "ordre": "",
+          "idConfig": "",
+          "signbankId": null
+        }
+      ]
+    },
+    "configurationChanges": {
+      "enum": "ConfigurationChange",
+      "sheet": "Canvi de configuració",
+      "entries": [
+        {
+          "signbankId": "BENDING",
+          "aliases": [
+            "bending",
+            "inclinacio"
+          ]
+        },
+        {
+          "signbankId": "CLOSING",
+          "aliases": [
+            "closing",
+            "tancament"
+          ]
+        },
+        {
+          "signbankId": "CLOSING_AND_RUBBING",
+          "aliases": [
+            "closing + rubbing",
+            "closing+rubbing",
+            "tancament + friccio"
+          ]
+        },
+        {
+          "signbankId": "CLOSING_AND_WIGGLING",
+          "aliases": [
+            "closing + wiggling",
+            "closing+wiggling",
+            "tancament + vibracio"
+          ]
+        },
+        {
+          "signbankId": "CLOSING_TO_OPENING",
+          "aliases": [
+            "closing > opening",
+            "closing>opening",
+            "tancament>obertura"
+          ]
+        },
+        {
+          "signbankId": "CONSECUTIVE_CLOSING",
+          "aliases": [
+            "consecutive closing",
+            "tancament consecutiu"
+          ]
+        },
+        {
+          "signbankId": "CURVING",
+          "aliases": [
+            "curving",
+            "encorbament"
+          ]
+        },
+        {
+          "signbankId": "NONE_TO_SPREADING",
+          "aliases": [
+            "none > spreading",
+            "none>spreading",
+            "res>extensio"
+          ]
+        },
+        {
+          "signbankId": "OPENING",
+          "aliases": [
+            "obertura",
+            "opening"
+          ]
+        },
+        {
+          "signbankId": "OPENING_AND_RUBBING",
+          "aliases": [
+            "obertura+friccio",
+            "opening + rubbing",
+            "opening+rubbing"
+          ]
+        },
+        {
+          "signbankId": "OPENING_AND_SPREADING",
+          "aliases": [
+            "obertura+extensio",
+            "opening + spreading",
+            "opening+spreading"
+          ]
+        },
+        {
+          "signbankId": "OPENING_AND_WIGGLING",
+          "aliases": [
+            "obertura+vibracio",
+            "opening + wiggling",
+            "opening+wiggling"
+          ]
+        },
+        {
+          "signbankId": "OPENING_TO_CLOSING",
+          "aliases": [
+            "obertura>tancament",
+            "opening > closing",
+            "opening>closing"
+          ]
+        },
+        {
+          "signbankId": "RUBBING",
+          "aliases": [
+            "friccio",
+            "rubbing"
+          ]
+        },
+        {
+          "signbankId": "SPREADING",
+          "aliases": [
+            "extensio",
+            "spreading"
+          ]
+        },
+        {
+          "signbankId": "UNBENDING",
+          "aliases": [
+            "estirament",
+            "unbending"
+          ]
+        },
+        {
+          "signbankId": "UNCURVING",
+          "aliases": [
+            "redrecament",
+            "uncurving"
+          ]
+        },
+        {
+          "signbankId": "UNSPREADING",
+          "aliases": [
+            "ajustament",
+            "unspreading"
+          ]
+        },
+        {
+          "signbankId": "WIGGLING",
+          "aliases": [
+            "vibracio",
+            "wiggling"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": ">",
+          "sourceCa": "",
+          "guessedId": "TO"
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCa": "",
+          "guessedId": "AND"
+        },
+        {
+          "sourceEn": "/",
+          "sourceCa": "",
+          "guessedId": "OR"
+        }
+      ],
+      "jsonField": "phonology.canvi_configuracio"
+    },
+    "relationBetweenArticulators": {
+      "enum": "RelationBetweenArticulators",
+      "sheet": "Relació entre articuladors",
+      "entries": [
+        {
+          "signbankId": "ABOVE",
+          "aliases": [
+            "above",
+            "damunt"
+          ]
+        },
+        {
+          "signbankId": "AROUND",
+          "aliases": [
+            "al voltant",
+            "around"
+          ]
+        },
+        {
+          "signbankId": "BACK",
+          "aliases": [
+            "back",
+            "darrere"
+          ]
+        },
+        {
+          "signbankId": "BELOW",
+          "aliases": [
+            "below",
+            "sota"
+          ]
+        },
+        {
+          "signbankId": "CROSS",
+          "aliases": [
+            "creuat",
+            "cross"
+          ]
+        },
+        {
+          "signbankId": "FRONT",
+          "aliases": [
+            "davant",
+            "front"
+          ]
+        },
+        {
+          "signbankId": "INSIDE",
+          "aliases": [
+            "dins",
+            "inside"
+          ]
+        },
+        {
+          "signbankId": "INTERWOVEN",
+          "aliases": [
+            "entrellacats",
+            "interwoven"
+          ]
+        },
+        {
+          "signbankId": "NEXT_TO",
+          "aliases": [
+            "al costat",
+            "next-to"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": "Above/below",
+          "sourceCa": "Damunt / Sota",
+          "guessedId": "ABOVE_OR_BELOW"
+        },
+        {
+          "sourceEn": "Front/back",
+          "sourceCa": "Davant / Darrere",
+          "guessedId": "FRONT_OR_BACK"
+        },
+        {
+          "sourceEn": ">",
+          "sourceCa": "canvi seqüencial",
+          "guessedId": "TO"
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCa": "valors simultanis",
+          "guessedId": "AND"
+        },
+        {
+          "sourceEn": "/",
+          "sourceCa": "Diferent valor per cada mà",
+          "guessedId": "OR"
+        }
+      ],
+      "jsonField": "phonology.relacio_articuladors"
+    },
+    "location": {
+      "enum": "Location",
+      "sheet": "Localitzacions",
+      "entries": [
+        {
+          "signbankId": "ARM",
+          "aliases": [
+            "arm",
+            "brac"
+          ]
+        },
+        {
+          "signbankId": "ARMPIT",
+          "aliases": [
+            "aixella",
+            "armpit"
+          ]
+        },
+        {
+          "signbankId": "ARMPIT_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "aixella > espai neutre",
+            "armpit > neutral space"
+          ]
+        },
+        {
+          "signbankId": "BACK",
+          "aliases": [
+            "back",
+            "esquena"
+          ]
+        },
+        {
+          "signbankId": "BACK_OF_HEAD",
+          "aliases": [
+            "back of head",
+            "darrera del cap"
+          ]
+        },
+        {
+          "signbankId": "BELLY",
+          "aliases": [
+            "belly",
+            "panxa"
+          ]
+        },
+        {
+          "signbankId": "BELLY_AND_FOREHEAD",
+          "aliases": [
+            "belly + forehead",
+            "panxa + front"
+          ]
+        },
+        {
+          "signbankId": "BELLY_TO_CHEST",
+          "aliases": [
+            "belly > chest",
+            "belly>chest",
+            "panxa > pit"
+          ]
+        },
+        {
+          "signbankId": "BOTTOM_OR_CROTCH",
+          "aliases": [
+            "bottom / crotch",
+            "part inferior / entremig"
+          ]
+        },
+        {
+          "signbankId": "BREAST_CONTRA",
+          "aliases": [
+            "breast_contra",
+            "pit_contra"
+          ]
+        },
+        {
+          "signbankId": "BREAST_IPSI",
+          "aliases": [
+            "breast_ipsi",
+            "pit_ipsi"
+          ]
+        },
+        {
+          "signbankId": "BREASTS",
+          "aliases": [
+            "breasts",
+            "pit"
+          ]
+        },
+        {
+          "signbankId": "CHEEK",
+          "aliases": [
+            "cheek",
+            "galta"
+          ]
+        },
+        {
+          "signbankId": "CHEEK_CONTRA",
+          "aliases": [
+            "cheek contra",
+            "galta_contra"
+          ]
+        },
+        {
+          "signbankId": "CHEEK_TO_CHEEK",
+          "aliases": [
+            "cheek > cheek",
+            "galta > galta"
+          ]
+        },
+        {
+          "signbankId": "CHEEK_TO_CHIN",
+          "aliases": [
+            "cheek > chin",
+            "galta > barbeta"
+          ]
+        },
+        {
+          "signbankId": "CHEEKBONE",
+          "aliases": [
+            "cheekbone",
+            "pomul"
+          ]
+        },
+        {
+          "signbankId": "CHEST",
+          "aliases": [
+            "chest",
+            "torax"
+          ]
+        },
+        {
+          "signbankId": "CHEST_CONTRA",
+          "aliases": [
+            "chest contra",
+            "torax_contra"
+          ]
+        },
+        {
+          "signbankId": "CHEST_TO_CHIN",
+          "aliases": [
+            "chest > chin",
+            "torax > barbeta"
+          ]
+        },
+        {
+          "signbankId": "CHEST_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "chest > neutral space",
+            "torax > espai neutre"
+          ]
+        },
+        {
+          "signbankId": "CHIN",
+          "aliases": [
+            "barbeta",
+            "chin"
+          ]
+        },
+        {
+          "signbankId": "CHIN_CONTRA",
+          "aliases": [
+            "barbeta_contra",
+            "chin contra"
+          ]
+        },
+        {
+          "signbankId": "CHIN_TO_CHEST",
+          "aliases": [
+            "barbeta > torax",
+            "chin > chest"
+          ]
+        },
+        {
+          "signbankId": "CHIN_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "barbeta > espai neutre",
+            "chin > neutral space"
+          ]
+        },
+        {
+          "signbankId": "CHIN_TO_WEAK_HAND_PALM",
+          "aliases": [
+            "barbeta > ma no-dominant: palmell",
+            "chin > weak hand: palm"
+          ]
+        },
+        {
+          "signbankId": "CROTCH",
+          "aliases": [
+            "crotch",
+            "entrecuix"
+          ]
+        },
+        {
+          "signbankId": "EAR",
+          "aliases": [
+            "ear",
+            "orella"
+          ]
+        },
+        {
+          "signbankId": "EAR_TO_CHEEK",
+          "aliases": [
+            "ear > cheek",
+            "orella > galta"
+          ]
+        },
+        {
+          "signbankId": "EAR_TO_CHEST",
+          "aliases": [
+            "ear > chest",
+            "orella > torax"
+          ]
+        },
+        {
+          "signbankId": "EAR_TO_MOUTH",
+          "aliases": [
+            "ear > mouth",
+            "orella > boca"
+          ]
+        },
+        {
+          "signbankId": "EARLOBE",
+          "aliases": [
+            "earlobe",
+            "lobul"
+          ]
+        },
+        {
+          "signbankId": "EAST",
+          "aliases": [
+            "east",
+            "est"
+          ]
+        },
+        {
+          "signbankId": "ELBOW",
+          "aliases": [
+            "colze",
+            "elbow"
+          ]
+        },
+        {
+          "signbankId": "EYE",
+          "aliases": [
+            "eye",
+            "ull"
+          ]
+        },
+        {
+          "signbankId": "EYE_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "eye > neutral space",
+            "ull > espai neutre"
+          ]
+        },
+        {
+          "signbankId": "EYEBROW",
+          "aliases": [
+            "cella",
+            "eyebrow"
+          ]
+        },
+        {
+          "signbankId": "FACE",
+          "aliases": [
+            "cara",
+            "face"
+          ]
+        },
+        {
+          "signbankId": "FACE_IPSI",
+          "aliases": [
+            "cara ipsi",
+            "face ipsi"
+          ]
+        },
+        {
+          "signbankId": "FACE_TO_HEAD",
+          "aliases": [
+            "cara > cap",
+            "face > head",
+            "face> head"
+          ]
+        },
+        {
+          "signbankId": "FACE_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "cara > espai neutre",
+            "face > neutral space"
+          ]
+        },
+        {
+          "signbankId": "FLANK",
+          "aliases": [
+            "flank",
+            "templa"
+          ]
+        },
+        {
+          "signbankId": "FLANK_OR_HEAD",
+          "aliases": [
+            "flank/head",
+            "templa / cap"
+          ]
+        },
+        {
+          "signbankId": "FOREHEAD",
+          "aliases": [
+            "forehead",
+            "front"
+          ]
+        },
+        {
+          "signbankId": "FOREHEAD_CONTRA",
+          "aliases": [
+            "forehead contra",
+            "front_contra"
+          ]
+        },
+        {
+          "signbankId": "FOREHEAD_TO_CHEST",
+          "aliases": [
+            "forehead > chest",
+            "front > pit"
+          ]
+        },
+        {
+          "signbankId": "FOREHEAD_TO_CHIN",
+          "aliases": [
+            "forehead > chin",
+            "front > barebeta"
+          ]
+        },
+        {
+          "signbankId": "FOREHEAD_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "forehead > neutral space",
+            "front > espai neutre"
+          ]
+        },
+        {
+          "signbankId": "FOREHEAD_TO_WEAK_HAND_PALM",
+          "aliases": [
+            "forehead > weak hand: palm",
+            "front > ma no-dominant: palmell"
+          ]
+        },
+        {
+          "signbankId": "HEAD",
+          "aliases": [
+            "cap",
+            "head"
+          ]
+        },
+        {
+          "signbankId": "HEAD_AND_NEUTRAL_SPACE",
+          "aliases": [
+            "cap + espai neutre",
+            "head + neutral space"
+          ]
+        },
+        {
+          "signbankId": "HEAD_CONTRA",
+          "aliases": [
+            "cap contra",
+            "head contra"
+          ]
+        },
+        {
+          "signbankId": "HEAD_IPSI",
+          "aliases": [
+            "cap ipsi",
+            "head ipsi"
+          ]
+        },
+        {
+          "signbankId": "HEAD_TO_CHEST",
+          "aliases": [
+            "cap > pit",
+            "head > chest"
+          ]
+        },
+        {
+          "signbankId": "HEAD_TO_CHEST_TO_SHOULDER",
+          "aliases": [
+            "cap > pit > espatlla",
+            "head > chest > shoulder"
+          ]
+        },
+        {
+          "signbankId": "HEAD_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "cap > espai neutre",
+            "head > neutral space"
+          ]
+        },
+        {
+          "signbankId": "HEAD_TO_SHOULDER",
+          "aliases": [
+            "cap > espatlla",
+            "head > shoulder"
+          ]
+        },
+        {
+          "signbankId": "HEAD_TO_WEAK_HAND_PALM",
+          "aliases": [
+            "cap > ma no-dominant: palmell",
+            "head > weak hand: palm"
+          ]
+        },
+        {
+          "signbankId": "HIP",
+          "aliases": [
+            "hip",
+            "maluc"
+          ]
+        },
+        {
+          "signbankId": "HORIZONTAL_PLANE",
+          "aliases": [
+            "horizontal plane",
+            "pla horitzontal"
+          ]
+        },
+        {
+          "signbankId": "KNEE",
+          "aliases": [
+            "genoll",
+            "knee"
+          ]
+        },
+        {
+          "signbankId": "LEG",
+          "aliases": [
+            "cama",
+            "leg"
+          ]
+        },
+        {
+          "signbankId": "LEG_TO_WAIST",
+          "aliases": [
+            "cama > cintura",
+            "leg > waist"
+          ]
+        },
+        {
+          "signbankId": "LOWER_ARM",
+          "aliases": [
+            "avantbrac",
+            "lower arm"
+          ]
+        },
+        {
+          "signbankId": "LOWER_LIP",
+          "aliases": [
+            "llavi inferior",
+            "lower lip"
+          ]
+        },
+        {
+          "signbankId": "MOUTH",
+          "aliases": [
+            "boca",
+            "mouth"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_CONTRA",
+          "aliases": [
+            "boca_contra",
+            "mouth contra"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_IPSI",
+          "aliases": [
+            "boca_ipsi",
+            "mouth ipsi"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_TO_CHEEK",
+          "aliases": [
+            "boca > galta",
+            "mouth > cheek"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_TO_CHEST",
+          "aliases": [
+            "boca > pit",
+            "mouth > chest"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_TO_CHIN",
+          "aliases": [
+            "boca > barbeta",
+            "mouth > chin"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "boca > espai neutre",
+            "mouth > neutral space"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_TO_WEAK_HAND",
+          "aliases": [
+            "boca > ma no-dominant",
+            "mouth > weak hand"
+          ]
+        },
+        {
+          "signbankId": "MOUTH_TO_WEAK_HAND_PALM",
+          "aliases": [
+            "boca > ma no-dominant: palmell",
+            "mouth > weak hand: palm"
+          ]
+        },
+        {
+          "signbankId": "NECK",
+          "aliases": [
+            "coll",
+            "neck"
+          ]
+        },
+        {
+          "signbankId": "NECK_CONTRA",
+          "aliases": [
+            "coll_contra",
+            "neck contra"
+          ]
+        },
+        {
+          "signbankId": "NECK_TO_CHEST",
+          "aliases": [
+            "coll > pit",
+            "neck > chest"
+          ]
+        },
+        {
+          "signbankId": "NECK_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "coll > espai neutre",
+            "neck > neutral space"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE",
+          "aliases": [
+            "espai neutre",
+            "neutral space"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE_OR_WEAK_HAND_FRONT",
+          "aliases": [
+            "espai neutre / ma no-dominant: davant",
+            "neutral space / weak hand: front"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE_TO_CHEEK",
+          "aliases": [
+            "espai neutre > galta",
+            "neutral space > cheek"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE_TO_HEAD",
+          "aliases": [
+            "espai neutre > cap",
+            "neutral space > head"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE_TO_MOUTH",
+          "aliases": [
+            "espai neutre > boca",
+            "neutral space > mouth"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE_TO_NOSE",
+          "aliases": [
+            "espai neutre > nas",
+            "neutral space > nose"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE_TO_SHOULDER",
+          "aliases": [
+            "espai neutre > espatlla",
+            "neutral space > shoulder"
+          ]
+        },
+        {
+          "signbankId": "NEUTRAL_SPACE_TO_WEAK_HAND",
+          "aliases": [
+            "espai neutre > ma no-dominant",
+            "neutral space > weak hand"
+          ]
+        },
+        {
+          "signbankId": "NOSE",
+          "aliases": [
+            "nas",
+            "nose"
+          ]
+        },
+        {
+          "signbankId": "NOSE_TO_CHIN",
+          "aliases": [
+            "nas > barbeta",
+            "nose > chin"
+          ]
+        },
+        {
+          "signbankId": "NOSE_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "nas > espai neutre",
+            "nose > neutral space"
+          ]
+        },
+        {
+          "signbankId": "NOSE_TO_WEAK_HAND",
+          "aliases": [
+            "nas > ma no-dominant",
+            "nose > weak hand"
+          ]
+        },
+        {
+          "signbankId": "PARALLEL_PLANE",
+          "aliases": [
+            "parallel plane",
+            "pla paral·lel"
+          ]
+        },
+        {
+          "signbankId": "R_LOC",
+          "aliases": [
+            "r-loc"
+          ]
+        },
+        {
+          "signbankId": "R_LOC_TO_R_LOC",
+          "aliases": [
+            "r-loc > r-loc"
+          ]
+        },
+        {
+          "signbankId": "SHOULDER",
+          "aliases": [
+            "espatlla",
+            "shoulder"
+          ]
+        },
+        {
+          "signbankId": "SHOULDER_CONTRA",
+          "aliases": [
+            "espatlla_contra",
+            "shoulder contra"
+          ]
+        },
+        {
+          "signbankId": "SHOULDER_TO_CHEST",
+          "aliases": [
+            "espatlla > pit",
+            "shoulder > chest"
+          ]
+        },
+        {
+          "signbankId": "SHOULDER_TO_HIT",
+          "aliases": [
+            "espatlla > cadera",
+            "shoulder > hit"
+          ]
+        },
+        {
+          "signbankId": "SHOULDER_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "espatlla > espai neutre",
+            "shoulder > neutral space"
+          ]
+        },
+        {
+          "signbankId": "SHOULDER_TO_SHOULDER",
+          "aliases": [
+            "espatlla > espatlla",
+            "shoulder > shoulder"
+          ]
+        },
+        {
+          "signbankId": "SHOULDER_TO_WEAK_HAND_PALM",
+          "aliases": [
+            "espatlla > ma no-dominant: palmell",
+            "shoulder > weak hand: palm"
+          ]
+        },
+        {
+          "signbankId": "TEETH",
+          "aliases": [
+            "dents",
+            "teeth"
+          ]
+        },
+        {
+          "signbankId": "TEMPLE",
+          "aliases": [
+            "templa",
+            "temple"
+          ]
+        },
+        {
+          "signbankId": "TEMPLE_TO_CHEEK",
+          "aliases": [
+            "templa > galta",
+            "temple > cheek"
+          ]
+        },
+        {
+          "signbankId": "TEMPLE_TO_CHEST",
+          "aliases": [
+            "templa > pit",
+            "temple > chest"
+          ]
+        },
+        {
+          "signbankId": "TEMPLE_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "templa > espai neutre",
+            "temple > neutral space"
+          ]
+        },
+        {
+          "signbankId": "TEMPLE_TO_SHOULDER",
+          "aliases": [
+            "templa > espatlla",
+            "temple > shoulder"
+          ]
+        },
+        {
+          "signbankId": "THUMB",
+          "aliases": [
+            "polze",
+            "thumb"
+          ]
+        },
+        {
+          "signbankId": "TONGUE",
+          "aliases": [
+            "llengua",
+            "tongue"
+          ]
+        },
+        {
+          "signbankId": "TRUNK",
+          "aliases": [
+            "tronc",
+            "trunk"
+          ]
+        },
+        {
+          "signbankId": "UPPER_ARM",
+          "aliases": [
+            "part alta brac",
+            "upper arm"
+          ]
+        },
+        {
+          "signbankId": "UPPER_LIP",
+          "aliases": [
+            "llavi superior",
+            "upper lip"
+          ]
+        },
+        {
+          "signbankId": "VARIABLE",
+          "aliases": [
+            "variable"
+          ]
+        },
+        {
+          "signbankId": "VIRTUAL_OBJECT",
+          "aliases": [
+            "objecte virtual",
+            "virtual object"
+          ]
+        },
+        {
+          "signbankId": "WAIST",
+          "aliases": [
+            "cintura",
+            "waist"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND",
+          "aliases": [
+            "ma no-dominant",
+            "weak hand"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_BACK",
+          "aliases": [
+            "ma no-dominant: darrere",
+            "weak hand: back"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_BASE",
+          "aliases": [
+            "ma no-dominant: base",
+            "weak hand: base"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_FINGER",
+          "aliases": [
+            "ma no-dominant: dit",
+            "weak hand: finger"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_FINGER_TIPS",
+          "aliases": [
+            "ma no-dominant: punta dels dits",
+            "weak hand: finger tips"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_FRONT",
+          "aliases": [
+            "ma no-dominant: davant",
+            "weak hand: front"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_INDEX_FINGER",
+          "aliases": [
+            "ma no-dominant: dit index",
+            "weak hand: index finger"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_KNUCKLES",
+          "aliases": [
+            "ma no-dominant: artells",
+            "weak hand: knuckles"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_MIDDLE_FINGER",
+          "aliases": [
+            "ma no-dominant: dit mig",
+            "weak hand: middle finger"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_PALM",
+          "aliases": [
+            "ma no-dominant: palmell",
+            "weak hand: palm"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_PINKIE",
+          "aliases": [
+            "ma no-dominant: menovell",
+            "weak hand: pinkie"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_PINKIE_SIDE",
+          "aliases": [
+            "ma no-dominant: costat menovell",
+            "weak hand: pinkie side"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_RING_FINGER",
+          "aliases": [
+            "ma no-dominant: anular",
+            "weak hand: ring finger"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_THENAR",
+          "aliases": [
+            "ma no-dominant: tenar",
+            "weak hand: thenar"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_THUMB",
+          "aliases": [
+            "ma no-dominant: polze",
+            "weak hand: thumb"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_THUMB_SIDE",
+          "aliases": [
+            "ma no-dominant: costat polze",
+            "weak hand: thumb side"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_THUMB_SIDE_TO_ARM",
+          "aliases": [
+            "ma no-dominant: costat polze > brac",
+            "weak hand: thumb side > arm"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_TO_ARM",
+          "aliases": [
+            "ma no-dominant > brac",
+            "weak hand > arm"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_TO_NEUTRAL_SPACE",
+          "aliases": [
+            "ma no-dominant > espai neutre",
+            "weak hand > neutral space"
+          ]
+        },
+        {
+          "signbankId": "WEAK_HAND_WEB_SPACE",
+          "aliases": [
+            "ma no-dominant: espai web",
+            "weak hand: web space"
+          ]
+        },
+        {
+          "signbankId": "WEST",
+          "aliases": [
+            "oest",
+            "west"
+          ]
+        },
+        {
+          "signbankId": "WRIST",
+          "aliases": [
+            "canell",
+            "wrist"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": "Between fingers",
+          "sourceCa": "Entre dits",
+          "guessedId": "BETWEEN_FINGERS"
+        },
+        {
+          "sourceEn": "Between legs",
+          "sourceCa": "Entre cames",
+          "guessedId": "BETWEEN_LEGS"
+        },
+        {
+          "sourceEn": "Bridge of the nose",
+          "sourceCa": "Pont del nas",
+          "guessedId": "BRIDGE_OF_THE_NOSE"
+        },
+        {
+          "sourceEn": "Chest > trunk",
+          "sourceCa": "Tòrax > Tronc",
+          "guessedId": "CHEST_TO_TRUNK"
+        },
+        {
+          "sourceEn": "Chin > weak hand: index finger",
+          "sourceCa": "Barbeta > mà no-dominant: dit índex",
+          "guessedId": "CHIN_TO_WEAK_HAND_INDEX_FINGER"
+        },
+        {
+          "sourceEn": "Chin > weak hand: thumb side",
+          "sourceCa": "Barbeta > mà no-dominant: polze",
+          "guessedId": "CHIN_TO_WEAK_HAND_THUMB_SIDE"
+        },
+        {
+          "sourceEn": "Cheek > Neutral space",
+          "sourceCa": "Galta > Espai neutre",
+          "guessedId": "CHEEK_TO_NEUTRAL_SPACE"
+        },
+        {
+          "sourceEn": "arm contra",
+          "sourceCa": "Braç contra",
+          "guessedId": "ARM_CONTRA"
+        },
+        {
+          "sourceEn": "Neutral Espace > Chest",
+          "sourceCa": "Espai neutre > Tòrax",
+          "guessedId": "NEUTRAL_ESPACE_TO_CHEST"
+        },
+        {
+          "sourceEn": ">",
+          "sourceCa": "canvi seqüencial",
+          "guessedId": "TO"
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCa": "valors simultanis",
+          "guessedId": "AND"
+        },
+        {
+          "sourceEn": "/",
+          "sourceCa": "Diferent valor per cada mà",
+          "guessedId": "OR"
+        }
+      ],
+      "jsonField": "phonology.localitzacio"
+    },
+    "movementRelatedOrientation": {
+      "enum": "MovementRelatedOrientation",
+      "sheet": "Oirentació relativa_moviment",
+      "entries": [
+        {
+          "signbankId": "BACK",
+          "aliases": [
+            "back",
+            "darrere"
+          ]
+        },
+        {
+          "signbankId": "BACK_AND_BASE",
+          "aliases": [
+            "back + base",
+            "darrere + base"
+          ]
+        },
+        {
+          "signbankId": "BACK_AND_RADIAL",
+          "aliases": [
+            "back + radial",
+            "darrere + radial"
+          ]
+        },
+        {
+          "signbankId": "BACK_AND_ULNAR",
+          "aliases": [
+            "back + ulnar",
+            "darrere + cubital"
+          ]
+        },
+        {
+          "signbankId": "BACK_OR_BASE",
+          "aliases": [
+            "back / base",
+            "darrere / base"
+          ]
+        },
+        {
+          "signbankId": "BACK_OR_FINGER_TIPS",
+          "aliases": [
+            "back/finger tips",
+            "darrere / punta dels dits"
+          ]
+        },
+        {
+          "signbankId": "BACK_OR_PALM",
+          "aliases": [
+            "back/palm",
+            "darrere / palmell"
+          ]
+        },
+        {
+          "signbankId": "BACK_TO_FINGER_TIPS",
+          "aliases": [
+            "back > finger tips",
+            "darrere + punta dels dits"
+          ]
+        },
+        {
+          "signbankId": "BACK_TO_FRONT",
+          "aliases": [
+            "back > front",
+            "darrere > davant"
+          ]
+        },
+        {
+          "signbankId": "BACK_TO_PALM",
+          "aliases": [
+            "back > palm",
+            "darrere > palmell"
+          ]
+        },
+        {
+          "signbankId": "BACK_TO_RADIAL",
+          "aliases": [
+            "back > radial",
+            "darrere > radial"
+          ]
+        },
+        {
+          "signbankId": "BASE",
+          "aliases": [
+            "base"
+          ]
+        },
+        {
+          "signbankId": "BASE_AND_FRONT",
+          "aliases": [
+            "base + davant",
+            "base + front"
+          ]
+        },
+        {
+          "signbankId": "BASE_AND_PALM",
+          "aliases": [
+            "base + palm",
+            "base + palmell"
+          ]
+        },
+        {
+          "signbankId": "BASE_AND_ULNAR",
+          "aliases": [
+            "base + cubital",
+            "base + ulnar"
+          ]
+        },
+        {
+          "signbankId": "BASE_OR_FRONT",
+          "aliases": [
+            "base > davant",
+            "base/front"
+          ]
+        },
+        {
+          "signbankId": "BASE_TO_BACK",
+          "aliases": [
+            "base > back",
+            "base > darrere"
+          ]
+        },
+        {
+          "signbankId": "BASE_TO_BASE",
+          "aliases": [
+            "base > base"
+          ]
+        },
+        {
+          "signbankId": "BASE_TO_FRONT",
+          "aliases": [
+            "base > davant",
+            "base > front"
+          ]
+        },
+        {
+          "signbankId": "BASE_TO_PALM",
+          "aliases": [
+            "base > palm",
+            "base > palmell"
+          ]
+        },
+        {
+          "signbankId": "BASE_TO_ULNAR",
+          "aliases": [
+            "base > cubital",
+            "base > ulnar"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS",
+          "aliases": [
+            "finger tips",
+            "punta dels dits"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS_OR_BASE",
+          "aliases": [
+            "finger tips/base",
+            "punta dels dits / base"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS_OR_ULNAR",
+          "aliases": [
+            "finger tips/ulnar",
+            "punta dels dits / cubital"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS_TO_BACK",
+          "aliases": [
+            "finger tips > back",
+            "punta dels dits > darrere"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS_TO_BASE",
+          "aliases": [
+            "finger tips > base",
+            "punta dels dits > base"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS_TO_PALM",
+          "aliases": [
+            "finger tips > palm",
+            "punta dels dits > palmell"
+          ]
+        },
+        {
+          "signbankId": "FRONT",
+          "aliases": [
+            "davant",
+            "front"
+          ]
+        },
+        {
+          "signbankId": "FRONT_AND_ULNAR",
+          "aliases": [
+            "davant + cubital",
+            "front + ulnar"
+          ]
+        },
+        {
+          "signbankId": "FRONT_OR_PALM",
+          "aliases": [
+            "davant / palmell",
+            "front/palm"
+          ]
+        },
+        {
+          "signbankId": "FRONT_TO_BACK",
+          "aliases": [
+            "davant > darrere",
+            "front > back"
+          ]
+        },
+        {
+          "signbankId": "PALM",
+          "aliases": [
+            "palm",
+            "palmell"
+          ]
+        },
+        {
+          "signbankId": "PALM_AND_RADIAL",
+          "aliases": [
+            "palm + radial",
+            "palmell + radial"
+          ]
+        },
+        {
+          "signbankId": "PALM_AND_RADIAL_OR_ULNAR",
+          "aliases": [
+            "palm + radial/ulnar",
+            "palmell + radial/ cubital"
+          ]
+        },
+        {
+          "signbankId": "PALM_AND_ULNAR",
+          "aliases": [
+            "palm + ulnar",
+            "palmell + cubital"
+          ]
+        },
+        {
+          "signbankId": "PALM_TO_BACK",
+          "aliases": [
+            "palm > back",
+            "palmell > darrere"
+          ]
+        },
+        {
+          "signbankId": "PALM_TO_BASE",
+          "aliases": [
+            "palm > base",
+            "palmell > base"
+          ]
+        },
+        {
+          "signbankId": "RADIAL",
+          "aliases": [
+            "radial"
+          ]
+        },
+        {
+          "signbankId": "RADIAL_OR_ULNAR",
+          "aliases": [
+            "radial / cubital",
+            "radial/ulnar"
+          ]
+        },
+        {
+          "signbankId": "RADIAL_TO_ULNAR",
+          "aliases": [
+            "radial > cubital",
+            "radial > ulnar"
+          ]
+        },
+        {
+          "signbankId": "ULNAR",
+          "aliases": [
+            "cubital",
+            "ulnar"
+          ]
+        },
+        {
+          "signbankId": "ULNAR_TO_BASE",
+          "aliases": [
+            "cubital > base",
+            "ulnar > base"
+          ]
+        },
+        {
+          "signbankId": "ULNAR_TO_BASE_TO_RADIAL",
+          "aliases": [
+            "cubital > base > radial",
+            "ulnar > base > radial",
+            "ulnar > base >radial"
+          ]
+        },
+        {
+          "signbankId": "ULNAR_TO_FRONT",
+          "aliases": [
+            "cubital > davant",
+            "ulnar > front"
+          ]
+        },
+        {
+          "signbankId": "ULNAR_TO_PALM",
+          "aliases": [
+            "cubital > palmell",
+            "ulnar > palm"
+          ]
+        },
+        {
+          "signbankId": "ULNAR_TO_PALM_TO_RADIAL",
+          "aliases": [
+            "cubital > palmell > radial",
+            "ulnar > palm > radial"
+          ]
+        },
+        {
+          "signbankId": "ULNAR_TO_RADIAL",
+          "aliases": [
+            "cubital > radial",
+            "ulnar > radial"
+          ]
+        },
+        {
+          "signbankId": "VARIABLE",
+          "aliases": [
+            "variable"
+          ]
+        }
+      ],
+      "unmapped": [],
+      "jsonField": "phonology.orientacio_moviment"
+    },
+    "orientationRelatedToLocation": {
+      "enum": "OrientationRelatedToLocation",
+      "sheet": "Orientació relativa_localitzaci",
+      "entries": [
+        {
+          "signbankId": "AO_FINGERS_CONTRA",
+          "aliases": [
+            "ao: dits-contra",
+            "ao: fingers-contra"
+          ]
+        },
+        {
+          "signbankId": "AO_FINGERS_DOWN",
+          "aliases": [
+            "ao: dits-avall",
+            "ao: fingers-down"
+          ]
+        },
+        {
+          "signbankId": "AO_FINGERS_UP",
+          "aliases": [
+            "ao: dits-amunt",
+            "ao: fingers-up"
+          ]
+        },
+        {
+          "signbankId": "AO_PALM_BACKWARDS",
+          "aliases": [
+            "ao: palm-backwards",
+            "ao: palmell-enrere"
+          ]
+        },
+        {
+          "signbankId": "AO_PALM_DOWN",
+          "aliases": [
+            "ao: palm-down",
+            "ao: palmell-avall"
+          ]
+        },
+        {
+          "signbankId": "AO_PALM_FORWARDS",
+          "aliases": [
+            "ao: palm-forwards",
+            "ao: palmell-endavant"
+          ]
+        },
+        {
+          "signbankId": "AO_PALM_INWARDS",
+          "aliases": [
+            "ao: palm-inwards",
+            "ao: palmell-endins"
+          ]
+        },
+        {
+          "signbankId": "AO_PALM_OUTWARDS",
+          "aliases": [
+            "ao: palm-outwards",
+            "ao: palmell-enfora"
+          ]
+        },
+        {
+          "signbankId": "AO_PALM_UP",
+          "aliases": [
+            "ao: palm-up",
+            "ao: palmell-amunt"
+          ]
+        },
+        {
+          "signbankId": "AO_PALM_UP_OR_DOWN",
+          "aliases": [
+            "ao: palm-up/down",
+            "ao: palmell-amunt/avall"
+          ]
+        },
+        {
+          "signbankId": "BACK",
+          "aliases": [
+            "back",
+            "darrere"
+          ]
+        },
+        {
+          "signbankId": "BACK_OR_PALM",
+          "aliases": [
+            "back/palm",
+            "darrere / palmell"
+          ]
+        },
+        {
+          "signbankId": "BACK_OR_PALM_TO_PALM",
+          "aliases": [
+            "back/palm > palm",
+            "darrere / palmell > palmell"
+          ]
+        },
+        {
+          "signbankId": "BACK_TO_PALM",
+          "aliases": [
+            "back > palm",
+            "darrere > palmell"
+          ]
+        },
+        {
+          "signbankId": "BACK_TO_ULNAR",
+          "aliases": [
+            "back > ulnar",
+            "darrere > cubital"
+          ]
+        },
+        {
+          "signbankId": "BASE",
+          "aliases": [
+            "base"
+          ]
+        },
+        {
+          "signbankId": "COUNTING",
+          "aliases": [
+            "comptant",
+            "counting"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS",
+          "aliases": [
+            "finger tips",
+            "punta dels dits"
+          ]
+        },
+        {
+          "signbankId": "FINGER_TIPS_OR_BASE",
+          "aliases": [
+            "finger tips/base",
+            "punta dels dits / base"
+          ]
+        },
+        {
+          "signbankId": "FINGERSPELLING",
+          "aliases": [
+            "fingerspelling",
+            "lletreig"
+          ]
+        },
+        {
+          "signbankId": "FRONT",
+          "aliases": [
+            "davant",
+            "front"
+          ]
+        },
+        {
+          "signbankId": "PALM",
+          "aliases": [
+            "palm",
+            "palmell"
+          ]
+        },
+        {
+          "signbankId": "PALM_TO_ULNAR",
+          "aliases": [
+            "palm > ulnar",
+            "palmell > cubital"
+          ]
+        },
+        {
+          "signbankId": "RADIAL",
+          "aliases": [
+            "radial"
+          ]
+        },
+        {
+          "signbankId": "RADIAL_OR_ULNAR",
+          "aliases": [
+            "radial / cubital",
+            "radial /ulnar"
+          ]
+        },
+        {
+          "signbankId": "ULNAR",
+          "aliases": [
+            "cubital",
+            "ulnar"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": "AO: palm-down > palm-up",
+          "sourceCa": "AO: Palmell-avall > Palmell-amunt",
+          "guessedId": "AO_PALM_DOWN_TO_PALM_UP"
+        }
+      ],
+      "jsonField": "phonology.orientacio_localitzacio"
+    },
+    "orientationChange": {
+      "enum": "OrientationChange",
+      "sheet": "Canvi_orientació",
+      "entries": [
+        {
+          "signbankId": "EXTENSION",
+          "aliases": [
+            "extensio",
+            "extension"
+          ]
+        },
+        {
+          "signbankId": "EXTENSION_AND_PRONATION",
+          "aliases": [
+            "extensio + pronacio",
+            "extension + pronation"
+          ]
+        },
+        {
+          "signbankId": "EXTENSION_OR_FLEXION",
+          "aliases": [
+            "extensio / flexio",
+            "extension/flexion"
+          ]
+        },
+        {
+          "signbankId": "EXTENSION_TO_FLEXION",
+          "aliases": [
+            "extensio > flexio",
+            "extension > flexion"
+          ]
+        },
+        {
+          "signbankId": "FLEXION",
+          "aliases": [
+            "flexio",
+            "flexion"
+          ]
+        },
+        {
+          "signbankId": "FLEXION_TO_EXTENSION",
+          "aliases": [
+            "flexio > extensio",
+            "flexion > extension"
+          ]
+        },
+        {
+          "signbankId": "PRONATION",
+          "aliases": [
+            "pronacio",
+            "pronation"
+          ]
+        },
+        {
+          "signbankId": "PRONATION_OR_SUPINATION",
+          "aliases": [
+            "pronacio / supinacio",
+            "pronation/supination"
+          ]
+        },
+        {
+          "signbankId": "PRONATION_TO_FLEXION",
+          "aliases": [
+            "pronacio > flexio",
+            "pronation > flexion"
+          ]
+        },
+        {
+          "signbankId": "RADIAL_AND_ULNAR_FLEXION",
+          "aliases": [
+            "flexio radial i cubital",
+            "radial and ulnar flexion"
+          ]
+        },
+        {
+          "signbankId": "RADIAL_FLEXION",
+          "aliases": [
+            "flexio radial",
+            "radial flexion"
+          ]
+        },
+        {
+          "signbankId": "ROTATION",
+          "aliases": [
+            "rotacio",
+            "rotation"
+          ]
+        },
+        {
+          "signbankId": "SUPINATION",
+          "aliases": [
+            "supinacio",
+            "supination"
+          ]
+        },
+        {
+          "signbankId": "SUPINATION_TO_EXTENSION",
+          "aliases": [
+            "supinacio > extensio",
+            "supination > extension"
+          ]
+        },
+        {
+          "signbankId": "SUPINATION_TO_PRONATION",
+          "aliases": [
+            "supinacio > pronacio",
+            "supination > pronation"
+          ]
+        },
+        {
+          "signbankId": "ULNAR_FLEXION",
+          "aliases": [
+            "flexio cubital",
+            "ulnar flexion"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": ">",
+          "sourceCa": "canvi seqüencial",
+          "guessedId": "TO"
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCa": "valors simultanis",
+          "guessedId": "AND"
+        },
+        {
+          "sourceEn": "/",
+          "sourceCa": "Diferent valor per cada mà",
+          "guessedId": "OR"
+        }
+      ],
+      "jsonField": "phonology.canvi_orientacio"
+    },
+    "contactType": {
+      "enum": "ContactType",
+      "sheet": "Tipus_contacte",
+      "entries": [
+        {
+          "signbankId": "BRUSH",
+          "aliases": [
+            "brush",
+            "frec"
+          ]
+        },
+        {
+          "signbankId": "CONTINUOUS",
+          "aliases": [
+            "continu",
+            "continuous"
+          ]
+        },
+        {
+          "signbankId": "CONTINUOUS_TO_CONTINUOUS",
+          "aliases": [
+            "continu > continu",
+            "continuous > continuous"
+          ]
+        },
+        {
+          "signbankId": "CONTINUOUS_TO_FINAL",
+          "aliases": [
+            "continu > final",
+            "continuous > final"
+          ]
+        },
+        {
+          "signbankId": "CONTINUOUS_TO_NONE",
+          "aliases": [
+            "continu > res",
+            "continuous > none"
+          ]
+        },
+        {
+          "signbankId": "DOUBLE",
+          "aliases": [
+            "doble",
+            "double"
+          ]
+        },
+        {
+          "signbankId": "FINAL",
+          "aliases": [
+            "final"
+          ]
+        },
+        {
+          "signbankId": "FINAL_TO_CONTINUOUS",
+          "aliases": [
+            "final > continu",
+            "final > continuous"
+          ]
+        },
+        {
+          "signbankId": "FINAL_TO_NONE",
+          "aliases": [
+            "final > none",
+            "final > res"
+          ]
+        },
+        {
+          "signbankId": "INITIAL",
+          "aliases": [
+            "inicial",
+            "initial"
+          ]
+        },
+        {
+          "signbankId": "INITIAL_TO_FINAL",
+          "aliases": [
+            "inicial > final",
+            "initial > final"
+          ]
+        },
+        {
+          "signbankId": "NONE_TO_FINAL",
+          "aliases": [
+            "none > final",
+            "res > final"
+          ]
+        },
+        {
+          "signbankId": "NONE_TO_INITIAL",
+          "aliases": [
+            "none > initial",
+            "res > inicial"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": ">",
+          "sourceCa": "canvi seqüencial",
+          "guessedId": "TO"
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCa": "valors simultanis",
+          "guessedId": "AND"
+        },
+        {
+          "sourceEn": "/",
+          "sourceCa": "Diferent valor per cada mà",
+          "guessedId": "OR"
+        }
+      ],
+      "jsonField": "phonology.tipus_contacte"
+    },
+    "movementType": {
+      "enum": "MovementType",
+      "sheet": "Forma_moviment",
+      "entries": [
+        {
+          "signbankId": "ARC",
+          "aliases": [
+            "arc"
+          ]
+        },
+        {
+          "signbankId": "CIRCLE",
+          "aliases": [
+            "circle",
+            "circular"
+          ]
+        },
+        {
+          "signbankId": "CROSS",
+          "aliases": [
+            "creuat",
+            "cross"
+          ]
+        },
+        {
+          "signbankId": "MOTIVATED_SHAPE",
+          "aliases": [
+            "forma motivada",
+            "motivated shape"
+          ]
+        },
+        {
+          "signbankId": "SPIRAL",
+          "aliases": [
+            "espiral",
+            "spiral"
+          ]
+        },
+        {
+          "signbankId": "STRAIGHT",
+          "aliases": [
+            "recte",
+            "straight"
+          ]
+        },
+        {
+          "signbankId": "STRAIGHT_TO_CIRCLE",
+          "aliases": [
+            "recte > cercle",
+            "straight > circle"
+          ]
+        },
+        {
+          "signbankId": "ZIGZAG",
+          "aliases": [
+            "ziga-zaga",
+            "zigzag"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": "-----",
+          "sourceCa": "-----",
+          "guessedId": ""
+        }
+      ],
+      "jsonField": "phonology.forma_moviment"
+    },
+    "movementDirection": {
+      "enum": "MovementDirection",
+      "sheet": "Direcció_moviment",
+      "entries": [
+        {
+          "signbankId": "BACKWARDS",
+          "aliases": [
+            "backwards",
+            "enrere"
+          ]
+        },
+        {
+          "signbankId": "BACKWARDS_AND_CONTRALATERAL",
+          "aliases": [
+            "backwards + contralateral",
+            "enrere + contralateral"
+          ]
+        },
+        {
+          "signbankId": "BACKWARDS_AND_DOWNWARDS",
+          "aliases": [
+            "backwards + downwards",
+            "enrere + avall"
+          ]
+        },
+        {
+          "signbankId": "BACKWARDS_AND_IPSILATERAL",
+          "aliases": [
+            "backwards + ipsilateral",
+            "enrere + ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "BACKWARDS_AND_UPWARDS",
+          "aliases": [
+            "backwards + upwards",
+            "enrere + amunt"
+          ]
+        },
+        {
+          "signbankId": "BACKWARDS_OR_FORWARDS",
+          "aliases": [
+            "backwards/forwards",
+            "enrere / endavant"
+          ]
+        },
+        {
+          "signbankId": "BACKWARDS_TO_DOWNWARDS",
+          "aliases": [
+            "backwards > downwards",
+            "enrere > avall"
+          ]
+        },
+        {
+          "signbankId": "BACKWARDS_TO_FORWARDS",
+          "aliases": [
+            "backwards > forwards",
+            "enrere > endavant"
+          ]
+        },
+        {
+          "signbankId": "CONTRALATERAL",
+          "aliases": [
+            "contralateral"
+          ]
+        },
+        {
+          "signbankId": "CONTRALATERAL_AND_DOWNWARDS",
+          "aliases": [
+            "contralateral + avall",
+            "contralateral + downwards"
+          ]
+        },
+        {
+          "signbankId": "CONTRALATERAL_AND_FORWARDS",
+          "aliases": [
+            "contralateral + endavant",
+            "contralateral + forwards"
+          ]
+        },
+        {
+          "signbankId": "CONTRALATERAL_AND_UPWARDS",
+          "aliases": [
+            "contralateral + amunt",
+            "contralateral + upwards"
+          ]
+        },
+        {
+          "signbankId": "CONTRALATERAL_TO_DOWNWARDS",
+          "aliases": [
+            "contralateral > avall",
+            "contralateral > downwards"
+          ]
+        },
+        {
+          "signbankId": "CONTRALATERAL_TO_FORWARDS",
+          "aliases": [
+            "contralateral > endavant",
+            "contralateral > forwards"
+          ]
+        },
+        {
+          "signbankId": "CONTRALATERAL_TO_IPSILATERAL",
+          "aliases": [
+            "contralateral > ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "DISTAL",
+          "aliases": [
+            "distal"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS",
+          "aliases": [
+            "avall",
+            "downwards"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_AND_CONTRALATERAL_OR_IPSILATERAL",
+          "aliases": [
+            "avall + contralateral / ipsilateral",
+            "downwards + contralateral/ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_AND_FORWARDS",
+          "aliases": [
+            "avall + endavant",
+            "downwards + forwards"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_AND_IPSILATERAL",
+          "aliases": [
+            "avall + ipsilateral",
+            "downwards + ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_AND_IPSILATERAL_TO_DOWNWARDS",
+          "aliases": [
+            "avall + ipsilateral > avall",
+            "downwards + ipsilateral > downwards"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_AND_TOWARDS",
+          "aliases": [
+            "avall + cap a",
+            "downwards + towards"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_OR_UPWARDS",
+          "aliases": [
+            "avall / amunt",
+            "downwards/upwards"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_OR_UPWARDS_AND_IPSILATERAL",
+          "aliases": [
+            "avall / amunt + ipsilateral",
+            "downwards/upwards + ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_TO_CONTRALATERAL",
+          "aliases": [
+            "avall > contralateral",
+            "downwards > contralateral"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_TO_CONTRALATERAL_TO_IPSILATERAL",
+          "aliases": [
+            "avall > contralateral > ipsilateral",
+            "downwards > contralateral > ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_TO_FORWARDS",
+          "aliases": [
+            "avall > endavant",
+            "downwards > forwards"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_TO_IPSILATERAL",
+          "aliases": [
+            "avall > ipsilateral",
+            "downwards > ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "DOWNWARDS_TO_UPWARDS",
+          "aliases": [
+            "avall > amunt",
+            "downwards > upwards"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS",
+          "aliases": [
+            "endavant",
+            "forwards"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_AND_IPSILATERAL",
+          "aliases": [
+            "endavant + ipsilateral",
+            "forwards + ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_AND_UPWARDS",
+          "aliases": [
+            "endavant + amunt",
+            "forwards + upwards"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_TO_BACKWARDS",
+          "aliases": [
+            "endavant > enrere",
+            "forwards > backwards"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_TO_CONTRALATERAL",
+          "aliases": [
+            "endavant > contralateral",
+            "forwards > contralateral"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_TO_DOWNWARDS",
+          "aliases": [
+            "endavant > avall",
+            "forwards > downwards"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_TO_IPSILATERAL",
+          "aliases": [
+            "endavant > ipsilateral",
+            "forwards > ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_TO_IPSILATERAL_TO_FORWARDS",
+          "aliases": [
+            "endavant > ipsilateral > endavant",
+            "forwards > ipsilateral > forwards"
+          ]
+        },
+        {
+          "signbankId": "FORWARDS_TO_UPWARDS",
+          "aliases": [
+            "endavant > amunt",
+            "forwards > upwards"
+          ]
+        },
+        {
+          "signbankId": "FROM_LOCATION",
+          "aliases": [
+            "des de la localitzacio",
+            "from location"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL",
+          "aliases": [
+            "ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_AND_CONTRALATERAL",
+          "aliases": [
+            "ipsilateral and contralateral",
+            "ipsilateral i contralateral"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_AND_DOWNWARDS",
+          "aliases": [
+            "ipsilateral + downwards",
+            "ispilateral + avall"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_AND_UP_AND_DOWN",
+          "aliases": [
+            "ipsilateral + amunt i avall",
+            "ipsilateral + up and down"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_AND_UPWARDS",
+          "aliases": [
+            "ipsilateral + amunt",
+            "ipsilateral + upwards"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_OR_CONTRALATERAL",
+          "aliases": [
+            "ipsilateral / contralateral",
+            "ipsilateral/contralateral"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_TO_BACKWARDS_TO_CONTRALATERAL",
+          "aliases": [
+            "ipsilateral > backwards > contralateral",
+            "ipsilateral > enrere > contralateral"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_TO_CONTRALATERAL",
+          "aliases": [
+            "ipsilateral > contralateral"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_TO_DOWNWARDS",
+          "aliases": [
+            "ipsilateral > avall",
+            "ipsilateral > downwards"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_TO_DOWNWARDS_TO_CONTRALATERAL",
+          "aliases": [
+            "ipsilateral > avall > contralateral",
+            "ipsilateral > downwards > contralateral"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_TO_FORWARDS",
+          "aliases": [
+            "ipsilateral > endavant",
+            "ipsilateral > forwards"
+          ]
+        },
+        {
+          "signbankId": "IPSILATERAL_TO_UPWARDS",
+          "aliases": [
+            "ipsilateral > amunt",
+            "ipsilateral > upwards"
+          ]
+        },
+        {
+          "signbankId": "LATERAL",
+          "aliases": [
+            "lateral"
+          ]
+        },
+        {
+          "signbankId": "PROXIMAL",
+          "aliases": [
+            "proximal"
+          ]
+        },
+        {
+          "signbankId": "TO_AND_FRO",
+          "aliases": [
+            "to and fro",
+            "vaive"
+          ]
+        },
+        {
+          "signbankId": "TOWARDS_LOCATION",
+          "aliases": [
+            "cap a la localitzacio",
+            "towards location"
+          ]
+        },
+        {
+          "signbankId": "UP_AND_DOWN",
+          "aliases": [
+            "amunt i avall",
+            "up and down"
+          ]
+        },
+        {
+          "signbankId": "UPWARDS",
+          "aliases": [
+            "amunt",
+            "upwards"
+          ]
+        },
+        {
+          "signbankId": "UPWARDS_AND_FORWARDS",
+          "aliases": [
+            "amunt + endavant",
+            "upwards + forwards"
+          ]
+        },
+        {
+          "signbankId": "UPWARDS_TO_DOWNWARDS",
+          "aliases": [
+            "amunt > avall",
+            "upwards > downwards"
+          ]
+        },
+        {
+          "signbankId": "UPWARDS_TO_FORWARDS_TO_DOWNWARDS",
+          "aliases": [
+            "amunt > endavant > avall",
+            "upwards > forwards > downwards"
+          ]
+        },
+        {
+          "signbankId": "UPWARDS_TO_IPSILATERAL",
+          "aliases": [
+            "amunt > ipsilateral",
+            "upwards > ipsilateral"
+          ]
+        },
+        {
+          "signbankId": "VARIABLE",
+          "aliases": [
+            "variable"
+          ]
+        }
+      ],
+      "unmapped": [],
+      "jsonField": "phonology.direccio_moviment"
+    },
+    "lexicalCategory": {
+      "enum": "LexicalCategory",
+      "jsonField": "lexical_category",
+      "entries": [
+        {
+          "signbankId": "ADJECTIVE",
+          "aliases": [
+            "adjectiu",
+            "adjective"
+          ]
+        },
+        {
+          "signbankId": "ADJECTIVE_OR_ADVERB",
+          "aliases": [
+            "adjectiu o adverbi",
+            "adjective or adverb"
+          ]
+        },
+        {
+          "signbankId": "ADVERB",
+          "aliases": [
+            "adverb",
+            "adverbi"
+          ]
+        },
+        {
+          "signbankId": "ADVERB_OR_INTERJECTION",
+          "aliases": [
+            "adverb or interjection",
+            "adverbi o interjeccio"
+          ]
+        },
+        {
+          "signbankId": "INTERJECTION",
+          "aliases": [
+            "ineterjection",
+            "interjeccio"
+          ]
+        },
+        {
+          "signbankId": "NOUN",
+          "aliases": [
+            "nom",
+            "noun"
+          ]
+        },
+        {
+          "signbankId": "NOUN_ADJECTIVE_OR_ADVERB",
+          "aliases": [
+            "nom, adjectiu o adverbi",
+            "noun, adjective or adverb"
+          ]
+        },
+        {
+          "signbankId": "NOUN_ADJECTIVE_OR_PARTICLE",
+          "aliases": [
+            "nom, adjectiu o preposicio",
+            "noun, adjective or particle"
+          ]
+        },
+        {
+          "signbankId": "NOUN_ADJECTIVE_OR_VERB",
+          "aliases": [
+            "nom, adjectiu o verb",
+            "noun, adjective or verb"
+          ]
+        },
+        {
+          "signbankId": "NOUN_OR_ADJECTIVE",
+          "aliases": [
+            "nom o adjectiu",
+            "noun or adjective"
+          ]
+        },
+        {
+          "signbankId": "NOUN_OR_ADVERB",
+          "aliases": [
+            "nom o adverbi",
+            "noun or adverb"
+          ]
+        },
+        {
+          "signbankId": "NOUN_OR_INTERJECTION",
+          "aliases": [
+            "nom o interjeccio",
+            "noun or interjection"
+          ]
+        },
+        {
+          "signbankId": "NOUN_OR_PREPOSITION",
+          "aliases": [
+            "nom o preposicio",
+            "noun or preposition"
+          ]
+        },
+        {
+          "signbankId": "NOUN_OR_VERB",
+          "aliases": [
+            "nom o verb",
+            "noun or verb"
+          ]
+        },
+        {
+          "signbankId": "PARTICLE",
+          "aliases": [
+            "particle",
+            "particula"
+          ]
+        },
+        {
+          "signbankId": "PARTICLE_NOUN_OR_VERB",
+          "aliases": [
+            "particle, noun or verb",
+            "preposicio, nom o verb"
+          ]
+        },
+        {
+          "signbankId": "PARTICLE_OR_ADVERB",
+          "aliases": [
+            "particle or adverb",
+            "particula o adverbi"
+          ]
+        },
+        {
+          "signbankId": "PRONOUN",
+          "aliases": [
+            "pronom",
+            "pronoun"
+          ]
+        },
+        {
+          "signbankId": "VERB",
+          "aliases": [
+            "verb"
+          ]
+        },
+        {
+          "signbankId": "VERB_ADJECTIVE_OR_ADVERB",
+          "aliases": [
+            "verb, adjectiu o adverbi",
+            "verb, adjective or adverb"
+          ]
+        },
+        {
+          "signbankId": "VERB_ADJECTIVE_OR_PARTICLE",
+          "aliases": [
+            "verb, adjectiu o preposicio",
+            "verb, adjective or particle"
+          ]
+        },
+        {
+          "signbankId": "VERB_OR_ADJECTIVE",
+          "aliases": [
+            "verb o adjectiu",
+            "verb or adjective"
+          ]
+        },
+        {
+          "signbankId": "VERB_OR_ADVERB",
+          "aliases": [
+            "verb o adverbi",
+            "verb or adverb"
+          ]
+        },
+        {
+          "signbankId": "VERB_OR_INTERJECTION",
+          "aliases": [
+            "verb o interjeccio",
+            "verb or interjection"
+          ]
+        },
+        {
+          "signbankId": "VERB_OR_PARTICLE",
+          "aliases": [
+            "verb o preposicio",
+            "verb or particle"
+          ]
+        }
+      ],
+      "unmapped": [
+        {
+          "sourceEn": "Particle or adjectiuve",
+          "sourceCa": "Preposició o adjectiu",
+          "guessedId": "PARTICLE_OR_ADJECTIUVE"
+        },
+        {
+          "sourceEn": "Noun, verb o adverb",
+          "sourceCa": "Nom, verb o adverbi",
+          "guessedId": "NOUN_VERB_O_ADVERB"
+        }
+      ]
+    },
+    "relationType": {
+      "enum": "RelationType",
+      "jsonField": "related_signs",
+      "entries": [
+        {
+          "signbankId": "ANTONYM",
+          "aliases": [
+            "antonim",
+            "antonym"
+          ]
+        },
+        {
+          "signbankId": "ASSOCIATED_CONCEPT",
+          "aliases": [
+            "see also",
+            "veure tambe"
+          ]
+        },
+        {
+          "signbankId": "HOMONYM",
+          "aliases": [
+            "homonim",
+            "homonym"
+          ]
+        },
+        {
+          "signbankId": "HYPERNYM",
+          "aliases": [
+            "hiperonim",
+            "hypernym"
+          ]
+        },
+        {
+          "signbankId": "HYPONYM",
+          "aliases": [
+            "hiponim",
+            "hyponym"
+          ]
+        },
+        {
+          "signbankId": "SYNONYM",
+          "aliases": [
+            "sinonim",
+            "synonym"
+          ]
+        },
+        {
+          "signbankId": "VARIANT",
+          "aliases": [
+            "variant"
+          ]
+        }
+      ],
+      "unmapped": []
+    },
+    "repeatedMovement": {
+      "jsonField": "phonology.moviment_repetit",
+      "entries": [
+        {
+          "value": true,
+          "aliases": [
+            "sí",
+            "si",
+            "s",
+            "yes",
+            "true",
+            "1"
+          ]
+        },
+        {
+          "value": false,
+          "aliases": [
+            "no",
+            "n",
+            "false",
+            "0"
+          ]
+        }
+      ]
+    }
+  },
+  "summary": {
+    "handedness": {
+      "mapped": 5,
+      "aliasCount": 5,
+      "unmapped": 0
+    },
+    "configuration": {
+      "mapped": 51,
+      "aliasCount": 171,
+      "unmapped": 6
+    },
+    "configurationChanges": {
+      "mapped": 19,
+      "aliasCount": 46,
+      "unmapped": 3
+    },
+    "relationBetweenArticulators": {
+      "mapped": 9,
+      "aliasCount": 18,
+      "unmapped": 5
+    },
+    "location": {
+      "mapped": 136,
+      "aliasCount": 271,
+      "unmapped": 12
+    },
+    "movementRelatedOrientation": {
+      "mapped": 48,
+      "aliasCount": 93,
+      "unmapped": 0
+    },
+    "orientationRelatedToLocation": {
+      "mapped": 26,
+      "aliasCount": 50,
+      "unmapped": 1
+    },
+    "orientationChange": {
+      "mapped": 16,
+      "aliasCount": 32,
+      "unmapped": 3
+    },
+    "contactType": {
+      "mapped": 13,
+      "aliasCount": 25,
+      "unmapped": 3
+    },
+    "movementType": {
+      "mapped": 8,
+      "aliasCount": 15,
+      "unmapped": 1
+    },
+    "movementDirection": {
+      "mapped": 62,
+      "aliasCount": 116,
+      "unmapped": 0
+    },
+    "lexicalCategory": {
+      "mapped": 25,
+      "aliasCount": 49,
+      "unmapped": 2
+    },
+    "relationType": {
+      "mapped": 7,
+      "aliasCount": 13,
+      "unmapped": 0
+    },
+    "repeatedMovement": {
+      "mapped": 2,
+      "aliasCount": 10,
+      "unmapped": 0
+    }
+  }
+}
\ No newline at end of file
diff --git a/backend/src/import/fitxa-enum-resolver.ts b/backend/src/import/fitxa-enum-resolver.ts
new file mode 100644
index 0000000..7261123
--- /dev/null
+++ b/backend/src/import/fitxa-enum-resolver.ts
@@ -0,0 +1,103 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+const mappings = JSON.parse(
+  fs.readFileSync(path.join(__dirname, 'fitxa-enum-mappings.json'), 'utf8'),
+) as typeof import('./fitxa-enum-mappings.json');
+
+export type FitxaMappingField = keyof typeof mappings.fields;
+
+export interface EnumResolveResult<T = string> {
+  value: T | null;
+  field: string;
+  input: string;
+}
+
+function normalize(input: string): string {
+  return input
+    .trim()
+    .normalize('NFD')
+    .replace(/\p{M}/gu, '')
+    .toLowerCase()
+    .replace(/\s+/g, ' ');
+}
+
+function stripCompoundPrefix(input: string): string {
+  return input.replace(/^\d+n\s+comp:\s*/i, '').trim();
+}
+
+function buildAliasIndex(
+  entries: Array<{ signbankId?: string; value?: boolean; aliases: string[] }>,
+  valueKey: 'signbankId' | 'value' = 'signbankId',
+): Map<string, string | boolean> {
+  const index = new Map<string, string | boolean>();
+  for (const entry of entries) {
+    const value = entry[valueKey];
+    if (value === undefined) continue;
+    for (const alias of entry.aliases) {
+      index.set(normalize(alias), value);
+    }
+  }
+  return index;
+}
+
+const aliasIndexes: Partial<Record<FitxaMappingField, Map<string, string | boolean>>> = {};
+
+function getIndex(field: FitxaMappingField): Map<string, string | boolean> {
+  if (!aliasIndexes[field]) {
+    const fieldData = mappings.fields[field];
+    if (!fieldData?.entries) return new Map();
+    const valueKey = field === 'repeatedMovement' ? 'value' : 'signbankId';
+    aliasIndexes[field] = buildAliasIndex(fieldData.entries as any, valueKey as any);
+  }
+  return aliasIndexes[field]!;
+}
+
+/** Resolve a scraped label to a SignBank enum ID (or boolean for repeatedMovement). */
+export function resolveFitxaEnum(
+  field: FitxaMappingField,
+  raw: string | null | undefined,
+): EnumResolveResult {
+  const input = String(raw ?? '').trim();
+  if (!input) return { value: null, field, input };
+
+  const index = getIndex(field);
+  const candidates = [input, stripCompoundPrefix(input)];
+
+  for (const candidate of candidates) {
+    const hit = index.get(normalize(candidate));
+    if (hit !== undefined) {
+      return { value: hit as string, field, input };
+    }
+  }
+
+  return { value: null, field, input };
+}
+
+/** Map JSON phonology block to SignBank VideoData enum fields. */
+export function mapPhonologyFromFitxa(phonology: Record<string, unknown>) {
+  const fieldMap: Array<[FitxaMappingField, string]> = [
+    ['configuration', 'configuracio'],
+    ['configurationChanges', 'canvi_configuracio'],
+    ['relationBetweenArticulators', 'relacio_articuladors'],
+    ['location', 'localitzacio'],
+    ['movementRelatedOrientation', 'orientacio_moviment'],
+    ['orientationRelatedToLocation', 'orientacio_localitzacio'],
+    ['orientationChange', 'canvi_orientacio'],
+    ['contactType', 'tipus_contacte'],
+    ['movementType', 'forma_moviment'],
+    ['movementDirection', 'direccio_moviment'],
+  ];
+
+  const result: Record<string, EnumResolveResult> = {};
+  for (const [field, jsonKey] of fieldMap) {
+    result[jsonKey] = resolveFitxaEnum(field, phonology[jsonKey] as string);
+  }
+
+  const repeated = resolveFitxaEnum('repeatedMovement', phonology.moviment_repetit as string);
+  result.moviment_repetit = repeated;
+
+  return result;
+}
+
+export { mappings };
diff --git a/docs/fitxas-enum-mappings.md b/docs/fitxas-enum-mappings.md
new file mode 100644
index 0000000..7874b65
--- /dev/null
+++ b/docs/fitxas-enum-mappings.md
@@ -0,0 +1,122 @@
+# Fitxa → SignBank enum mappings
+
+How to use `Traducció etiquetes-Taules.xlsx` to parse scraped fitxa JSON into SignBank Prisma enums.
+
+## Recommended approach
+
+| Layer | Format | Role |
+|-------|--------|------|
+| **Source (editable)** | `Traducció etiquetes-Taules.xlsx` | What the dictionary team maintains |
+| **Generated (committed)** | `backend/src/import/fitxa-enum-mappings.json` | Machine-readable lookup tables |
+| **Runtime** | `backend/src/import/fitxa-enum-resolver.ts` | Import script calls `resolveFitxaEnum()` |
+
+**Do not** read the `.xlsx` at import time. Regenerate JSON when the spreadsheet changes.
+
+```bash
+node backend/scripts/generate-fitxa-mappings.js "path/to/Traducció etiquetes-Taules.xlsx"
+```
+
+Optional analysis report (gaps vs Prisma):
+
+```bash
+node backend/scripts/analyze-fitxa-mappings.js "path/to/Traducció etiquetes-Taules.xlsx"
+# → docs/fitxas-mapping-analysis.json
+```
+
+## JSON structure
+
+```json
+{
+  "fields": {
+    "configuration": {
+      "enum": "HandConfiguration",
+      "jsonField": "phonology.configuracio",
+      "entries": [
+        {
+          "signbankId": "CONF_33",
+          "aliases": ["q", "beak", "q (beak)", "beak (q)"]
+        }
+      ],
+      "unmapped": []
+    }
+  }
+}
+```
+
+**Lookup rule:** normalize input (lowercase, strip accents, collapse spaces) → match against `aliases[]` → return `signbankId`.
+
+For compound phonology values like `"2n COMP: Espai neutre"`, the resolver strips the `2n COMP:` prefix before lookup.
+
+## XLSX sheet → SignBank enum
+
+| XLSX sheet | JSON field | SignBank enum | Match quality |
+|------------|------------|---------------|---------------|
+| `Handedness-mans` | `phonology.nombre_mans` | *(not `Hand`)* | 5 codes: `1`, `2a`, `2n`, `2s`, `x` |
+| `Configuracions` | `configuracio`, `configuracio_ma_*` | `HandConfiguration` | 51/57 via `ID_CONFIGURACIO` → `CONF_*` |
+| `Canvi de configuració` | `canvi_configuracio` | `ConfigurationChange` | 19/22 |
+| `Relació entre articuladors` | `relacio_articuladors` | `RelationBetweenArticulators` | 9/14 |
+| `Localitzacions` | `localitzacio` | `Location` | 136/148 |
+| `Oirentació relativa_moviment` | `orientacio_moviment` | `MovementRelatedOrientation` | 48/48 |
+| `Orientació relativa_localitzaci` | `orientacio_localitzacio` | `OrientationRelatedToLocation` | 26/27 |
+| `Canvi_orientació` | `canvi_orientacio` | `OrientationChange` | 16/19 |
+| `Tipus_contacte` | `tipus_contacte` | `ContactType` | 13/16 |
+| `Forma_moviment` | `forma_moviment` | `MovementType` | 8/9 |
+| `Direcció_moviment` | `direccio_moviment` | `MovementDirection` | 62/62 |
+| `Categoria lèxica` | `lexical_category` | `LexicalCategory` | 25/27 |
+| `Tipus_relació_altres_signes` | `related_signs.*` | `RelationType` | 7/7 |
+
+Sheets not yet wired: `Camp_semàntic`, `Etiquetes-Tags`, `València`, `Morfologia seqüencial`, etc.
+
+## Important gaps to fix manually
+
+### 1. `Hand` enum ≠ handedness codes
+
+SignBank `Hand` = `RIGHT` | `LEFT` | `BOTH`.
+
+Fitxa `nombre_mans` = `1` | `2a` | `2n` | `2s` | `x` (different taxonomy).
+
+**Recommendation:** Add a `handedness` string/code field on `VideoData` or `GlossData`, or a new enum matching the xlsx — do not force-map to `Hand`.
+
+### 2. Label mismatches (add to `aliases` or fix xlsx)
+
+| Fitxa value | SignBank enum | Issue |
+|-------------|---------------|-------|
+| `Damunt / Sota` | `ABOVE_BELOW` | Auto-guess was `ABOVE_OR_BELOW` |
+| `AO: palm-down` | `AO_PALM_DOWN` | CA label uses `AO: Palmell-avall` — aliases cover this |
+| `Pont del nas` | `BRIDGE_OF_NOSE` | English xlsx row differs from enum key |
+| `Mà no-dominant` | `WEAK_HAND` | Catalan label in JSON, English xlsx has `Weak hand` |
+| `O_SSI (O)` | `CONF_3`? | Verify alias for `0_SSI` / `O` |
+
+### 3. Combined values (`B (B) / O_SSI (O)`)
+
+JSON often combines dominant/non-dominant with `/`. Import should:
+
+1. Split on `/`
+2. Map each part separately (when per-hand fields exist)
+3. Or map the combined string as an extra alias on the primary configuration
+
+### 4. Rows skipped in xlsx
+
+Some `Configuracions` rows have Google Drive URLs in `ID_CONFIGURACIO` instead of numeric IDs — fix in spreadsheet or add manual aliases.
+
+## Usage in import script
+
+```typescript
+import { resolveFitxaEnum, mapPhonologyFromFitxa } from '../import/fitxa-enum-resolver';
+
+const config = resolveFitxaEnum('configuration', 'Q (Beak)');
+// → { value: 'CONF_33', field: 'configuration', input: 'Q (Beak)' }
+
+const phonology = mapPhonologyFromFitxa(fitxa.phonology);
+// → per-field results; null value = log warning, store EMPTY
+```
+
+## Related files
+
+| File | Purpose |
+|------|---------|
+| `backend/src/import/fitxa-enum-mappings.json` | Generated mappings |
+| `backend/src/import/fitxa-enum-resolver.ts` | Lookup helper |
+| `backend/scripts/generate-fitxa-mappings.js` | XLSX → JSON |
+| `docs/fitxas-import-enums-reference.md` | All Prisma enum values + CA labels |
+| `docs/fitxas-mapping-analysis.json` | Auto-match gap report |
diff --git a/docs/fitxas-import-enums-reference.md b/docs/fitxas-import-enums-reference.md
new file mode 100644
index 0000000..5b8b6cf
--- /dev/null
+++ b/docs/fitxas-import-enums-reference.md
@@ -0,0 +1,530 @@
+# SignBank — Referència d'ENUMs per a la importació
+
+Valors tancats definits a `backend/prisma/schema.prisma`. Les etiquetes en català són les que mostra l'aplicació avui (`frontend/src/i18n/ca-ES/`).
+
+**Generat:** 2026-06-17
+
+Per cada valor cal decidir a la reunió:
+- **A)** El JSON de les fitxes ja usa aquest vocabulari (o un de equivalent) → només cal una taula de correspondència.
+- **B)** El vocabulari de les fitxes és diferent → cal definir el mapatge fitxa → SignBank, o ampliar els ENUMs de SignBank.
+
+---
+
+## Language (4 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `CATALAN` | Català | |
+| `SPANISH` | Castellà | |
+| `ENGLISH` | Anglès | |
+| `OTHER` | Altre | |
+
+## LexicalCategory (27 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `ADJECTIVE` | Adjectiu | |
+| `INTERJECTION` | Interjecció | |
+| `NOUN` | Nom | |
+| `NOUN_OR_VERB` | Nom o Verb | |
+| `NOUN_OR_ADJECTIVE` | Nom o Adjectiu | |
+| `NOUN_ADJECTIVE_OR_VERB` | Nom, Adjectiu o Verb | |
+| `VERB_OR_ADJECTIVE` | Verb o Adjectiu | |
+| `PARTICLE` | Nom, Adjectiu o Partícula | |
+| `VERB` | Verb | |
+| `ADVERB` | Adverbi | |
+| `PRONOUN` | Pronom | |
+| `NOUN_ADJECTIVE_OR_ADVERB` | Nom, Adjectiu o Adverbi | |
+| `PARTICLE_NOUN_OR_VERB` | Partícula, Nom o Verb | |
+| `NOUN_OR_ADVERB` | Nom o Adverbi | |
+| `VERB_ADJECTIVE_OR_ADVERB` | Verb, Adjectiu o Adverbi | |
+| `VERB_OR_INTERJECTION` | Adverbi o Interjecció | |
+| `ADJECTIVE_OR_ADVERB` | Adjectiu o Adverbi | |
+| `VERB_ADJECTIVE_OR_PARTICLE` | Verb, Adjectiu o Partícula | |
+| `PARTICLE_OR_ADJECTIVE` | Partícula o Adjectiu | |
+| `NOUN_ADJECTIVE_OR_PARTICLE` | Nom, Adjectiu o Partícula | |
+| `VERB_OR_ADVERB` | Nom, Verb o Adverbi | |
+| `PARTICLE_OR_ADVERB` | Partícula o Adverbi | |
+| `NOUN_VERB_OR_ADVERB` | Nom, Verb o Adverbi | |
+| `NOUN_OR_INTERJECTION` | Nom o Interjecció | |
+| `ADVERB_OR_INTERJECTION` | Adverbi o Interjecció | |
+| `VERB_OR_PARTICLE` | Verb o Partícula | |
+| `NOUN_OR_PREPOSITION` | Nom o Preposició | |
+
+## RelationType (8 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `SYNONYM` | Sinònim | |
+| `REGIONAL_VARIANT` |  | |
+| `ASSOCIATED_CONCEPT` | Concepte associat | |
+| `ANTONYM` | Antònim | |
+| `HOMONYM` | Homònim | |
+| `VARIANT` | Variant | |
+| `HYPERNYM` |  | |
+| `HYPONYM` |  | |
+
+## Hand (3 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `RIGHT` | Mà dreta / dominant? | |
+| `LEFT` | Mà esquerra | |
+| `BOTH` | Ambdues mans | |
+
+## HandConfiguration (52 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------- BUIT ------- | |
+| `CONF_1` | 0 | |
+| `CONF_2` | 0e | |
+| `CONF_3` | 0_SSI | |
+| `CONF_4` | 1 | |
+| `CONF_5` | 1d | |
+| `CONF_6` | 2 | |
+| `CONF_1D834` | 2t | |
+| `CONF_7` | 2d | |
+| `CONF_8` | 3 | |
+| `CONF_9` | 3d | |
+| `CONF_10` | 4 | |
+| `CONF_11` | 4d | |
+| `CONF_12` | 5 | |
+| `CONF_13` | 5d | |
+| `CONF_14` | 6 | |
+| `CONF_15` | 6d | |
+| `CONF_16` | 7 | |
+| `CONF_1D86C` | 7d | |
+| `CONF_18` | 8 | |
+| `CONF_1D82E` | 8t | |
+| `CONF_19` | 8d | |
+| `CONF_20` | A | |
+| `CONF_21` | B | |
+| `CONF_22` | Bd | |
+| `CONF_23` | C | |
+| `CONF_24` | D | |
+| `CONF_25` | E | |
+| `CONF_26` | F | |
+| `CONF_27` | G_SSI | |
+| `CONF_29` | Id | |
+| `CONF_30` | I | |
+| `CONF_31` | K | |
+| `CONF_32` | O | |
+| `CONF_33` | Q | |
+| `CONF_34` | R | |
+| `CONF_35` | S | |
+| `CONF_36` | T | |
+| `CONF_37` | T_antiga | |
+| `CONF_38` | U | |
+| `CONF_39` | Y_SSI | |
+| `CONF_40` | polze-cor | |
+| `CONF_1D8C3` | Cor_e | |
+| `CONF_42` | 5m_tancat | |
+| `CONF_1D87D` | Ce | |
+| `CONF_1D8C5` | Cor | |
+| `CONF_1D8A7` | 5r | |
+| `CONF_1D8B` | 5r_tancat | |
+| `CONF_1D88E` | 9 | |
+| `CONF_1D8BA` | ASL_T | |
+| `CONF_1D8C7` | Cor-E | |
+| `CONF_2A` | ILY | |
+
+## ConfigurationChange (20 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------- BUIT ------- | |
+| `BENDING` | Flexió | |
+| `CLOSING` | Tancament | |
+| `CLOSING_AND_RUBBING` | Tancament + Fregament | |
+| `CLOSING_AND_WIGGLING` | Tancament + Vibració | |
+| `CLOSING_TO_OPENING` | Tancament > Obertura | |
+| `CONSECUTIVE_CLOSING` | Tancament consecutiu | |
+| `CURVING` | Corbat | |
+| `NONE_TO_SPREADING` | Cap a Extensió | |
+| `OPENING` | Obertura | |
+| `OPENING_AND_RUBBING` | Obertura + Fregament | |
+| `OPENING_AND_SPREADING` | Obertura + Extensió | |
+| `OPENING_AND_WIGGLING` | Obertura + Vibració | |
+| `OPENING_TO_CLOSING` | Obertura > Tancament | |
+| `RUBBING` | Fregament | |
+| `SPREADING` | Extensió | |
+| `UNBENDING` | Estirament | |
+| `UNCURVING` | Redreçament | |
+| `UNSPREADING` | Ajustament | |
+| `WIGGLING` | Vibració | |
+
+## RelationBetweenArticulators (12 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------- BUIT ------- | |
+| `ABOVE` | A dalt | |
+| `ABOVE_BELOW` | A dalt i a baix | |
+| `AROUND` | Al voltant | |
+| `BACK` | Darrere | |
+| `BELOW` | A baix | |
+| `CROSS` | Creuat | |
+| `FRONT` | Davant | |
+| `FRONT_BACK` | Davant i darrere | |
+| `INSIDE` | Dins | |
+| `INTERWOVEN` | Entrellaçat | |
+| `NEXT_TO` | Al costat | |
+
+## Location (141 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------------- | |
+| `ARM` | Braç | |
+| `ARMPIT` | Aixella | |
+| `BACK` | Esquena | |
+| `BACK_OF_HEAD` | Part posterior del cap | |
+| `BELLY` | Ventre | |
+| `BREASTS` | Pits | |
+| `BREAST_IPSI` | Pit ipsilateral | |
+| `BREAST_CONTRA` | Pit contralateral | |
+| `BRIDGE_OF_NOSE` | Pont del nas | |
+| `CHEEK` | Galta | |
+| `CHEEK_CONTRA` | Galta contralateral | |
+| `CHEEKBONE` | Pòmul | |
+| `CHEST` | Pit | |
+| `CHEST_CONTRA` | Pit contralateral | |
+| `CHIN` | Barbeta | |
+| `CHIN_CONTRA` | Barbeta contralateral | |
+| `CROTCH` | Entrecuix | |
+| `EAR` | Orella | |
+| `EARLOBE` | Lòbul de l'orella | |
+| `EAST` | Est | |
+| `ELBOW` | Colze | |
+| `EYE` | Ull | |
+| `EYEBROW` | Cella | |
+| `FACE` | Cara | |
+| `FACE_IPSI` | Cara ipsilateral | |
+| `FLANK` | Costat | |
+| `FOREHEAD` | Front | |
+| `FOREHEAD_CONTRA` | Front contralateral | |
+| `HEAD` | Cap | |
+| `HEAD_CONTRA` | Cap contralateral | |
+| `HEAD_IPSI` | Cap ipsilateral | |
+| `HIP` | Maluc | |
+| `HORIZONTAL_PLANE` | Pla horitzontal | |
+| `KNEE` | Genoll | |
+| `LEG` | Cama | |
+| `LOWER_ARM` | Avantbraç | |
+| `LOWER_LIP` | Llavi inferior | |
+| `MOUTH` | Boca | |
+| `MOUTH_CONTRA` | Boca contralateral | |
+| `MOUTH_IPSI` | Boca ipsilateral | |
+| `NECK` | Coll | |
+| `NECK_CONTRA` | Coll contralateral | |
+| `NEUTRAL_SPACE` | Espai neutral | |
+| `NOSE` | Nas | |
+| `PARALLEL_PLANE` | Pla paral·lel | |
+| `R_LOC` | Ubicació R | |
+| `SHOULDER` | Espatlla | |
+| `SHOULDER_CONTRA` | Espatlla contralateral | |
+| `TEETH` | Dents | |
+| `TEMPLE` | Templa | |
+| `THUMB` | Polze | |
+| `TONGUE` | Llengua | |
+| `TRUNK` | Tronc | |
+| `UPPER_ARM` | Braç superior | |
+| `UPPER_LIP` | Llavi superior | |
+| `VARIABLE` | Variable | |
+| `VIRTUAL_OBJECT` | Objecte virtual | |
+| `WAIST` | Cintura | |
+| `WEST` | Oest | |
+| `WRIST` | Canell | |
+| `WEAK_HAND` | Mà feble | |
+| `WEAK_HAND_BACK` | Dors de la mà feble | |
+| `WEAK_HAND_BASE` | Base de la mà feble | |
+| `WEAK_HAND_FINGER_TIPS` | Puntes dels dits de la mà feble | |
+| `WEAK_HAND_FINGER` | Dit de la mà feble | |
+| `WEAK_HAND_FRONT` | Front de la mà feble | |
+| `WEAK_HAND_INDEX_FINGER` | Dit índex de la mà feble | |
+| `WEAK_HAND_KNUCKLES` | Artells de la mà feble | |
+| `WEAK_HAND_MIDDLE_FINGER` | Dit del mig de la mà feble | |
+| `WEAK_HAND_PALM` | Palmell de la mà feble | |
+| `WEAK_HAND_PINKIE` | Dit petit de la mà feble | |
+| `WEAK_HAND_PINKIE_SIDE` | Costat del dit petit de la mà feble | |
+| `WEAK_HAND_RING_FINGER` | Dit anular de la mà feble | |
+| `WEAK_HAND_THENAR` | Tenar de la mà feble | |
+| `WEAK_HAND_THUMB` | Polze de la mà feble | |
+| `WEAK_HAND_THUMB_SIDE` | Costat del polze de la mà feble | |
+| `WEAK_HAND_WEB_SPACE` | Espai interdigital de la mà feble | |
+| `BELLY_TO_CHEST` | Ventre > pit | |
+| `CHEEK_TO_CHEEK` | Galta > galta | |
+| `CHEEK_TO_CHIN` | Galta > barbeta | |
+| `CHIN_TO_CHEST` | Barbeta > pit | |
+| `CHIN_TO_NEUTRAL_SPACE` | Barbeta > espai neutral | |
+| `CHIN_TO_WEAK_HAND_INDEX` | Barbeta > índex de mà feble | |
+| `CHIN_TO_WEAK_HAND_PALM` | Barbeta > palmell de mà feble | |
+| `CHIN_TO_WEAK_HAND_THUMB` | Barbeta > polze de mà feble | |
+| `EAR_TO_CHEEK` | Orella > galta | |
+| `EAR_TO_CHEST` | Orella > pit | |
+| `EAR_TO_MOUTH` | Orella > boca | |
+| `EYE_TO_NEUTRAL_SPACE` | Ull > espai neutral | |
+| `FACE_TO_HEAD` | Cara > cap | |
+| `FACE_TO_NEUTRAL_SPACE` | Cara > espai neutral | |
+| `FOREHEAD_TO_CHEST` | Front > pit | |
+| `FOREHEAD_TO_CHIN` | Front > barbeta | |
+| `FOREHEAD_TO_NEUTRAL_SPACE` | Front > espai neutral | |
+| `FOREHEAD_TO_WEAK_HAND_PALM` | Front > palmell de mà feble | |
+| `HEAD_TO_CHEST` | Cap > pit | |
+| `HEAD_TO_CHEST_TO_SHOULDER` | Cap > pit > espatlla | |
+| `HEAD_TO_NEUTRAL_SPACE` | Cap > espai neutral | |
+| `HEAD_TO_SHOULDER` | Cap > espatlla | |
+| `HEAD_TO_WEAK_HAND_PALM` | Cap > palmell de mà feble | |
+| `LEG_TO_WAIST` | Cama > cintura | |
+| `MOUTH_TO_CHEEK` | Boca > galta | |
+| `MOUTH_TO_CHEST` | Boca > pit | |
+| `MOUTH_TO_CHIN` | Boca > barbeta | |
+| `MOUTH_TO_NEUTRAL_SPACE` | Boca > espai neutral | |
+| `MOUTH_TO_WEAK_HAND` | Boca > mà feble | |
+| `MOUTH_TO_WEAK_HAND_PALM` | Boca > palmell de mà feble | |
+| `NECK_TO_CHEST` | Coll > pit | |
+| `NECK_TO_NEUTRAL_SPACE` | Coll > espai neutral | |
+| `NEUTRAL_SPACE_TO_HEAD` | Espai neutral > cap | |
+| `NEUTRAL_SPACE_TO_SHOULDER` | Espai neutral > espatlla | |
+| `NEUTRAL_SPACE_TO_NOSE` | Espai neutral > nas | |
+| `NEUTRAL_SPACE_TO_CHEEK` | Espai neutral > galta | |
+| `NEUTRAL_SPACE_TO_MOUTH` | Espai neutral > boca | |
+| `NEUTRAL_SPACE_TO_CHEST` | Espai neutral > pit | |
+| `NEUTRAL_SPACE_TO_WEAK_HAND` | Espai neutral > mà feble | |
+| `NOSE_TO_CHIN` | Nas > barbeta | |
+| `NOSE_TO_NEUTRAL_SPACE` | Nas > espai neutral | |
+| `NOSE_TO_WEAK_HAND` | Nas > mà feble | |
+| `R_LOC_TO_R_LOC` | Ubicació R > ubicació R | |
+| `SHOULDER_TO_CHEST` | Espatlla > pit | |
+| `SHOULDER_TO_SHOULDER` | Espatlla > espatlla | |
+| `SHOULDER_TO_WEAK_HAND_PALM` | Espatlla > palmell de mà feble | |
+| `SHOULDER_TO_NEUTRAL_SPACE` | Espatlla > espai neutral | |
+| `SHOULDER_TO_HIT` | Espatlla > cop | |
+| `TEMPLE_TO_CHEST` | Templa > pit | |
+| `TEMPLE_TO_CHEEK` | Templa > galta | |
+| `TEMPLE_TO_SHOULDER` | Templa > espatlla | |
+| `TEMPLE_TO_NEUTRAL_SPACE` | Templa > espai neutral | |
+| `WEAK_HAND_TO_ARM` | Mà feble > braç | |
+| `WEAK_HAND_TO_NEUTRAL_SPACE` | Mà feble > espai neutral | |
+| `WEAK_HAND_THUMB_SIDE_TO_ARM` | Costat del polze de la mà feble > braç | |
+| `ARMPIT_TO_NEUTRAL_SPACE` | Aixella > espai neutral | |
+| `CHEST_TO_CHIN` | Pit > barbeta | |
+| `CHEST_TO_NEUTRAL_SPACE` | Pit > espai neutral | |
+| `BELLY_AND_FOREHEAD` | Ventre + front | |
+| `HEAD_AND_NEUTRAL_SPACE` | Cap + espai neutral | |
+| `FLANK_OR_HEAD` | Costat \| cap | |
+| `NEUTRAL_SPACE_OR_WEAK_HAND_FRONT` | Espai neutral \| front de mà feble | |
+| `BOTTOM_OR_CROTCH` | Cul \| entrecuix | |
+
+## MovementRelatedOrientation (49 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------- BUIT ------- | |
+| `BACK` | Darrere | |
+| `BASE` | Base | |
+| `FINGER_TIPS` | Puntes dels dits | |
+| `FRONT` | Davant | |
+| `PALM` | Palmell | |
+| `RADIAL` | Radial | |
+| `ULNAR` | Ulnar | |
+| `VARIABLE` | Variable | |
+| `BACK_AND_BASE` | Darrere + base | |
+| `BACK_AND_RADIAL` | Darrere + radial | |
+| `BACK_AND_ULNAR` | Darrere + ulnar | |
+| `BASE_AND_FRONT` | Base + davant | |
+| `BASE_AND_PALM` | Base + palmell | |
+| `BASE_AND_ULNAR` | Base + ulnar | |
+| `FRONT_AND_ULNAR` | Davant + ulnar | |
+| `PALM_AND_RADIAL` | Palmell + radial | |
+| `PALM_AND_ULNAR` | Palmell + ulnar | |
+| `PALM_AND_RADIAL_OR_ULNAR` | Palmell + radial \| ulnar | |
+| `BACK_TO_FINGER_TIPS` | Darrere > puntes dels dits | |
+| `BACK_TO_FRONT` | Darrere > davant | |
+| `BACK_TO_PALM` | Darrere > palmell | |
+| `BACK_TO_RADIAL` | Darrere > radial | |
+| `BASE_TO_BACK` | Base > darrere | |
+| `BASE_TO_BASE` | Base > base | |
+| `BASE_TO_FRONT` | Base > davant | |
+| `BASE_TO_PALM` | Base > palmell | |
+| `BASE_TO_ULNAR` | Base > ulnar | |
+| `FINGER_TIPS_TO_BACK` | Puntes dels dits > darrere | |
+| `FINGER_TIPS_TO_BASE` | Puntes dels dits > base | |
+| `FINGER_TIPS_TO_PALM` | Puntes dels dits > palmell | |
+| `FRONT_TO_BACK` | Davant > darrere | |
+| `PALM_TO_BACK` | Palmell > darrere | |
+| `PALM_TO_BASE` | Palmell > base | |
+| `RADIAL_TO_ULNAR` | Radial > ulnar | |
+| `ULNAR_TO_BASE` | Ulnar > base | |
+| `ULNAR_TO_BASE_TO_RADIAL` | Ulnar > base > radial | |
+| `ULNAR_TO_FRONT` | Ulnar > davant | |
+| `ULNAR_TO_PALM` | Ulnar > palmell | |
+| `ULNAR_TO_PALM_TO_RADIAL` | Ulnar > palmell > radial | |
+| `ULNAR_TO_RADIAL` | Ulnar > radial | |
+| `BACK_OR_BASE` | Darrere \| base | |
+| `BACK_OR_FINGER_TIPS` | Darrere \| puntes dels dits | |
+| `BACK_OR_PALM` | Darrere \| palmell | |
+| `BASE_OR_FRONT` | Base \| davant | |
+| `FINGER_TIPS_OR_BASE` | Puntes dels dits \| base | |
+| `FINGER_TIPS_OR_ULNAR` | Puntes dels dits \| ulnar | |
+| `FRONT_OR_PALM` | Davant \| palmell | |
+| `RADIAL_OR_ULNAR` | Radial \| ulnar | |
+
+## OrientationRelatedToLocation (28 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------------- | |
+| `AO_FINGERS_CONTRA` | Dits contra | |
+| `AO_FINGERS_DOWN` | Dits avall | |
+| `AO_FINGERS_UP` | Dits amunt | |
+| `AO_PALM_BACKWARDS` | Palmell cap enrere | |
+| `AO_PALM_DOWN` | Palmell avall | |
+| `AO_PALM_DOWN_TO_UP` | Palmell d'avall a amunt | |
+| `AO_PALM_FORWARDS` | Palmell cap endavant | |
+| `AO_PALM_INWARDS` | Palmell cap endins | |
+| `AO_PALM_OUTWARDS` | Palmell cap enfora | |
+| `AO_PALM_UP` | Palmell amunt | |
+| `AO_PALM_UP_OR_DOWN` | Palmell amunt o avall | |
+| `BACK` | Darrere | |
+| `BACK_TO_PALM` | De darrere a palmell | |
+| `BACK_TO_ULNAR` | De darrere a ulnar | |
+| `BACK_OR_PALM` | Darrere o palmell | |
+| `BACK_OR_PALM_TO_PALM` | De darrere o palmell a palmell | |
+| `BASE` | Base | |
+| `COUNTING` | Comptant | |
+| `FINGER_TIPS` | Puntes dels dits | |
+| `FINGER_TIPS_OR_BASE` | Puntes dels dits o base | |
+| `FINGERSPELLING` | Dactilologia | |
+| `FRONT` | Davant | |
+| `PALM` | Palmell | |
+| `PALM_TO_ULNAR` | De palmell a ulnar | |
+| `RADIAL` | Radial | |
+| `RADIAL_OR_ULNAR` | Radial o ulnar | |
+| `ULNAR` | Ulnar | |
+
+## OrientationChange (17 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------------- | |
+| `EXTENSION` | Extensió | |
+| `EXTENSION_AND_PRONATION` | Extensió + pronació | |
+| `EXTENSION_TO_FLEXION` | Extensió > flexió | |
+| `EXTENSION_OR_FLEXION` | Extensió \| flexió | |
+| `FLEXION` | Flexió | |
+| `FLEXION_TO_EXTENSION` | Flexió > extensió | |
+| `PRONATION` | Pronació | |
+| `PRONATION_OR_SUPINATION` | Pronació \| supinació | |
+| `RADIAL_AND_ULNAR_FLEXION` | Flexió radial + ulnar | |
+| `RADIAL_FLEXION` | Flexió radial | |
+| `ROTATION` | Rotació | |
+| `SUPINATION` | Supinació | |
+| `SUPINATION_TO_PRONATION` | Supinació > pronació | |
+| `ULNAR_FLEXION` | Flexió ulnar | |
+| `PRONATION_TO_FLEXION` | Pronació > flexió | |
+| `SUPINATION_TO_EXTENSION` | Supinació > extensió | |
+
+## ContactType (14 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------------- | |
+| `BRUSH` | Fregament | |
+| `CONTINUOUS` | Continu | |
+| `CONTINUOUS_TO_CONTINUOUS` | Continu > continu | |
+| `CONTINUOUS_TO_FINAL` | Continu > final | |
+| `CONTINUOUS_TO_NONE` | Continu > cap | |
+| `DOUBLE` | Doble | |
+| `FINAL` | Final | |
+| `FINAL_TO_CONTINUOUS` | Final > continu | |
+| `FINAL_TO_NONE` | Final > cap | |
+| `INITIAL` | Inicial | |
+| `NONE_TO_FINAL` | Cap > final | |
+| `NONE_TO_INITIAL` | Cap > inicial | |
+| `INITIAL_TO_FINAL` | Inicial > final | |
+
+## MovementType (9 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------------- | |
+| `ARC` | Arc | |
+| `CIRCLE` | Cercle | |
+| `CROSS` | Creu | |
+| `MOTIVATED_SHAPE` | Forma motivada | |
+| `SPIRAL` | Espiral | |
+| `STRAIGHT` | Recte | |
+| `ZIGZAG` | Ziga-zaga | |
+| `STRAIGHT_TO_CIRCLE` | Recte > cercle | |
+
+## MovementDirection (64 valors)
+
+| SignBank ID | Etiqueta UI (ca) | Notes reunió |
+|-------------|------------------|-------------|
+| `EMPTY` | ------------- | |
+| `BACKWARDS` | Enrere | |
+| `BACKWARDS_AND_CONTRALATERAL` | Enrere i contralateral | |
+| `BACKWARDS_AND_DOWNWARDS` | Enrere i avall | |
+| `BACKWARDS_AND_IPSILATERAL` | Enrere i ipsilateral | |
+| `BACKWARDS_AND_UPWARDS` | Enrere i amunt | |
+| `BACKWARDS_TO_DOWNWARDS` | Enrere a avall | |
+| `BACKWARDS_TO_FORWARDS` | Enrere a endavant | |
+| `BACKWARDS_OR_FORWARDS` | Enrere o endavant | |
+| `CONTRALATERAL` | Contralateral | |
+| `CONTRALATERAL_AND_DOWNWARDS` | Contralateral i avall | |
+| `CONTRALATERAL_AND_FORWARDS` | Contralateral i endavant | |
+| `CONTRALATERAL_AND_UPWARDS` | Contralateral i amunt | |
+| `CONTRALATERAL_TO_FORWARDS` | Contralateral a endavant | |
+| `CONTRALATERAL_TO_IPSILATERAL` | Contralateral a ipsilateral | |
+| `DISTAL` | Distal | |
+| `DOWNWARDS` | Avall | |
+| `DOWNWARDS_AND_CONTRALATERAL_OR_IPSILATERAL` | Avall i contralateral o ipsilateral | |
+| `DOWNWARDS_AND_FORWARDS` | Avall i endavant | |
+| `DOWNWARDS_AND_IPSILATERAL` | Avall i ipsilateral | |
+| `DOWNWARDS_AND_IPSILATERAL_TO_DOWNWARDS` | Avall i ipsilateral a avall | |
+| `DOWNWARDS_AND_TOWARDS` | Avall i cap a | |
+| `DOWNWARDS_TO_CONTRALATERAL` | Avall a contralateral | |
+| `DOWNWARDS_TO_FORWARDS` | Avall a endavant | |
+| `DOWNWARDS_TO_IPSILATERAL` | Avall a ipsilateral | |
+| `DOWNWARDS_TO_UPWARDS` | Avall a amunt | |
+| `DOWNWARDS_OR_UPWARDS` | Avall o amunt | |
+| `DOWNWARDS_OR_UPWARDS_AND_IPSILATERAL` | Avall o amunt i ipsilateral | |
+| `FORWARDS` | Endavant | |
+| `FORWARDS_AND_IPSILATERAL` | Endavant i ipsilateral | |
+| `FORWARDS_AND_UPWARDS` | Endavant i amunt | |
+| `FORWARDS_TO_BACKWARDS` | Endavant a enrere | |
+| `FORWARDS_TO_CONTRALATERAL` | Endavant a contralateral | |
+| `FORWARDS_TO_DOWNWARDS` | Endavant a avall | |
+| `FORWARDS_TO_IPSILATERAL` | Endavant a ipsilateral | |
+| `FORWARDS_TO_IPSILATERAL_TO_FORWARDS` | Endavant a ipsilateral a endavant | |
+| `FORWARDS_TO_UPWARDS` | Endavant a amunt | |
+| `FROM_LOCATION` | Des de la ubicació | |
+| `IPSILATERAL` | Ipsilateral | |
+| `IPSILATERAL_AND_UP_AND_DOWN` | Ipsilateral i amunt i avall | |
+| `IPSILATERAL_AND_UPWARDS` | Ipsilateral i amunt | |
+| `IPSILATERAL_TO_CONTRALATERAL` | Ipsilateral a contralateral | |
+| `IPSILATERAL_TO_DOWNWARDS` | Ipsilateral a avall | |
+| `IPSILATERAL_TO_DOWNWARDS_TO_CONTRALATERAL` | Ipsilateral a avall a contralateral | |
+| `IPSILATERAL_TO_UPWARDS` | Ipsilateral a amunt | |
+| `IPSILATERAL_AND_CONTRALATERAL` | Ipsilateral i contralateral | |
+| `IPSILATERAL_OR_CONTRALATERAL` | Ipsilateral o contralateral | |
+| `LATERAL` | Lateral | |
+| `PROXIMAL` | Proximal | |
+| `TO_AND_FRO` | Anada i tornada | |
+| `TOWARDS_LOCATION` | Cap a la ubicació | |
+| `UP_AND_DOWN` | Amunt i avall | |
+| `UPWARDS` | Amunt | |
+| `UPWARDS_TO_DOWNWARDS` | Amunt a avall | |
+| `UPWARDS_TO_FORWARDS_TO_DOWNWARDS` | Amunt a endavant a avall | |
+| `UPWARDS_TO_IPSILATERAL` | Amunt a ipsilateral | |
+| `VARIABLE` | Variable | |
+| `FORWARDS_AND_DOWNWARDS` | Endavant i avall | |
+| `CONTRALATERAL_TO_DOWNWARDS` | Contralateral a avall | |
+| `DOWNWARDS_TO_CONTRALATERAL_TO_IPSILATERAL` | Avall a contralateral a ipsilateral | |
+| `UPWARDS_AND_FORWARDS` | Amunt i endavant | |
+| `IPSILATERAL_TO_FORWARDS` | Ipsilateral a endavant | |
+| `IPSILATERAL_TO_BACKWARDS_TO_CONTRALATERAL` | Ipsilateral a enrere a contralateral | |
+| `IPSILATERAL_AND_DOWNWARDS` | Ipsilateral i avall | |
+
diff --git a/docs/fitxas-import-meeting-agenda.md b/docs/fitxas-import-meeting-agenda.md
new file mode 100644
index 0000000..c2c1ae5
--- /dev/null
+++ b/docs/fitxas-import-meeting-agenda.md
@@ -0,0 +1,281 @@
+# SignBank — Ordre del dia: reunió importació de fitxes
+
+Document per conduir la reunió amb l'equip del diccionari / autors de fitxes LSC.
+
+**Data reunió:** _______________  
+**Assistents:** _______________  
+**Fitxers de mostra:** [`Examples/`](../Examples/) (`MENJAR`, `CERVESA`, `BESSONS-1d`)  
+**Pla general:** [`fitxas-import-plan.md`](fitxas-import-plan.md)  
+**Referència ENUMs:** [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md)
+
+---
+
+## Resum (1 min)
+
+Importem les fitxes Word (JSON) a SignBank. Part del contingut ja encaixa; altres camps cal aclarir-los. La fonologia i les categories tancades requereixen acord sobre **mapatge** o **canvi de vocabulari**.
+
+---
+
+## 1. Decisions ja preses per SignBank (v1)
+
+Confirmar amb l'equip que té sentit:
+
+| Camp JSON | Què farem | Exemple |
+|-----------|-----------|---------|
+| `morfologia_sequencial` | Mostrar morfemes ordenats del signe compost | `BESSONS-1d` → GERMÀ + SEGON |
+| `is_compound` | Indicador visual: signe simple vs compost | `true` / `false` |
+| `compound_signs` | Llista de parts del compost | `["GERMÀ", "SEGON"]` |
+
+**Pregunta de validació:** Enllaçar cada morfema amb la seva fitxa al diccionari quan existeixi — us encaixa?
+
+**Notes reunió:**
+
+- [ ] D'acord amb morfologia seqüencial + indicador compost
+- [ ] Enllaços entre morfemes i fitxes: sí / no / més endavant
+
+---
+
+## 2. Camps pendents de clarificació
+
+### 2.1 `alt_glosses` vs `corpus_forms` vs `relacio_signes_forasters`
+
+**Context de mostra (`MENJAR`):**
+
+| Camp | Valors d'exemple |
+|------|------------------|
+| `alt_glosses` | ALIMENTACIÓ, ÀPAT, CONSUM, VIANDA… |
+| `corpus_forms` | MENJAR-rep, MENJAR-S'HO, MENJAR-lfp |
+| `relacio_signes_forasters` | `prestec`, `llengua_relacionada`, `glossa_llengua_relacionada` (sovint buit) |
+
+**Preguntes:**
+
+- [ ] Què són exactament `alt_glosses`? Variants de la mateixa entrada, sinònims, o entrades que haurien de ser fitxes separades?
+- [ ] Què són `corpus_forms`? Formes attestades en materials (repetició, pronoms, etc.)?
+- [ ] En què es diferencien `alt_glosses` i `corpus_forms` en la pràctica editorial?
+- [ ] Quan s'omple `relacio_signes_forasters`? Com es relaciona amb SINÒNIM / VARIANT / signes relacionats normals?
+
+**Decisió reunió:** Importar a SignBank? ☐ Sí ☐ No ☐ Més endavant
+
+**Notes:**
+
+---
+
+### 2.2 `camp_semantic` vs `categories`
+
+**Context de mostra:**
+
+| Fitxa | `camp_semantic` | `categories` |
+|-------|-----------------|--------------|
+| MENJAR | Acte físic | `["Acte físic"]` |
+| CERVESA | Aliment | `["Aliment"]` |
+
+**Preguntes:**
+
+- [ ] Són el mateix concepte duplicat o tenen funcions diferents (camp principal vs etiquetes múltiples)?
+- [ ] Un signe pot tenir diverses `categories` diferents del `camp_semantic`?
+- [ ] L'usuari del diccionari ha de poder filtrar o veure aquests camps?
+
+**Decisió reunió:** ☐ Importar ☐ No importar ☐ Només un dels dos (quín? _______)
+
+**Notes:**
+
+---
+
+### 2.3 `occ_general`, `occ_learning`, `occ_specific`
+
+**Context de mostra:**
+
+| Camp | Exemples |
+|------|----------|
+| `occ_general` | DILSCAT, MIRA QUÈ DIC, VOCABULARI BÀSIC, MARTÍN & ALVARADO |
+| `occ_learning` | A1, A2, APRENEM 1, APRENEM 2 |
+| `occ_specific` | ALIMENTS, MEDICINES, ÀREES MEDI SOCIAL |
+
+**Preguntes:**
+
+- [ ] Indiquen en quins materials o contextos apareix el signe?
+- [ ] Cal mostrar-ho al diccionari públic o és metadada interna de gestió del corpus?
+- [ ] Hi ha una llista tancada de valors possibles o poden aparèixer nous lliurement?
+- [ ] Quina diferència funcional hi ha entre general / learning / specific?
+
+**Decisió reunió:** ☐ Mostrar a usuaris ☐ Només admin ☐ No importar
+
+**Notes:**
+
+---
+
+### 2.4 Altres camps (baixa prioritat per ara)
+
+Confirmar si cal incloure'ls o podem ajornar-los:
+
+| Camp | Pregunta ràpida | Decisió |
+|------|-----------------|---------|
+| `iconicity` | És útil per a l'usuari final? | ☐ Sí ☐ No |
+| `valencia` | Només per verbs? Mostrar sempre? | ☐ Sí ☐ No |
+| `signes_claus` | Què són els grups de glosses + comentari? | ☐ Sí ☐ No |
+| `morfologia_simultania` | Cal mostrar-la com la seqüencial? | ☐ Sí ☐ No |
+| `morfologia_abreujada` | Cal mostrar-la? | ☐ Sí ☐ No |
+| `entitat_amb_nom` | Quan s'usa? | ☐ Sí ☐ No |
+
+**Notes:**
+
+---
+
+## 3. Parsing i vocabulari tancat (ENUMs)
+
+### 3.1 El problema
+
+SignBank no guarda text lliure per a la fonologia: cada camp de `phonology` del JSON s'ha de convertir en un **valor d'una llista tancada** (ENUM) a la base de dades. Si el text de la fitxa no coincideix amb els nostres valors, cal:
+
+1. **Taula de mapatge** (fitxa → SignBank), mantenint els ENUMs actuals, o  
+2. **Ampliar / canviar** els ENUMs de SignBank per reflectir el vocabulari de les fitxes, o  
+3. **Canviar l'export** del scraper perquè surti directament amb els IDs de SignBank.
+
+### 3.2 Correspondència camps JSON → SignBank
+
+| Camp JSON (`phonology`) | Camp SignBank (`VideoData`) | ENUM |
+|-------------------------|----------------------------|------|
+| `nombre_mans` | `hands` | `Hand` |
+| `configuracio` | `configuration` | `HandConfiguration` |
+| `configuracio_ma_dominant` | *(no hi ha camp separat avui)* | — |
+| `configuracio_ma_no_dominant` | *(no hi ha camp separat avui)* | — |
+| `canvi_configuracio` | `configurationChanges` | `ConfigurationChange` |
+| `relacio_articuladors` | `relationBetweenArticulators` | `RelationBetweenArticulators` |
+| `relacio_articuladors_ma_dominant` | *(no separat)* | — |
+| `relacio_articuladors_ma_no_dominant` | *(no separat)* | — |
+| `localitzacio` | `location` | `Location` |
+| `orientacio_moviment` | `movementRelatedOrientation` | `MovementRelatedOrientation` |
+| `orientacio_localitzacio` | `orientationRelatedToLocation` | `OrientationRelatedToLocation` |
+| `canvi_orientacio` | `orientationChange` | `OrientationChange` |
+| `tipus_contacte` | `contactType` | `ContactType` |
+| `forma_moviment` | `movementType` | `MovementType` |
+| `direccio_moviment` | `movementDirection` | `MovementDirection` |
+| `moviment_repetit` | `repeatedMovement` | booleà (`Sí` / `No`) |
+| `vocalitzacio` | `vocalization` | text lliure |
+| `component_no_manual` | `nonManualComponent` | text lliure |
+
+**Pregunta crítica:** Per a signes amb dues mans, les fitxes tenen valors separats per mà dominant i no dominant. SignBank avui només té **un** valor per configuració i relació entre articuladors. Cal:
+
+- [ ] Modelar mà dominant / no dominant per separat (canvi d'esquema)
+- [ ] Només guardar el valor combinat (`"B (B) /O_SSI (O)"`)
+- [ ] Altres: _______________
+
+### 3.3 Valors de mostra al JSON vs SignBank
+
+Valors reals de les 3 fitxes de mostra — discutir mapatge fila a fila:
+
+| Fitxa | Camp JSON | Valor a la fitxa | Mapa a SignBank? |
+|-------|-----------|------------------|------------------|
+| MENJAR | `nombre_mans` | `1` | → `Hand` ? |
+| MENJAR | `configuracio` | `Q (Beak)` | → `CONF_33` (Q) ? |
+| MENJAR | `localitzacio` | `Boca` | → `MOUTH` ? |
+| MENJAR | `canvi_orientacio` | `Extensió > Flexió` | → `EXTENSION_TO_FLEXION` ? |
+| MENJAR | `orientacio_moviment` | `Punta dels dits (finger tips)` | ⚠ `vocab_warnings` — no clar |
+| CERVESA | `nombre_mans` | `2a` | → `BOTH` ? |
+| CERVESA | `configuracio` | `B (B) /O_SSI (O)` | ⚠ combinat + per mà |
+| CERVESA | `relacio_articuladors` | `Damunt / Sota` | → `ABOVE_BELOW` ? |
+| CERVESA | `localitzacio` | `Mà no-dominant` | → `WEAK_HAND` ? |
+| CERVESA | `orientacio_localitzacio` | `AO: palm-down` | → `AO_PALM_DOWN` ? |
+| CERVESA | `direccio_moviment` | `Cap a la localització` | → `TOWARDS_LOCATION` ? |
+| BESSONS | `nombre_mans` | `2n COMP: 1` | ⚠ compost — com es modela? |
+| BESSONS | `localitzacio` | `2n COMP: Espai neutre` | → `NEUTRAL_SPACE` al morfema 2? |
+| BESSONS | `phonology_parts` | per morfema `2` | ⚠ v2 — cal per part? |
+
+**Notes reunió (mapatge fonologia):**
+
+---
+
+### 3.4 Altres ENUMs (no fonologia)
+
+| Àmbit | Camp JSON | ENUM SignBank | Pregunta |
+|-------|-----------|---------------|----------|
+| Traduccions | `tr_ca`, `tr_es`, `tr_en` | `Language` | OK — 4 idiomes fixos |
+| Categoria | `lexical_category` | `LexicalCategory` | El text `"Nom o verb"` coincideix amb `NOUN_OR_VERB`? Llista completa a la referència |
+| Relacions | `related_signs.*` | `RelationType` | `VEURE TAMBÉ` → `ASSOCIATED_CONCEPT`? Keys en català al JSON |
+| Definicions | prefix `Verb-`, `Nom-`, `Adj-` | `LexicalCategory` | Mateix vocabulari que `lexical_category`? |
+
+**Relacions JSON → SignBank:**
+
+| Clau JSON | ENUM SignBank |
+|-----------|---------------|
+| `SINÒNIM` | `SYNONYM` |
+| `ANTÒNIM` | `ANTONYM` |
+| `HOMÒNIM` | `HOMONYM` |
+| `VARIANT` | `VARIANT` |
+| `HIPERÒNIM` | `HYPERNYM` |
+| `HIPÒNIM` | `HYPONYM` |
+| `VEURE TAMBÉ` | `ASSOCIATED_CONCEPT` |
+
+- [ ] Aquestes claus són estables a totes les fitxes?
+- [ ] Falta algun tipus de relació que useu i SignBank no té?
+
+---
+
+## 4. Llista completa d'ENUMs de SignBank
+
+**Obrir durant la reunió:** [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md)
+
+Conté **tots** els valors permesos avui a SignBank, amb etiqueta en català de la UI:
+
+| ENUM | Nº valors | Relacionat amb JSON |
+|------|-----------|---------------------|
+| `Language` | 4 | `tr_*` |
+| `LexicalCategory` | 27 | `lexical_category`, prefix de definicions |
+| `RelationType` | 8 | `related_signs` |
+| `Hand` | 3 | `nombre_mans` |
+| `HandConfiguration` | 52 | `configuracio`, `configuracio_ma_*` |
+| `ConfigurationChange` | 20 | `canvi_configuracio` |
+| `RelationBetweenArticulators` | 12 | `relacio_articuladors`, `relacio_articuladors_ma_*` |
+| `Location` | 144 | `localitzacio` |
+| `MovementRelatedOrientation` | 49 | `orientacio_moviment` |
+| `OrientationRelatedToLocation` | 28 | `orientacio_localitzacio` |
+| `OrientationChange` | 17 | `canvi_orientacio` |
+| `ContactType` | 14 | `tipus_contacte` |
+| `MovementType` | 9 | `forma_moviment` |
+| `MovementDirection` | 64 | `direccio_moviment` |
+
+**Pregunta general per a cada ENUM:**
+
+> Els valors de les vostres fitxes són els mateixos que les etiquetes de la columna «Etiqueta UI (ca)», o cal una taula de correspondència? Si en falten, els afegim a SignBank o simplifiqueu l'export?
+
+**Acció acordada:**
+
+- [ ] Mantenim ENUMs SignBank + taula de mapatge (qui la fa? _______)
+- [ ] Modifiquem l'export JSON per usar IDs SignBank directament
+- [ ] Ampliem ENUMs SignBank (quins? _______)
+
+---
+
+## 5. Altres temes operatius
+
+| Tema | Pregunta | Decisió |
+|------|----------|---------|
+| Vídeos | `video_url` és Google Drive — tindreu fitxers `.mp4` locals per importar? | |
+| Publicació | Import directe al diccionari públic o revisió prèvia per entrada? | |
+| ID fitxa | Guardar `id` (p. ex. `0764_01_cervesa`) per traçabilitat? | ☐ Sí ☐ No |
+| Qualitat | Què fem amb `vocab_warnings` i valors dubtosos (`????` als parells mínims)? | |
+
+**Notes:**
+
+---
+
+## 6. Accions després de la reunió
+
+| Acció | Responsable | Data |
+|-------|-------------|------|
+| Actualitzar `fitxas-import-plan.md` amb decisions | | |
+| Taula de mapatge fonologia (si s'acorda) | | |
+| Llista de camps a importar v1 | | |
+| Esquema DB (compostos + `externalId`) | | |
+
+---
+
+## Annex — camps JSON no importats a v1 (referència ràpida)
+
+| Camp | Estat |
+|------|-------|
+| `morfologia_sequencial`, `is_compound`, `compound_signs` | **v1 confirmat** |
+| `definition` (text fusionat) | No cal — redundant |
+| `vocab_warnings` | Només log d'importació |
+| `phonology_parts` | v2 (fonologia per morfema) |
+| Resta de secció 2 | Pendent decisió reunió |
diff --git a/docs/fitxas-import-plan.md b/docs/fitxas-import-plan.md
new file mode 100644
index 0000000..f56222b
--- /dev/null
+++ b/docs/fitxas-import-plan.md
@@ -0,0 +1,497 @@
+# SignBank — Fitxas (scraped data) import plan
+
+Plan for integrating dictionary cards scraped from legacy FITXES (Word documents) into SignBank. Sample data lives in [`Examples/`](../Examples/).
+
+**Last updated:** 2026-06-17  
+**Status:** Planning — no import pipeline implemented yet  
+**Sample files:** `0001_menjar.json`, `0764_01_cervesa.json`, `1420_02_bessons-1d.json`
+
+---
+
+## Scope decisions (product)
+
+Fields from the scraped JSON classified by priority for SignBank v1.
+
+### Confirmed for v1 — schema + UI required
+
+| JSON field | Why it matters | Example |
+|------------|----------------|---------|
+| **`morfologia_sequencial`** | Explains how compound signs are built from ordered morphemes. Essential for understanding composed signs. | `BESSONS-1d` → `compost_1: "GERMÀ"`, `compost_2: "SEGON"` (“two brothers” = twins) |
+| **`is_compound`** | Boolean flag to distinguish simple signs from compounds in search and gloss detail. | `true` for `BESSONS-1d`, `false` for `MENJAR` |
+| **`compound_signs`** | Ordered list of gloss morphemes; pairs with sequential morphology for display. | `["GERMÀ", "SEGON"]` |
+
+**Proposed schema (Phase 1):**
+
+```prisma
+model GlossData {
+  // ... existing fields
+  isCompound              Boolean  @default(false)
+  sequentialMorphology    SequentialMorphology?
+  compoundParts           CompoundPart[]   // ordered; gloss refs + optional phonology later
+}
+
+model SequentialMorphology {
+  id          String    @id @default(uuid())
+  glossDataId String    @unique
+  glossData   GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+  part1       String?   // maps morfologia_sequencial.compost_1
+  part2       String?   // maps morfologia_sequencial.compost_2
+  part3       String?   // maps morfologia_sequencial.compost_3
+}
+
+model CompoundPart {
+  id          String    @id @default(uuid())
+  glossDataId String
+  glossData   GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+  position    Int       // 1, 2, 3 …
+  gloss       String    // morpheme gloss label; resolve to GlossData id when linked entry exists
+  priority    Int       @default(0)
+}
+```
+
+**UI:** Gloss detail should show a “Signe compost” section when `isCompound` is true: morpheme chain (e.g. GERMÀ + SEGON → BESSONS) with links to constituent glosses where they exist in the dictionary.
+
+`phonology_parts` remains **deferred** (v2) unless per-morpheme phonology is confirmed as needed.
+
+### Maps to existing schema — import without new tables
+
+Core fitxa content already supported: `name`, translations, `definitions[]`, phonology (with mapping), `minimal_pairs`, `related_signs`, `notes`, `video_url`, plus traceability fields `id` / `docx_path` via `externalId` / `sourceDocPath`.
+
+### Deferred — need domain clarification
+
+Not planned for v1 until the dictionary team confirms meaning and user value:
+
+| JSON field | Open question |
+|------------|---------------|
+| `alt_glosses` | How do these differ from synonyms (`related_signs.SINÒNIM`) or separate dictionary entries? |
+| `corpus_forms` | Surface variants in corpus (`MENJAR-rep`) vs alt glosses vs dictionary entry name? |
+| `relacio_signes_forasters` | When is a foreign/borrowed sign relation used vs a normal related sign? |
+| `camp_semantic` vs `categories` | Are these the same taxonomy or different levels? |
+| `occ_general`, `occ_learning`, `occ_specific` | Should end users see corpus sources, or is this internal cataloguing only? |
+| `morfologia_simultania`, `morfologia_abreujada` | Useful for display, or editor-only metadata? |
+| `iconicity`, `valencia`, `entitat_amb_nom`, `signes_claus` | Confirm display priority |
+
+See meeting agenda: [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md).
+
+### Explicitly out of scope for v1
+
+| JSON field | Reason |
+|------------|--------|
+| `definition` (merged) | Redundant with `definitions[]` |
+| `vocab_warnings` | Import-time log only, not persisted |
+| `phonology_parts` | Deferred until compound phonology UX is defined |
+
+---
+
+## Goals
+
+| Goal | Success criteria |
+|------|------------------|
+| Bulk ingest scraped JSON | Script imports all fitxas without manual DB edits |
+| Preserve traceability | Each imported gloss maps back to source `id` and `docx_path` |
+| Safe first run | Dry-run mode reports gaps before writing to DB |
+| Searchable published entries | Imported glosses appear in Typesense after sync |
+| Data quality visibility | Warnings logged for unmapped phonology, missing relation targets, etc. |
+
+---
+
+## Current state
+
+### Scraped format (`Examples/*.json`)
+
+Each file is a rich dictionary “fitxa” with roughly 30 fields:
+
+| Field group | Example fields |
+|-------------|----------------|
+| Identity | `id`, `name`, `docx_path` |
+| Translations | `tr_en`, `tr_es`, `tr_ca`, `alt_glosses` |
+| Definitions | `definitions[]`, `definition`, `lexical_category` |
+| Phonology | `phonology` (Catalan labels), `phonology_parts` (compounds), `vocab_warnings` |
+| Morphology | `morfologia_sequencial`, `morfologia_simultania`, `morfologia_abreujada` |
+| Relations | `minimal_pairs`, `related_signs`, `relacio_signes_forasters` |
+| Semantics | `iconicity`, `entitat_amb_nom`, `camp_semantic`, `valencia`, `categories`, `signes_claus` |
+| Corpus | `corpus_forms`, `occ_general`, `occ_learning`, `occ_specific` |
+| Media | `video_url` (Google Drive) |
+| Compounds | `is_compound`, `compound_signs` |
+| Meta | `notes`, `vocab_warnings` |
+
+### SignBank model (what exists today)
+
+Core schema: `backend/prisma/schema.prisma`. Entity graph:
+
+```
+GlossData
+├── GlossTranslation[]
+├── Definition[] (+ DefinitionTranslation[])
+├── Example[] (+ ExampleTranslation[])
+├── SignVideo[]
+│   ├── VideoData (phonology enums)
+│   └── Video[] (url, angle)
+├── RelatedGloss[] (source/target)
+├── MinimalPair[] (source/target)
+└── DictionaryEntry? (published)
+```
+
+- **Draft workflow:** `GlossRequest` + `GlossData` → admin accept → `DictionaryEntry`
+- **Seed data:** `backend/prisma/seed.ts` — hand-written demo glosses only
+- **No import path:** `Examples/` is reference JSON on disk; `backend/src/examples/` is the *usage examples* CRUD module (unrelated)
+
+---
+
+## Field mapping
+
+### Maps directly (or with light transformation)
+
+| Scraped field | SignBank target | Notes |
+|---------------|-----------------|-------|
+| `name` | `GlossData.gloss` | Primary gloss identifier |
+| `tr_en` | `GlossTranslation` (`ENGLISH`) | May contain `;`-separated values |
+| `tr_es` | `GlossTranslation` (`SPANISH`) | Same |
+| `tr_ca` | `GlossTranslation` (`CATALAN`) | Often empty in samples |
+| `definitions[]` | `Definition[]` | One row per array entry; parse `Verb-` / `Nom-` prefix |
+| `lexical_category` | `Definition.lexicalCategory` | Map Catalan → `LexicalCategory` enum |
+| `phonology` | `VideoData` on `SignVideo` | Requires enum mapping layer (see below) |
+| `minimal_pairs[]` | `MinimalPair` | `sign` → target gloss lookup; `description` → `distinction` |
+| `related_signs.*` | `RelatedGloss` | Map relation type keys → `RelationType` enum |
+| `notes` | `GlossData.editComment` | Reasonable fit for editorial notes |
+| `video_url` | `Video.url` | After download from Drive + upload to Dufs |
+
+### Relation type mapping
+
+| Scraped key | `RelationType` |
+|-------------|----------------|
+| `SINÒNIM` | `SYNONYM` |
+| `ANTÒNIM` | `ANTONYM` |
+| `HOMÒNIM` | `HOMONYM` |
+| `VARIANT` | `VARIANT` |
+| `HIPERÒNIM` | `HYPERNYM` |
+| `HIPÒNIM` | `HYPONYM` |
+| `VEURE TAMBÉ` | `ASSOCIATED_CONCEPT` |
+
+### Lexical category mapping (examples)
+
+| Scraped (Catalan) | `LexicalCategory` |
+|-------------------|-------------------|
+| `Nom` | `NOUN` |
+| `Verb` | `VERB` |
+| `Adjectiu` | `ADJECTIVE` |
+| `Nom o verb` | `NOUN_OR_VERB` |
+
+Full mapping table to be built during implementation by scanning all scraped files for unique values.
+
+### No schema home yet
+
+| Scraped field | Priority | Suggested approach |
+|---------------|----------|-------------------|
+| `morfologia_sequencial` | **v1** | `SequentialMorphology` + `CompoundPart[]` (see [Scope decisions](#scope-decisions-product)) |
+| `is_compound`, `compound_signs` | **v1** | `GlossData.isCompound` + `CompoundPart[]` |
+| `id` | v1 (import) | `GlossData.externalId` (unique) |
+| `docx_path` | v1 (import) | `GlossData.sourceDocPath` |
+| `alt_glosses` | deferred | TBD after domain clarification |
+| `corpus_forms` | deferred | TBD |
+| `morfologia_simultania`, `morfologia_abreujada` | deferred | TBD |
+| `iconicity`, `camp_semantic`, `valencia` | deferred | TBD |
+| `signes_claus` | deferred | TBD |
+| `relacio_signes_forasters` | deferred | TBD |
+| `categories` | deferred | TBD |
+| `occ_general`, `occ_learning`, `occ_specific` | deferred | TBD |
+| `phonology_parts` | v2 | Per-morpheme phonology when compound UX is defined |
+| `vocab_warnings` | n/a | Import log only (not persisted) |
+
+---
+
+## Hard problems
+
+### 1. Phonology mapping (largest effort)
+
+Scraped phonology uses **Catalan human labels**. SignBank stores **strict Prisma enums** (`Hand`, `HandConfiguration`, `Location`, etc.).
+
+**Scraped examples:**
+
+```json
+"nombre_mans": "2a",
+"configuracio": "B (B) /O_SSI (O)",
+"localitzacio": "Mà no-dominant",
+"orientacio_moviment": "Punta dels dits (finger tips)",
+"moviment_repetit": "Sí"
+```
+
+**SignBank enums (examples):**
+
+- `Hand`: `RIGHT`, `LEFT`, `BOTH`
+- `HandConfiguration`: `CONF_1` … `CONF_40`, Unicode variants
+- `Location`: `MOUTH`, `NEUTRAL_SPACE`, `WEAK_HAND`, …
+
+**Required:**
+
+- Per-field lookup tables (scraped label → enum value)
+- Fallback to `EMPTY` when unknown
+- Warning report per gloss (scraper already emits `vocab_warnings` — reuse pattern)
+- Iterative expansion as new vocabulary appears in full dataset
+
+**Compound signs** (`1420_02_bessons-1d.json`):
+
+- Values prefixed with `2n COMP:` in top-level `phonology`
+- Per-morpheme values in `phonology_parts` keyed by morpheme index
+- Current model: **one `VideoData` per `SignVideo`**, not per compound part
+
+Options:
+
+1. One `SignVideo` with combined phonology (loses per-part detail)
+2. Multiple `SignVideo` rows (one per morpheme) with titles from `compound_signs`
+3. New `CompoundPhonologyPart` model linked to `SignVideo`
+
+### 2. Videos
+
+Scraped `video_url` points to **Google Drive**, not Dufs paths like `gloss-videos/foo.mp4`.
+
+Import pipeline:
+
+1. Download from Drive (or accept pre-exported local `.mp4` files)
+2. Upload via `VideosService` → Dufs (`gloss-videos/`)
+3. Store relative path in `Video.url`
+
+Until videos are processed, entries can import with placeholder or empty video (blocks gloss-request validation but not direct admin publish).
+
+### 3. Relations (two-pass import)
+
+`minimal_pairs` and `related_signs` reference gloss **strings** (e.g. `"EMPASSAR-SE"`, `"ALIMENTACIÓ"`). Targets may not exist during pass 1.
+
+**Strategy:**
+
+1. **Pass 1:** Create all `GlossData`, definitions, translations, videos
+2. **Pass 2:** Resolve `RelatedGloss` and `MinimalPair` by gloss name; log unresolved references
+
+Edge cases:
+
+- Target gloss not in import batch → warning + skip or deferred queue
+- Ambiguous gloss names (homonyms) → may need `externalId` or disambiguation rules
+
+### 4. Definition parsing
+
+`MENJAR` has multiple senses in `definitions[]`:
+
+```
+"Verb- Dur un aliment sòlid a la boca..."
+"Nom- Producte natural o elaborat..."
+```
+
+Each array entry → one `Definition` row. Parse prefix for `lexicalCategory` and optional `title`.
+
+### 5. Publication workflow
+
+| Option | Pros | Cons |
+|--------|------|------|
+| **A. Direct publish** | Fast; entries immediately searchable | No review; bad data goes live |
+| **B. Import as drafts** | `GlossRequest` in `NOT_COMPLETED`; admin reviews | Slower; manual accept per entry |
+| **C. Hybrid** | Publish clean rows; flag warnings for review | More complex logic |
+
+**Recommendation:** Start with **B or C** given data quality signals in samples (`???? (potser són iguals)`, `vocab_warnings`, incomplete phonology nulls).
+
+Submit validation (`backend/src/utils/gloss-validation.ts`) requires complete phonology and at least one video — imported drafts may fail submit until phonology/video gaps are fixed.
+
+---
+
+## Architecture
+
+```mermaid
+flowchart TD
+    A[Scraped JSON directory] --> B[import-fitxas script]
+    B --> C[Core field mapper]
+    B --> D[Phonology mapper + warnings]
+    B --> E[Video downloader optional]
+    C --> F[(PostgreSQL via Prisma)]
+    D --> F
+    E --> F
+    F --> G[Pass 2: relations resolver]
+    G --> H[Typesense sync]
+    F --> I[Gloss detail UI]
+```
+
+**Proposed script location:** `backend/scripts/import-fitxas.ts`
+
+**CLI flags (proposed):**
+
+| Flag | Purpose |
+|------|---------|
+| `--dir <path>` | Directory of JSON files (default: `Examples/`) |
+| `--dry-run` | Validate and print report; no DB writes |
+| `--limit N` | Process first N files (testing) |
+| `--with-videos` | Download Drive URLs and upload to Dufs |
+| `--publish` | Create `DictionaryEntry` as `PUBLISHED` |
+| `--draft` | Create `GlossRequest` as `NOT_COMPLETED` (default) |
+| `--upsert` | Update existing rows matched by `externalId` |
+
+---
+
+## Phased implementation
+
+### Phase 1 — Schema & scope (1–2 days)
+
+**Decided:**
+
+- v1 adds **compound signs**: `isCompound`, `morfologia_sequencial`, `compound_signs` (see [Scope decisions](#scope-decisions-product))
+- Core fitxa fields import into existing models
+
+**Still to decide:**
+
+1. Publication model: direct vs review queue
+2. Per-morpheme phonology (`phonology_parts`) — v2 unless requested
+
+**Schema changes (v1 minimum):**
+
+```prisma
+model GlossData {
+  // ... existing fields
+  externalId    String?  @unique  // maps scraped "id"
+  sourceDocPath String?           // maps scraped "docx_path"
+  isCompound    Boolean  @default(false)
+  sequentialMorphology SequentialMorphology?
+  compoundParts CompoundPart[]
+}
+```
+
+**Other tasks:**
+
+- Align frontend `RelationType` in `frontend/src/types/models.ts` with backend (add `HOMONYM`, `VARIANT`)
+- Gloss detail UI: compound morpheme chain when `isCompound`
+
+### Phase 2 — Import script (core)
+
+**Deliverables:**
+
+- TypeScript interface for scraped JSON shape
+- `readFitxasDir()` — load and validate JSON files
+- Mappers:
+  - `mapDefinitions()`
+  - `mapGlossTranslations()`
+  - `mapLexicalCategory()`
+  - `mapPhonology()` with `EMPTY` fallback
+  - `mapRelationType()`
+- `importFitxa()` — Prisma create with nested writes
+- `--dry-run` output: per-file summary + warnings
+- Idempotent upsert by `externalId`
+
+**Output example (dry-run):**
+
+```
+0001_menjar.json
+  gloss: MENJAR
+  definitions: 2
+  translations: en, es
+  phonology warnings: 1 (orientacio_moviment: "Punta dels dits (finger tips)")
+  relations deferred: 1 (ALIMENTACIÓ)
+  video: skipped (no --with-videos)
+```
+
+### Phase 3 — Videos & relations
+
+- Google Drive download helper (or document manual pre-export workflow)
+- Upload integration with `VideosService` / Dufs
+- Pass 2: `RelatedGloss` + `MinimalPair` resolution by gloss name
+- Unresolved relations report (`import-warnings.json`)
+
+### Phase 4 — UI for extended fields
+
+**v1 (confirmed):**
+
+- Compound sign badge and morpheme chain (`isCompound` + `compound_signs` / `morfologia_sequencial`)
+
+**Later (after domain clarification):**
+
+- Corpus forms, occurrences, semantic metadata, simultaneous/abbreviated morphology
+
+### Phase 5 — Production run
+
+1. Dry-run on full scraped dataset → review warning report
+2. Fix phonology mapper gaps (iterate on `vocab_warnings` patterns)
+3. Full import on staging environment
+4. Spot-check ~20 entries:
+   - Simple sign (`CERVESA`)
+   - Multi-sense (`MENJAR`)
+   - Compound (`BESSONS-1d`)
+   - Relations and minimal pairs
+5. `typesense sync` (or restart backend sync job)
+6. Production import with backup first
+
+---
+
+## Sample file reference
+
+### `0001_menjar.json` — multi-sense, relations, morphology
+
+- 2 definitions (Verb + Nom)
+- `alt_glosses`: 8 variants
+- `morfologia_simultania`: classificador descriptiu
+- `related_signs.VEURE TAMBÉ`: `["ALIMENTACIÓ"]`
+- `minimal_pairs`: `EMPASSAR-SE`
+- `signes_claus`: 2 groups with gloss lists
+- Phonology: single hand (`nombre_mans: "1"`), `vocab_warnings` on orientation
+
+### `0764_01_cervesa.json` — two-hand phonology
+
+- Single definition (Nom)
+- Two-hand config: `B (B) /O_SSI (O)`
+- `vocab_warnings` on non-dominant configuration
+- 2 minimal pairs (one with uncertain distinction)
+
+### `1420_02_bessons-1d.json` — compound sign
+
+- `is_compound: true`
+- `compound_signs`: `["GERMÀ", "SEGON"]`
+- `morfologia_sequencial`: maps to compound parts
+- `phonology_parts`: per-morpheme phonology for index `2`
+- `related_signs.VARIANT`: `["BESSONS-T_antiga"]`
+
+---
+
+## Open decisions (resolve before coding)
+
+| # | Question | Status | Options |
+|---|----------|--------|---------|
+| 1 | Compound morphology in v1 | **Decided** | `isCompound` + sequential morphemes + UI |
+| 2 | Publication | Open | Direct publish / Draft review / Hybrid |
+| 3 | Per-morpheme phonology | Deferred v2 | `phonology_parts` model |
+| 4 | Video source | Open | Drive download in script / Pre-exported local files |
+| 5 | `alt_glosses`, `corpus_forms`, `occ_*`, semantics | **Awaiting domain input** | See [meeting agenda](fitxas-import-meeting-agenda.md) |
+| 6 | `morfologia_simultania` / `abreujada` | Open | v1 or later |
+
+---
+
+## Meeting materials
+
+| Document | Purpose |
+|----------|---------|
+| [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md) | Ordre del dia, preguntes i checklist per a la reunió |
+| [`fitxas-enum-mappings.md`](fitxas-enum-mappings.md) | XLSX → JSON mapping workflow |
+
+Regenerar la referència d'ENUMs: `node backend/scripts/generate-enum-reference.js`
+
+---
+
+## Next step
+
+Build **Phase 2 dry-run importer** against the 3 files in `Examples/`:
+
+- Maps everything that fits the current schema
+- Prints warnings for phonology, missing relation targets, and unmapped fields
+- Does **not** write to the database
+
+This produces a concrete gap report before any schema migration.
+
+---
+
+## Related docs & code
+
+| Resource | Path |
+|----------|------|
+| Prisma schema | `backend/prisma/schema.prisma` |
+| Data model skill | `.cursor/skills/signbank-data-model/SKILL.md` |
+| Gloss workflow | `.cursor/skills/signbank-gloss-workflow/SKILL.md` |
+| Seed (demo data) | `backend/prisma/seed.ts` |
+| Gloss validation | `backend/src/utils/gloss-validation.ts` |
+| Video upload | `backend/src/videos/videos.service.ts` |
+| Typesense sync | `backend/src/typesense/typesense.service.ts` |
+| Sample scraped data | `Examples/*.json` |
+| Meeting agenda | `docs/fitxas-import-meeting-agenda.md` |
+| ENUM reference | `docs/fitxas-import-enums-reference.md` |
diff --git a/docs/fitxas-mapping-analysis.json b/docs/fitxas-mapping-analysis.json
new file mode 100644
index 0000000..35beb0d
--- /dev/null
+++ b/docs/fitxas-mapping-analysis.json
@@ -0,0 +1,666 @@
+{
+  "sheets": [
+    "Categoria lèxica",
+    "Tipus de morfema",
+    "Handedness-mans",
+    "Configuracions",
+    "Canvi de configuració",
+    "Relació entre articuladors",
+    "Localitzacions",
+    "Oirentació relativa_moviment",
+    "Orientació relativa_localitzaci",
+    "Canvi_orientació",
+    "Tipus_contacte",
+    "Forma_moviment",
+    "Direcció_moviment",
+    "Entitat_amb_nom_named_entity",
+    "València",
+    "Tipus_relació_altres_signes",
+    "Camp_semàntic",
+    "Etiquetes-Tags",
+    "Notes",
+    "Morfologia seqüencial"
+  ],
+  "comparisons": {
+    "HandConfiguration": {
+      "xlsxRows": 57,
+      "matched": 51,
+      "unmatchedSignbankId": [],
+      "noSignbankId": 6,
+      "prismaOnly": []
+    },
+    "Hand": {
+      "note": "XLSX uses 1/2a/2n/2s/x — SignBank uses RIGHT/LEFT/BOTH. Needs semantic mapping, not 1:1.",
+      "xlsxValues": [
+        {
+          "code": 1,
+          "cat": 1,
+          "en": "One-handed sign"
+        },
+        {
+          "code": "2a",
+          "cat": "2a",
+          "en": "Two-handed asymmetrical sing: the weak hand is the location in the sign"
+        },
+        {
+          "code": "2n",
+          "cat": "2n",
+          "en": "Two-handed sign in which both hands move but the hands are not mirrored in the sagittal plane. Their handshapes may differ"
+        },
+        {
+          "code": "2s",
+          "cat": "2s",
+          "en": "Two-handed symmetrical sing: both hands move and have the same handshape (note: the location may occasionally be non-identical)"
+        },
+        {
+          "code": "x",
+          "cat": "x",
+          "en": "Handedness not applicable"
+        }
+      ],
+      "signbankEnum": [
+        "RIGHT",
+        "LEFT",
+        "BOTH"
+      ]
+    },
+    "LexicalCategory": {
+      "rows": [
+        {
+          "sourceEn": "Adjective",
+          "sourceCat": "Adjectiu",
+          "guess": "ADJECTIVE",
+          "match": true
+        },
+        {
+          "sourceEn": "Ineterjection",
+          "sourceCat": "Interjecció",
+          "guess": "INETERJECTION",
+          "match": false
+        },
+        {
+          "sourceEn": "Noun",
+          "sourceCat": "Nom",
+          "guess": "NOUN",
+          "match": true
+        },
+        {
+          "sourceEn": "Noun or Verb",
+          "sourceCat": "Nom o verb",
+          "guess": "NOUN_OR_VERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Noun or adjective",
+          "sourceCat": "Nom o adjectiu",
+          "guess": "NOUN_OR_ADJECTIVE",
+          "match": true
+        },
+        {
+          "sourceEn": "Noun, adjective or verb",
+          "sourceCat": "Nom, adjectiu o verb",
+          "guess": "NOUN_ADJECTIVE_OR_VERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Verb or adjective",
+          "sourceCat": "Verb o adjectiu",
+          "guess": "VERB_OR_ADJECTIVE",
+          "match": true
+        },
+        {
+          "sourceEn": "Particle",
+          "sourceCat": "Partícula",
+          "guess": "PARTICLE",
+          "match": true
+        },
+        {
+          "sourceEn": "Verb",
+          "sourceCat": "Verb",
+          "guess": "VERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Adverb",
+          "sourceCat": "Adverbi",
+          "guess": "ADVERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Pronoun",
+          "sourceCat": "Pronom",
+          "guess": "PRONOUN",
+          "match": true
+        },
+        {
+          "sourceEn": "Noun, adjective or adverb",
+          "sourceCat": "Nom, adjectiu o adverbi",
+          "guess": "NOUN_ADJECTIVE_OR_ADVERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Particle, Noun or Verb",
+          "sourceCat": "Preposició, nom o verb",
+          "guess": "PARTICLE_NOUN_OR_VERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Noun or Adverb",
+          "sourceCat": "Nom o adverbi",
+          "guess": "NOUN_OR_ADVERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Verb, adjective or adverb",
+          "sourceCat": "Verb, adjectiu o adverbi",
+          "guess": "VERB_ADJECTIVE_OR_ADVERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Verb or interjection",
+          "sourceCat": "Verb o interjecció",
+          "guess": "VERB_OR_INTERJECTION",
+          "match": true
+        },
+        {
+          "sourceEn": "Adjective or Adverb",
+          "sourceCat": "Adjectiu o Adverbi",
+          "guess": "ADJECTIVE_OR_ADVERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Verb, adjective or particle",
+          "sourceCat": "Verb, adjectiu o preposició",
+          "guess": "VERB_ADJECTIVE_OR_PARTICLE",
+          "match": true
+        },
+        {
+          "sourceEn": "Particle or adjectiuve",
+          "sourceCat": "Preposició o adjectiu",
+          "guess": "PARTICLE_OR_ADJECTIUVE",
+          "match": false
+        },
+        {
+          "sourceEn": "Noun, adjective or particle",
+          "sourceCat": "Nom, adjectiu o preposició",
+          "guess": "NOUN_ADJECTIVE_OR_PARTICLE",
+          "match": true
+        },
+        {
+          "sourceEn": "Verb or Adverb",
+          "sourceCat": "Verb o adverbi",
+          "guess": "VERB_OR_ADVERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Particle or Adverb",
+          "sourceCat": "Partícula o adverbi",
+          "guess": "PARTICLE_OR_ADVERB",
+          "match": true
+        },
+        {
+          "sourceEn": "Noun, verb o adverb",
+          "sourceCat": "Nom, verb o adverbi",
+          "guess": "NOUN_VERB_O_ADVERB",
+          "match": false
+        },
+        {
+          "sourceEn": "Noun or interjection",
+          "sourceCat": "Nom o interjecció",
+          "guess": "NOUN_OR_INTERJECTION",
+          "match": true
+        },
+        {
+          "sourceEn": "Adverb or interjection",
+          "sourceCat": "Adverbi o interjecció",
+          "guess": "ADVERB_OR_INTERJECTION",
+          "match": true
+        },
+        {
+          "sourceEn": "Verb or particle",
+          "sourceCat": "Verb o preposició",
+          "guess": "VERB_OR_PARTICLE",
+          "match": true
+        },
+        {
+          "sourceEn": "Noun or preposition",
+          "sourceCat": "Nom o preposició",
+          "guess": "NOUN_OR_PREPOSITION",
+          "match": true
+        }
+      ],
+      "unmatched": [
+        {
+          "sourceEn": "Ineterjection",
+          "sourceCat": "Interjecció",
+          "guess": "INETERJECTION",
+          "match": false
+        },
+        {
+          "sourceEn": "Particle or adjectiuve",
+          "sourceCat": "Preposició o adjectiu",
+          "guess": "PARTICLE_OR_ADJECTIUVE",
+          "match": false
+        },
+        {
+          "sourceEn": "Noun, verb o adverb",
+          "sourceCat": "Nom, verb o adverbi",
+          "guess": "NOUN_VERB_O_ADVERB",
+          "match": false
+        }
+      ]
+    },
+    "RelationType": {
+      "xlsxRows": [
+        {
+          "ANGLÈS": "---",
+          "CATALÀ": "---",
+          "ESPANYOL": "---"
+        },
+        {
+          "ANGLÈS": "All",
+          "CATALÀ": "Tot",
+          "ESPANYOL": "Todo"
+        },
+        {
+          "ANGLÈS": "Homonym",
+          "CATALÀ": "Homònim",
+          "ESPANYOL": "Homónimo"
+        },
+        {
+          "ANGLÈS": "Synonym",
+          "CATALÀ": "Sinònim",
+          "ESPANYOL": "Sinónimo"
+        },
+        {
+          "ANGLÈS": "Variant",
+          "CATALÀ": "Variant",
+          "ESPANYOL": "Variante"
+        },
+        {
+          "ANGLÈS": "Antonym",
+          "CATALÀ": "Antònim",
+          "ESPANYOL": "Antónimo"
+        },
+        {
+          "ANGLÈS": "Hyponym",
+          "CATALÀ": "Hipònim",
+          "ESPANYOL": "Hipónimo"
+        },
+        {
+          "ANGLÈS": "Hypernym",
+          "CATALÀ": "Hiperònim",
+          "ESPANYOL": "Hiperónimo"
+        },
+        {
+          "ANGLÈS": "See Also",
+          "CATALÀ": "Veure també",
+          "ESPANYOL": "Ver también"
+        }
+      ],
+      "signbankEnum": [
+        "SYNONYM",
+        "REGIONAL_VARIANT",
+        "ASSOCIATED_CONCEPT",
+        "ANTONYM",
+        "HOMONYM",
+        "VARIANT",
+        "HYPERNYM",
+        "HYPONYM"
+      ]
+    },
+    "Location": {
+      "xlsxRows": 148,
+      "matched": 136,
+      "unmatchedSamples": [
+        {
+          "sourceEn": "Between fingers",
+          "sourceCat": "Entre dits",
+          "guess": "BETWEEN_FINGERS",
+          "match": false
+        },
+        {
+          "sourceEn": "Between legs",
+          "sourceCat": "Entre cames",
+          "guess": "BETWEEN_LEGS",
+          "match": false
+        },
+        {
+          "sourceEn": "Bridge of the nose",
+          "sourceCat": "Pont del nas",
+          "guess": "BRIDGE_OF_THE_NOSE",
+          "match": false
+        },
+        {
+          "sourceEn": "Chest > trunk",
+          "sourceCat": "Tòrax > Tronc",
+          "guess": "CHEST_TO_TRUNK",
+          "match": false
+        },
+        {
+          "sourceEn": "Chin > weak hand: index finger",
+          "sourceCat": "Barbeta > mà no-dominant: dit índex",
+          "guess": "CHIN_TO_WEAK_HAND_INDEX_FINGER",
+          "match": false
+        },
+        {
+          "sourceEn": "Chin > weak hand: thumb side",
+          "sourceCat": "Barbeta > mà no-dominant: polze",
+          "guess": "CHIN_TO_WEAK_HAND_THUMB_SIDE",
+          "match": false
+        },
+        {
+          "sourceEn": "Cheek > Neutral space",
+          "sourceCat": "Galta > Espai neutre",
+          "guess": "CHEEK_TO_NEUTRAL_SPACE",
+          "match": false
+        },
+        {
+          "sourceEn": "arm contra",
+          "sourceCat": "Braç contra",
+          "guess": "ARM_CONTRA",
+          "match": false
+        },
+        {
+          "sourceEn": "Neutral Espace > Chest",
+          "sourceCat": "Espai neutre > Tòrax",
+          "guess": "NEUTRAL_ESPACE_TO_CHEST",
+          "match": false
+        },
+        {
+          "sourceEn": ">",
+          "sourceCat": "canvi seqüencial",
+          "guess": "TO",
+          "match": false
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCat": "valors simultanis",
+          "guess": "AND",
+          "match": false
+        },
+        {
+          "sourceEn": "/",
+          "sourceCat": "Diferent valor per cada mà",
+          "guess": "OR",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 4
+    },
+    "ConfigurationChange": {
+      "sheet": "Canvi de configuració",
+      "xlsxRows": 22,
+      "matched": 19,
+      "unmatchedSamples": [
+        {
+          "sourceEn": ">",
+          "sourceCat": "",
+          "guess": "TO",
+          "match": false
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCat": "",
+          "guess": "AND",
+          "match": false
+        },
+        {
+          "sourceEn": "/",
+          "sourceCat": "",
+          "guess": "",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 0
+    },
+    "RelationBetweenArticulators": {
+      "sheet": "Relació entre articuladors",
+      "xlsxRows": 14,
+      "matched": 11,
+      "unmatchedSamples": [
+        {
+          "sourceEn": ">",
+          "sourceCat": "canvi seqüencial",
+          "guess": "TO",
+          "match": false
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCat": "valors simultanis",
+          "guess": "AND",
+          "match": false
+        },
+        {
+          "sourceEn": "/",
+          "sourceCat": "Diferent valor per cada mà",
+          "guess": "",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 0
+    },
+    "MovementRelatedOrientation": {
+      "sheet": "Oirentació relativa_moviment",
+      "xlsxRows": 48,
+      "matched": 39,
+      "unmatchedSamples": [
+        {
+          "sourceEn": "Back / base",
+          "sourceCat": "Darrere / Base",
+          "guess": "BACK_BASE",
+          "match": false
+        },
+        {
+          "sourceEn": "Back/finger tips",
+          "sourceCat": "Darrere / Punta dels dits",
+          "guess": "BACK_FINGER_TIPS",
+          "match": false
+        },
+        {
+          "sourceEn": "Back/palm",
+          "sourceCat": "Darrere / Palmell",
+          "guess": "BACK_PALM",
+          "match": false
+        },
+        {
+          "sourceEn": "Base/front",
+          "sourceCat": "Base > Davant",
+          "guess": "BASE_FRONT",
+          "match": false
+        },
+        {
+          "sourceEn": "Finger tips/base",
+          "sourceCat": "Punta dels dits / Base",
+          "guess": "FINGER_TIPS_BASE",
+          "match": false
+        },
+        {
+          "sourceEn": "Finger tips/ulnar",
+          "sourceCat": "Punta dels dits / Cubital",
+          "guess": "FINGER_TIPS_ULNAR",
+          "match": false
+        },
+        {
+          "sourceEn": "Front/palm",
+          "sourceCat": "Davant / Palmell",
+          "guess": "FRONT_PALM",
+          "match": false
+        },
+        {
+          "sourceEn": "Palm + radial/ulnar",
+          "sourceCat": "Palmell + Radial/ Cubital",
+          "guess": "PALM_AND_RADIAL_ULNAR",
+          "match": false
+        },
+        {
+          "sourceEn": "Radial/ulnar",
+          "sourceCat": "Radial / Cubital",
+          "guess": "RADIAL_ULNAR",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 9
+    },
+    "OrientationRelatedToLocation": {
+      "sheet": "Orientació relativa_localitzaci",
+      "xlsxRows": 27,
+      "matched": 21,
+      "unmatchedSamples": [
+        {
+          "sourceEn": "AO: palm-down > palm-up",
+          "sourceCat": "AO: Palmell-avall > Palmell-amunt",
+          "guess": "AO_PALM_DOWN_TO_PALM_UP",
+          "match": false
+        },
+        {
+          "sourceEn": "AO: palm-up/down",
+          "sourceCat": "AO: Palmell-amunt/avall",
+          "guess": "AO_PALM_UP_DOWN",
+          "match": false
+        },
+        {
+          "sourceEn": "Back/palm",
+          "sourceCat": "Darrere / Palmell",
+          "guess": "BACK_PALM",
+          "match": false
+        },
+        {
+          "sourceEn": "Back/palm > palm",
+          "sourceCat": "Darrere / Palmell > Palmell",
+          "guess": "BACK_PALM_TO_PALM",
+          "match": false
+        },
+        {
+          "sourceEn": "Finger tips/base",
+          "sourceCat": "Punta dels dits / Base",
+          "guess": "FINGER_TIPS_BASE",
+          "match": false
+        },
+        {
+          "sourceEn": "Radial /ulnar",
+          "sourceCat": "Radial / cubital",
+          "guess": "RADIAL_ULNAR",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 6
+    },
+    "OrientationChange": {
+      "sheet": "Canvi_orientació",
+      "xlsxRows": 19,
+      "matched": 14,
+      "unmatchedSamples": [
+        {
+          "sourceEn": "Extension/flexion",
+          "sourceCat": "Extensió / Flexió",
+          "guess": "EXTENSION_FLEXION",
+          "match": false
+        },
+        {
+          "sourceEn": "Pronation/supination",
+          "sourceCat": "Pronació / Supinació",
+          "guess": "PRONATION_SUPINATION",
+          "match": false
+        },
+        {
+          "sourceEn": ">",
+          "sourceCat": "canvi seqüencial",
+          "guess": "TO",
+          "match": false
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCat": "valors simultanis",
+          "guess": "AND",
+          "match": false
+        },
+        {
+          "sourceEn": "/",
+          "sourceCat": "Diferent valor per cada mà",
+          "guess": "",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 2
+    },
+    "ContactType": {
+      "sheet": "Tipus_contacte",
+      "xlsxRows": 16,
+      "matched": 13,
+      "unmatchedSamples": [
+        {
+          "sourceEn": ">",
+          "sourceCat": "canvi seqüencial",
+          "guess": "TO",
+          "match": false
+        },
+        {
+          "sourceEn": "\"+\"",
+          "sourceCat": "valors simultanis",
+          "guess": "AND",
+          "match": false
+        },
+        {
+          "sourceEn": "/",
+          "sourceCat": "Diferent valor per cada mà",
+          "guess": "",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 0
+    },
+    "MovementType": {
+      "sheet": "Forma_moviment",
+      "xlsxRows": 9,
+      "matched": 8,
+      "unmatchedSamples": [
+        {
+          "sourceEn": "-----",
+          "sourceCat": "-----",
+          "guess": "",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 0
+    },
+    "MovementDirection": {
+      "sheet": "Direcció_moviment",
+      "xlsxRows": 62,
+      "matched": 57,
+      "unmatchedSamples": [
+        {
+          "sourceEn": "Backwards/forwards",
+          "sourceCat": "Enrere / Endavant",
+          "guess": "BACKWARDS_FORWARDS",
+          "match": false
+        },
+        {
+          "sourceEn": "Downwards + contralateral/ipsilateral",
+          "sourceCat": "Avall + Contralateral / Ipsilateral",
+          "guess": "DOWNWARDS_AND_CONTRALATERAL_IPSILATERAL",
+          "match": false
+        },
+        {
+          "sourceEn": "Downwards/upwards",
+          "sourceCat": "Avall / Amunt",
+          "guess": "DOWNWARDS_UPWARDS",
+          "match": false
+        },
+        {
+          "sourceEn": "Downwards/upwards + ipsilateral",
+          "sourceCat": "Avall / Amunt + Ipsilateral",
+          "guess": "DOWNWARDS_UPWARDS_AND_IPSILATERAL",
+          "match": false
+        },
+        {
+          "sourceEn": "Ipsilateral/contralateral",
+          "sourceCat": "Ipsilateral / Contralateral",
+          "guess": "IPSILATERAL_CONTRALATERAL",
+          "match": false
+        }
+      ],
+      "prismaOnlyCount": 6
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/components/GlossDetail/GlossDetailComponent.vue b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
index 83fc952..7559b5d 100644
--- a/frontend/src/components/GlossDetail/GlossDetailComponent.vue
+++ b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
@@ -5,7 +5,7 @@
     :class="{ 'gloss-detail-card--constrained': constrainedLayout }"
   >
     <GlossRequestProgress
-      v-if="isDraft"
+      v-if="editMode"
       :gloss-data="glossData"
     />
 
@@ -32,7 +32,7 @@
     />
 
     <MoreContentComponent
-      v-if="contentEditable || isDraft"
+      v-if="contentEditable"
       class="gloss-detail-card__edit"
       :gloss-data="glossData"
       :edit-mode="contentEditable"
@@ -40,6 +40,7 @@
       :submitting="submitting"
       @update:gloss-data="handleGlossDataUpdate"
       @submit-request="submitRequest"
+      @finish-edit="finishEdit"
     />
   </q-card>
 </template>
@@ -123,6 +124,14 @@ const submitRequest = () => {
   emit('submitRequest')
 }
 
+const finishEdit = () => {
+  $q.notify({
+    type: 'positive',
+    message: translate('glossSavedSuccessfully'),
+  })
+  emit('update:editMode', false)
+}
+
 const handleGlossDataUpdate = (updatedGlossData: GlossData) => {
   emit('update:glossData', updatedGlossData)
 }
diff --git a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
index 16f0378..d95472a 100644
--- a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
+++ b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
@@ -1,8 +1,7 @@
 <template>
   <div>
-    <!-- Draft creation: guided stepper -->
     <q-stepper
-      v-if="isDraft"
+      v-if="editMode"
       v-model="step"
       color="primary"
       animated
@@ -120,83 +119,14 @@
           <q-btn
             color="primary"
             unelevated
-            icon="send"
-            :label="translate('sendRequest')"
+            :icon="isDraft ? 'send' : 'check'"
+            :label="isDraft ? translate('sendRequest') : translate('save')"
             :loading="stepLoading || submitting"
-            @click="handleSend"
+            @click="handleFinish"
           />
         </q-stepper-navigation>
       </q-step>
     </q-stepper>
-
-    <!-- Published edit mode: tabbed layout for admin editing -->
-    <template v-else-if="editMode">
-      <q-tabs
-        v-model="selectedContent"
-        class="text-primary"
-        active-color="primary"
-        indicator-color="primary"
-        align="justify"
-        narrow-indicator
-      >
-        <q-tab
-          name="definitions"
-          :label="translate('definitions')"
-        />
-        <q-tab
-          name="videos"
-          :label="translate('videos')"
-        />
-        <q-tab
-          name="examples"
-          :label="translate('examples')"
-        />
-        <q-tab
-          name="related"
-          :label="translate('relatedGlosses')"
-        />
-      </q-tabs>
-
-      <q-tab-panels
-        v-model="selectedContent"
-        animated
-      >
-        <q-tab-panel name="definitions">
-          <DefinitionsComponent
-            :gloss-data="localGlossData"
-            :edit-mode="editMode"
-            :allow-edit="editMode"
-            @update:gloss-data="updateGlossData"
-          />
-        </q-tab-panel>
-
-        <q-tab-panel name="videos">
-          <VideosComponent
-            v-model="localGlossData"
-            :edit-mode="editMode"
-            @update:gloss-data="updateGlossData"
-          />
-        </q-tab-panel>
-
-        <q-tab-panel name="examples">
-          <ExamplesComponent
-            :gloss-data="localGlossData"
-            :edit-mode="editMode"
-            @update:gloss-data="updateGlossData"
-          />
-        </q-tab-panel>
-
-        <q-tab-panel name="related">
-          <RelatedGlosses
-            :related-glosses="localGlossData.relationsAsSource || []"
-            :minimal-pairs="localGlossData.minimalPairsAsSource || []"
-            :edit-mode="editMode"
-            :gloss-id="localGlossData.id || ''"
-            @update:gloss-data="updateGlossData"
-          />
-        </q-tab-panel>
-      </q-tab-panels>
-    </template>
   </div>
 </template>
 
@@ -211,7 +141,6 @@ import RelatedGlosses from './RelatedGlosses.vue';
 import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vue';
 
 const $q = useQuasar()
-const selectedContent = ref<string>('definitions')
 const step = ref(1)
 const stepLoading = ref(false)
 
@@ -222,6 +151,7 @@ const examplesRef = ref<InstanceType<typeof ExamplesComponent> | null>(null)
 const emit = defineEmits<{
   (e: 'update:glossData', glossData: GlossData): void
   (e: 'submitRequest'): void
+  (e: 'finishEdit'): void
 }>();
 
 const { glossData, editMode, isDraft = false, submitting = false } = defineProps<{
@@ -237,6 +167,12 @@ watch(() => glossData, (newGlossData) => {
   localGlossData.value = newGlossData;
 }, { deep: true });
 
+watch(() => editMode, (isEditing) => {
+  if (isEditing) {
+    step.value = 1
+  }
+});
+
 const updateGlossData = (updated: GlossData) => {
   localGlossData.value = updated;
   emit('update:glossData', updated);
@@ -288,11 +224,16 @@ async function goToStep(targetStep: number) {
   }
 }
 
-async function handleSend() {
+async function handleFinish() {
   stepLoading.value = true
   try {
     await examplesRef.value?.saveAll(true)
-    emit('submitRequest')
+
+    if (isDraft) {
+      emit('submitRequest')
+    } else {
+      emit('finishEdit')
+    }
   } finally {
     stepLoading.value = false
   }
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index bdc7ee2..723dc33 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -333,6 +333,13 @@ const translations: TranslateKeys = {
   glossUnarchivedSuccessfully: 'Gloss unarchived successfully',
   optional: 'Optional',
   create: 'Create',
+  stepCore: 'Definition and translation',
+  stepVideo: 'Video and phonology',
+  stepOptional: 'Additional information',
+  creationProgress: 'Progress',
+  next: 'Next',
+  back: 'Back',
+  exitEditMode: 'Exit edit mode',
 };
 
 export default translations; 
\ No newline at end of file

From 3d3f87276ad1e6600117355b5faf78457d2d511d Mon Sep 17 00:00:00 2001
From: Ramon <ramondonadeucaballero@gmail.com>
Date: Fri, 19 Jun 2026 15:56:04 +0200
Subject: [PATCH 08/17] feat: notes and planned improvements

---
 Examples/0001_menjar.json                     | 156 ---
 Examples/0764_01_cervesa.json                 | 119 ---
 Examples/1420_02_bessons-1d.json              | 137 ---
 Examples/bessons-1d.json                      | 264 +++++
 Examples/bessons.json                         | 506 ++++++++++
 Examples/cervesa.json                         | 232 +++++
 Examples/menjar.json                          | 269 +++++
 backend/nest-cli.json                         |   8 +-
 backend/src/import/fitxa-enum-resolver.ts     |   2 +-
 backend/tsconfig.json                         |   1 +
 docs/fitxas-import-meeting-agenda.md          | 199 +---
 docs/fitxas-import-plan.md                    | 395 ++------
 docs/fitxas-import-requirements.md            | 918 ++++++++++++++++++
 .../GlossDetail/components/MainContent.vue    |   2 +
 .../GlossDetail/components/SignVideoAside.vue |  30 +-
 .../components/SignVideosBrowseView.vue       |   9 +-
 frontend/src/i18n/ca-ES/index.ts              |   1 +
 frontend/src/i18n/en-US/index.ts              |   1 +
 frontend/src/i18n/es-ES/index.ts              |   1 +
 frontend/src/i18n/translateKeys.ts            |   1 +
 frontend/src/pages/GlossPage.vue              |  55 +-
 21 files changed, 2412 insertions(+), 894 deletions(-)
 delete mode 100644 Examples/0001_menjar.json
 delete mode 100644 Examples/0764_01_cervesa.json
 delete mode 100644 Examples/1420_02_bessons-1d.json
 create mode 100644 Examples/bessons-1d.json
 create mode 100644 Examples/bessons.json
 create mode 100644 Examples/cervesa.json
 create mode 100644 Examples/menjar.json
 create mode 100644 docs/fitxas-import-requirements.md

diff --git a/Examples/0001_menjar.json b/Examples/0001_menjar.json
deleted file mode 100644
index 42307c7..0000000
--- a/Examples/0001_menjar.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "id": "0001_menjar",
-  "name": "MENJAR",
-  "tr_en": "EAT; FOOD; MEAL",
-  "tr_es": "COMER; COMIDA",
-  "tr_ca": "",
-  "alt_glosses": [
-    "ALIMENTACIÓ",
-    "ALIMENT",
-    "APROFITAR-SE-lfp",
-    "VIANDA",
-    "ÀPAT",
-    "MANDUCA",
-    "NODRIR",
-    "CONSUM"
-  ],
-  "definitions": [
-    "Verb- Dur un aliment sòlid a la boca, mastegar-lo i empassar-lo.\n\n. Tomar la comida\n Gastar, consumir o desbaratar",
-    "Nom- Producte natural o elaborat que proporciona als éssers vius energia, substàncies formadores de les estructures de l’organisme i els compostos químics indispensables per al bon funcionament o la regulació dels mecanismes vitals.\nConjunto de sustancias que los seres vivos comen para subsistir"
-  ],
-  "definition": "Verb- Dur un aliment sòlid a la boca, mastegar-lo i empassar-lo.\n\n. Tomar la comida\n Gastar, consumir o desbaratar\n\nNom- Producte natural o elaborat que proporciona als éssers vius energia, substàncies formadores de les estructures de l’organisme i els compostos químics indispensables per al bon funcionament o la regulació dels mecanismes vitals.\nConjunto de sustancias que los seres vivos comen para subsistir",
-  "corpus_forms": [
-    "MENJAR",
-    "MENJAR-rep",
-    "MENJAR-S'HO",
-    "MENJAR-lfp"
-  ],
-  "lexical_category": "Nom o verb",
-  "phonology": {
-    "nombre_mans": "1",
-    "configuracio": "Q (Beak)",
-    "configuracio_ma_dominant": "Q (Beak)",
-    "configuracio_ma_no_dominant": null,
-    "canvi_configuracio": "No",
-    "relacio_articuladors": null,
-    "relacio_articuladors_ma_dominant": null,
-    "relacio_articuladors_ma_no_dominant": null,
-    "localitzacio": "Boca",
-    "orientacio_moviment": "Punta dels dits (finger tips)",
-    "orientacio_localitzacio": null,
-    "canvi_orientacio": "Extensió > Flexió",
-    "tipus_contacte": null,
-    "forma_moviment": null,
-    "direccio_moviment": null,
-    "moviment_repetit": "SÍ",
-    "vocalitzacio": "Pot aparèixer amb vocalització",
-    "component_no_manual": null
-  },
-  "morfologia_sequencial": {
-    "compost_1": null,
-    "compost_2": null,
-    "compost_3": null
-  },
-  "morfologia_simultania": [
-    {
-      "glossa_morfema": "Classificador descriptiu",
-      "significat_en_aquest_signe": "Forma de l’aliment que es menja"
-    }
-  ],
-  "morfologia_abreujada": [
-    {
-      "glossa_abreujada": null,
-      "rol_en_aquest_signe": null
-    }
-  ],
-  "minimal_pairs": [
-    {
-      "sign": "EMPASSAR-SE",
-      "description": "Moviment simple vs. repetit"
-    }
-  ],
-  "iconicity": "Sí",
-  "entitat_amb_nom": null,
-  "camp_semantic": "Acte físic",
-  "valencia": "Verb transitiu",
-  "signes_claus": [
-    {
-      "glosses": [
-        "COSA",
-        "ANIMAL",
-        "VIURE",
-        "FALTAR",
-        "PER-A",
-        "SALVAR",
-        "SOBREVIURE"
-      ],
-      "comment": null
-    },
-    {
-      "glosses": [
-        "TRAGAR",
-        "ALIMENTO",
-        "COMBUSTIBLE-XUCLAR"
-      ],
-      "comment": "Proposta Lali (03/12/2025): GRUP + COSA + IX1-substàncies + ANIMAL + PLANTA + O + DIVERSOS-2d + VIURE + MENJAR + O  + XUCLAR-0e + HAVER-DE +  PER-A + SOBREVIURE  - Grup de substàncies que els animals, plantes o altres essers vius han de menjar o absorbir (xuclar?) per sobreviure."
-    }
-  ],
-  "related_signs": {
-    "HOMÒNIM": [],
-    "SINÒNIM": [],
-    "VARIANT": [],
-    "ANTÒNIM": [],
-    "HIPÒNIM": [],
-    "HIPERÒNIM": [],
-    "VEURE TAMBÉ": [
-      "ALIMENTACIÓ"
-    ]
-  },
-  "relacio_signes_forasters": {
-    "prestec": null,
-    "llengua_relacionada": null,
-    "glossa_llengua_relacionada": null
-  },
-  "categories": [
-    "Acte físic"
-  ],
-  "occ_general": [
-    "MARTÍN & ALVARADO",
-    "PERELLÓ & FRÍGOLA",
-    "FERRERONS",
-    "DILSCAT",
-    "MIRA QUÈ DIC",
-    "VOCABULARI BÀSIC"
-  ],
-  "occ_learning": [
-    "A1 JUAN VALENZUELA",
-    "A1",
-    "A2",
-    "APRENEM 1",
-    "APRENEM 2"
-  ],
-  "occ_specific": [
-    "MEDICINES",
-    "ÀREES MEDI SOCIAL",
-    "ÀREES MEDI NATURAL",
-    "ALIMENTS",
-    "ANIMALS",
-    "LÀMINES GENERALITAT",
-    "El GENÍS I LA SANITATSÍ",
-    "EL GENÍS I L’EDUCACIÓ",
-    "RECULL TOPONÍMIC",
-    "53 MALES MANERES",
-    "HISTÒRIA FILOSOFIA",
-    "ÀGILS COMUNICACIÓ",
-    "SIGNAPP"
-  ],
-  "notes": "Observacions: Vist Santi\nSigne “Alimentació” utilitzar \"menjar + diferents\"\nVist Delfi \nLALI (20/5/2022): He afegit una fitxa per ALIMENTACIÓ\nLALI (06/07/2023) He afegit el parell mínim EMPASSAR-SE\nLALI (08/09/2025): He afegit l’accepció CONSUM",
-  "video_url": "https://drive.google.com/file/d/155WTLpNgEXR3X9eSQ2Xbdq1HPJ0bK84_/view?usp=sharing",
-  "docx_path": "data/FITXES_ENTRADES/0001 MENJAR_COMESTIBLE_ALIMENTACIÓ_ALIMENT_ÀPAT_MANDUCA_CONSUM-Singbank.docx",
-  "is_compound": false,
-  "compound_signs": [],
-  "phonology_parts": {},
-  "vocab_warnings": {
-    "orientacio_moviment": "Punta dels dits (finger tips)"
-  }
-}
\ No newline at end of file
diff --git a/Examples/0764_01_cervesa.json b/Examples/0764_01_cervesa.json
deleted file mode 100644
index e7b0874..0000000
--- a/Examples/0764_01_cervesa.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "id": "0764_01_cervesa",
-  "name": "CERVESA",
-  "tr_en": "BEER",
-  "tr_es": "CERVEZA",
-  "tr_ca": "",
-  "alt_glosses": [],
-  "definitions": [
-    "Nom – Beguda fermentada preparada a partir de cereals germinats, especialment ordi, i aromatitzada amb llúpol."
-  ],
-  "definition": "Nom – Beguda fermentada preparada a partir de cereals germinats, especialment ordi, i aromatitzada amb llúpol.",
-  "corpus_forms": [
-    "NOMÉS APAREIX ALS MATERIALS"
-  ],
-  "lexical_category": "Nom",
-  "phonology": {
-    "nombre_mans": "2a",
-    "configuracio": "B (B) /O_SSI (O)",
-    "configuracio_ma_dominant": "B (B)",
-    "configuracio_ma_no_dominant": "O_SSI (O)",
-    "canvi_configuracio": "No",
-    "relacio_articuladors": "Damunt / Sota",
-    "relacio_articuladors_ma_dominant": "Damunt",
-    "relacio_articuladors_ma_no_dominant": "Sota",
-    "localitzacio": "Mà no-dominant",
-    "orientacio_moviment": "Palm",
-    "orientacio_localitzacio": "AO: palm-down",
-    "canvi_orientacio": "Flexió > Extensió",
-    "tipus_contacte": "Final",
-    "forma_moviment": null,
-    "direccio_moviment": "Cap a la localització",
-    "moviment_repetit": "Sí",
-    "vocalitzacio": null,
-    "component_no_manual": null
-  },
-  "morfologia_sequencial": {
-    "compost_1": null,
-    "compost_2": null,
-    "compost_3": null
-  },
-  "morfologia_simultania": [],
-  "morfologia_abreujada": [
-    {
-      "glossa_abreujada": null,
-      "rol_en_aquest_signe": null
-    }
-  ],
-  "minimal_pairs": [
-    {
-      "sign": "TAPAR-5",
-      "description": "Moviment simple vs. repetit"
-    },
-    {
-      "sign": "VÀTER-B",
-      "description": "???? (potser són iguals)"
-    }
-  ],
-  "iconicity": "Sí",
-  "entitat_amb_nom": null,
-  "camp_semantic": "Aliment",
-  "valencia": "",
-  "signes_claus": [],
-  "related_signs": {
-    "HOMÒNIM": [],
-    "SINÒNIM": [],
-    "VARIANT": [],
-    "ANTÒNIM": [],
-    "HIPÒNIM": [],
-    "HIPERÒNIM": [],
-    "VEURE TAMBÉ": []
-  },
-  "relacio_signes_forasters": {
-    "prestec": null,
-    "llengua_relacionada": null,
-    "glossa_llengua_relacionada": null
-  },
-  "categories": [
-    "Aliment"
-  ],
-  "occ_general": [
-    "MARTÍN & ALVARADO",
-    "PERELLÓ & FRÍGOLA",
-    "FERRERONS",
-    "DILSCAT",
-    "MIRA QUÈ DIC",
-    "VOCABULARI BÀSIC"
-  ],
-  "occ_learning": [
-    "A1 JUAN VALENZUELA",
-    "A1",
-    "A2",
-    "APRENEM 1",
-    "APRENEM 2"
-  ],
-  "occ_specific": [
-    "MEDICINES",
-    "ÀREES MEDI SOCIAL",
-    "ÀREES MEDI NATURAL",
-    "ALIMENTS",
-    "ANIMALS",
-    "LÀMINES GENERALITAT",
-    "El GENÍS I LA SANITAT",
-    "EL GENÍS I L’EDUCACIÓ",
-    "RECULL TOPONÍMIC",
-    "53 MALES MANERES",
-    "HISTÒRIA FILOSOFIA",
-    "ÀGILS COMUNICACIÓ",
-    "SIGNAPP"
-  ],
-  "notes": "Observacions: LALI (2/12/2024): He fet una fitxa per VÀTER-B però no hi veig la diferència amb CERVESA.",
-  "video_url": "https://drive.google.com/file/d/1JELU8mXStloevsXlyBnO3jXWj7p-QxP0/view?usp=sharing",
-  "docx_path": "data/FITXES_ENTRADES/0764_01 CERVESA.docx",
-  "is_compound": false,
-  "compound_signs": [],
-  "phonology_parts": {},
-  "vocab_warnings": {
-    "configuracio_ma_no_dominant": "O_SSI (O)"
-  }
-}
\ No newline at end of file
diff --git a/Examples/1420_02_bessons-1d.json b/Examples/1420_02_bessons-1d.json
deleted file mode 100644
index ddb4f00..0000000
--- a/Examples/1420_02_bessons-1d.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "id": "1420_02_bessons-1d",
-  "name": "BESSONS-1d",
-  "tr_en": "TWINS",
-  "tr_es": "GEMELOS",
-  "tr_ca": "",
-  "alt_glosses": [
-    "GERMÀ+Conf 2"
-  ],
-  "definitions": [
-    "Adj- Nat d’un mateix part, amb un altre o altres"
-  ],
-  "definition": "Adj- Nat d’un mateix part, amb un altre o altres",
-  "corpus_forms": [
-    "NOMÉS APAREIX ALS MATERIALS"
-  ],
-  "lexical_category": "Adjectiu",
-  "phonology": {
-    "nombre_mans": "2n COMP: 1",
-    "configuracio": "2n COMP: 2 (beak2_open_srpead)",
-    "configuracio_ma_dominant": "2n COMP: 2 (beak2_open_srpead)",
-    "configuracio_ma_no_dominant": null,
-    "canvi_configuracio": null,
-    "relacio_articuladors": null,
-    "relacio_articuladors_ma_dominant": null,
-    "relacio_articuladors_ma_no_dominant": null,
-    "localitzacio": "2n COMP: Espai neutre",
-    "orientacio_moviment": null,
-    "orientacio_localitzacio": "2n COMP: Inclinació",
-    "canvi_orientacio": null,
-    "tipus_contacte": null,
-    "forma_moviment": "2n COMP: No",
-    "direccio_moviment": null,
-    "moviment_repetit": null,
-    "vocalitzacio": null,
-    "component_no_manual": null
-  },
-  "morfologia_sequencial": {
-    "compost_1": "GERMÀ",
-    "compost_2": "SEGON",
-    "compost_3": null
-  },
-  "morfologia_simultania": [],
-  "morfologia_abreujada": [
-    {
-      "glossa_abreujada": null,
-      "rol_en_aquest_signe": null
-    }
-  ],
-  "minimal_pairs": [],
-  "iconicity": "Sí",
-  "entitat_amb_nom": null,
-  "camp_semantic": "Família",
-  "valencia": "",
-  "signes_claus": [],
-  "related_signs": {
-    "HOMÒNIM": [],
-    "SINÒNIM": [],
-    "VARIANT": [
-      "BESSONS-T_antiga"
-    ],
-    "ANTÒNIM": [],
-    "HIPÒNIM": [],
-    "HIPERÒNIM": [],
-    "VEURE TAMBÉ": []
-  },
-  "relacio_signes_forasters": {
-    "prestec": null,
-    "llengua_relacionada": null,
-    "glossa_llengua_relacionada": null
-  },
-  "categories": [
-    "Família"
-  ],
-  "occ_general": [
-    "MARTÍN & ALVARADO",
-    "PERELLÓ & FRÍGOLA",
-    "FERRERONS",
-    "DILSCAT",
-    "MIRA QUÈ DIC",
-    "VOCABULARI BÀSIC",
-    "MATERIAL FESOCA"
-  ],
-  "occ_learning": [
-    "A1 JUAN VALENZUELA",
-    "A1",
-    "A2",
-    "APRENEM 1",
-    "APRENEM 2"
-  ],
-  "occ_specific": [
-    "MEDICINES",
-    "ÀREES MEDI NATURAL",
-    "ÀREES MEDI SOCIAL",
-    "ALIMENTS",
-    "ANIMALS",
-    "LÀMINES GENERALITAT",
-    "El GENÍS I LA SANITAT",
-    "EL GENÍS I L’EDUCACIÓ",
-    "RECULL TOPONÍMIC",
-    "53 MALES MANERES",
-    "HISTÒRIA FILOSOFIA",
-    "ÀGILS COMUNICACIÓ",
-    "SIGNAPP"
-  ],
-  "notes": "Observacions: Vist per Santi",
-  "video_url": "https://drive.google.com/file/d/1f8YqJU_Lne5Az0o8gyAR1CAPKE3CbA8x/view?usp=sharing",
-  "docx_path": "data/FITXES_ENTRADES/1420_02 BESSONS-1d.docx",
-  "is_compound": true,
-  "compound_signs": [
-    "GERMÀ",
-    "SEGON"
-  ],
-  "phonology_parts": {
-    "nombre_mans": {
-      "2": "1"
-    },
-    "configuracio": {
-      "2": "2 (beak2_open_srpead)"
-    },
-    "configuracio_ma_dominant": {
-      "2": "2 (beak2_open_srpead)"
-    },
-    "localitzacio": {
-      "2": "Espai neutre"
-    },
-    "orientacio_localitzacio": {
-      "2": "Inclinació"
-    },
-    "forma_moviment": {
-      "2": "No"
-    }
-  },
-  "vocab_warnings": {
-    "orientacio_localitzacio": "2n COMP: Inclinació"
-  }
-}
\ No newline at end of file
diff --git a/Examples/bessons-1d.json b/Examples/bessons-1d.json
new file mode 100644
index 0000000..3dd7f58
--- /dev/null
+++ b/Examples/bessons-1d.json
@@ -0,0 +1,264 @@
+{
+  "gloss_id": "1420_02_bessons-1d",
+  "gloss_name": "BESSONS-1d",
+  "definition": "Adj- Nat d’un mateix part, amb un altre o altres",
+  "definitions": [
+    "Adj- Nat d’un mateix part, amb un altre o altres"
+  ],
+  "translations": {
+    "english": "TWINS",
+    "spanish": "GEMELOS",
+    "catalan": null
+  },
+  "phonology": null,
+  "compound": {
+    "is_compound": true,
+    "components": [
+      {
+        "ordinal": 1,
+        "name": "GERMÀ",
+        "comp_id": "0165_dona_germa",
+        "redundant": true,
+        "phonology": {
+          "nombre_mans": "1",
+          "configuracio_ma_dominant": null,
+          "configuracio_ma_no_dominant": null,
+          "canvi_configuracio": null,
+          "relacio_articuladors_ma_dominant": null,
+          "relacio_articuladors_ma_no_dominant": null,
+          "localitzacio": "Espai neutre",
+          "orientacio_moviment": null,
+          "orientacio_localitzacio": null,
+          "canvi_orientacio": "Inclinació",
+          "tipus_contacte": null,
+          "forma_moviment": null,
+          "direccio_moviment": null,
+          "moviment_repetit": "No",
+          "vocalitzacio": null,
+          "component_no_manual": null
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "SEGON",
+        "comp_id": null,
+        "redundant": false,
+        "phonology": {
+          "nombre_mans": "1",
+          "configuracio_ma_dominant": null,
+          "configuracio_ma_no_dominant": null,
+          "canvi_configuracio": null,
+          "relacio_articuladors_ma_dominant": null,
+          "relacio_articuladors_ma_no_dominant": null,
+          "localitzacio": "Espai neutre",
+          "orientacio_moviment": null,
+          "orientacio_localitzacio": null,
+          "canvi_orientacio": "Inclinació",
+          "tipus_contacte": null,
+          "forma_moviment": null,
+          "direccio_moviment": null,
+          "moviment_repetit": "No",
+          "vocalitzacio": null,
+          "component_no_manual": null
+        }
+      }
+    ]
+  },
+  "iconicity": "SÍ (2 germans)",
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": [],
+    "VARIANT": [
+      "BESSONS-T_antiga"
+    ],
+    "ANTÒNIM": [],
+    "HIPÒNIM": [],
+    "HIPERÒNIM": [],
+    "VEURE TAMBÉ": []
+  },
+  "synonyms": [
+    "GERMÀ+Conf 2"
+  ],
+  "categories": [
+    "Família"
+  ],
+  "entitat_amb_nom": null,
+  "valencia": null,
+  "signes_claus": [],
+  "relacio_signes_forasters": {
+    "prestec": null,
+    "llengua_relacionada": null,
+    "glossa_llengua_relacionada": null
+  },
+  "morfologia_simultania": [],
+  "morfologia_abreujada": [
+    {
+      "glossa_abreujada": null,
+      "rol_en_aquest_signe": null
+    }
+  ],
+  "minimal_pairs": [],
+  "corpus_forms": [
+    "NOMÉS APAREIX ALS MATERIALS"
+  ],
+  "lexical_category": "Adjectiu",
+  "annotations": [],
+  "occurrences": {
+    "general": [
+      {
+        "source": "MARTÍN & ALVARADO",
+        "appears": "ALTRE",
+        "gloss": "Conf T_antiga"
+      },
+      {
+        "source": "PERELLÓ & FRÍGOLA",
+        "appears": "ALTRE",
+        "gloss": "Conf T_antiga"
+      },
+      {
+        "source": "FERRERONS",
+        "appears": "ALTRE",
+        "gloss": "Conf T_antiga i GEMANS + ACOMPANYAR-6"
+      },
+      {
+        "source": "DILSCAT",
+        "appears": "SÍ",
+        "gloss": "BESSONS 2"
+      },
+      {
+        "source": "MIRA QUÈ DIC",
+        "appears": "ALTRE",
+        "gloss": "Conf T_antiga + NENS"
+      },
+      {
+        "source": "VOCABULARI BÀSIC",
+        "appears": "ALTRE",
+        "gloss": "Conf T_antiga"
+      },
+      {
+        "source": "MATERIAL FESOCA",
+        "appears": "ALTRE",
+        "gloss": "Conf T_antiga"
+      }
+    ],
+    "learning": [
+      {
+        "source": "A1 JUAN VALENZUELA",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "A1",
+        "appears": "ALTRE",
+        "gloss": "Conf T_antiga"
+      },
+      {
+        "source": "A2",
+        "appears": "ALTRE",
+        "gloss": "Només 2n compost"
+      },
+      {
+        "source": "APRENEM 1",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "APRENEM 2",
+        "appears": "NO",
+        "gloss": null
+      }
+    ],
+    "specific": [
+      {
+        "source": "MEDICINES",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ÀREES MEDI NATURAL",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ÀREES MEDI SOCIAL",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ALIMENTS",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ANIMALS",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "LÀMINES GENERALITAT",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "El GENÍS I LA SANITAT",
+        "appears": null,
+        "gloss": null
+      },
+      {
+        "source": "EL GENÍS I L’EDUCACIÓ",
+        "appears": null,
+        "gloss": null
+      },
+      {
+        "source": "RECULL TOPONÍMIC",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "53 MALES MANERES",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "HISTÒRIA FILOSOFIA",
+        "appears": null,
+        "gloss": null
+      },
+      {
+        "source": "ÀGILS COMUNICACIÓ",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "SIGNAPP",
+        "appears": "ALTRE",
+        "gloss": "Conf B i glossat BESSONS / BESSONES (diferents)"
+      }
+    ],
+    "web": [
+      {
+        "source": "SANTI FRÍGOLA",
+        "appears": "NO",
+        "gloss": null
+      }
+    ]
+  },
+  "video_urls": [
+    {
+      "url": "https://drive.google.com/file/d/1f8YqJU_Lne5Az0o8gyAR1CAPKE3CbA8x/view?usp=sharing",
+      "source": "IEC Fitxes Entrades",
+      "description": null,
+      "thumbnail_url": null
+    }
+  ],
+  "iec_metadata": {
+    "entry_id": "1420_02_bessons-1d",
+    "entry_date": null,
+    "last_modified": null,
+    "contributor": null,
+    "status": null,
+    "notes": null
+  },
+  "notes": "Observacions: Vist per Santi",
+  "schema_version": 2
+}
\ No newline at end of file
diff --git a/Examples/bessons.json b/Examples/bessons.json
new file mode 100644
index 0000000..274e06f
--- /dev/null
+++ b/Examples/bessons.json
@@ -0,0 +1,506 @@
+{
+  "1419_01_bessons-t_antiga": {
+    "gloss_id": "1419_01_bessons-t_antiga",
+    "gloss_name": "BESSONS-T_antiga",
+    "definition": "Adj- Nat d’un mateix part, amb un altre o altres .\n\nNom - Joc de botons dobles per a cordar els punys de les camises.",
+    "definitions": [
+      "Adj- Nat d’un mateix part, amb un altre o altres .",
+      "Nom - Joc de botons dobles per a cordar els punys de les camises."
+    ],
+    "translations": {
+      "english": "TWINS / BUTTON",
+      "spanish": "GEMELOS / BOTÓN DE PUÑO",
+      "catalan": null
+    },
+    "phonology": {
+      "nombre_mans": "2a",
+      "configuracio_ma_dominant": "T_antiga (Money)",
+      "configuracio_ma_no_dominant": "T_antiga (Money)",
+      "canvi_configuracio": "No",
+      "relacio_articuladors_ma_dominant": "Sota",
+      "relacio_articuladors_ma_no_dominant": "Sota",
+      "localitzacio": "Canell",
+      "orientacio_moviment": null,
+      "orientacio_localitzacio": null,
+      "canvi_orientacio": null,
+      "tipus_contacte": "Continu",
+      "forma_moviment": null,
+      "direccio_moviment": null,
+      "moviment_repetit": "No",
+      "vocalitzacio": null,
+      "component_no_manual": null
+    },
+    "compound": {
+      "is_compound": false,
+      "components": []
+    },
+    "iconicity": "No",
+    "related_signs": {
+      "HOMÒNIM": [],
+      "SINÒNIM": [
+        "BOTÓ-Oe-mm"
+      ],
+      "VARIANT": [
+        "BESSONS-1d"
+      ],
+      "ANTÒNIM": [],
+      "HIPÒNIM": [],
+      "HIPERÒNIM": [],
+      "VEURE TAMBÉ": []
+    },
+    "synonyms": [
+      "BOTONS DE PUNY"
+    ],
+    "categories": [
+      "Família"
+    ],
+    "entitat_amb_nom": null,
+    "valencia": null,
+    "signes_claus": [],
+    "relacio_signes_forasters": {
+      "prestec": null,
+      "llengua_relacionada": null,
+      "glossa_llengua_relacionada": null
+    },
+    "morfologia_simultania": [],
+    "morfologia_abreujada": [
+      {
+        "glossa_abreujada": null,
+        "rol_en_aquest_signe": null
+      }
+    ],
+    "minimal_pairs": [
+      {
+        "sign": "BOTO-Oe",
+        "description": "Configuració"
+      }
+    ],
+    "corpus_forms": [
+      "NOMÉS APAREIX ALS MATERIALS"
+    ],
+    "lexical_category": "Adjectiu o nom",
+    "annotations": [],
+    "occurrences": {
+      "general": [
+        {
+          "source": "MARTÍN & ALVARADO",
+          "appears": "SÍ",
+          "gloss": "BESSÓ"
+        },
+        {
+          "source": "PERELLÓ & FRÍGOLA",
+          "appears": "SÍ",
+          "gloss": "BESSÓ"
+        },
+        {
+          "source": "FERRERONS",
+          "appears": "SÍ",
+          "gloss": "BOTONS DE PUNY"
+        },
+        {
+          "source": "DILSCAT",
+          "appears": "SÍ",
+          "gloss": "BESSONS"
+        },
+        {
+          "source": "MIRA QUÈ DIC",
+          "appears": "SÍ",
+          "gloss": "BESSONS (afegeix nens)"
+        },
+        {
+          "source": "VOCABULARI BÀSIC",
+          "appears": "SÍ",
+          "gloss": "BESSONS"
+        },
+        {
+          "source": "MATERIAL FESOCA",
+          "appears": "SÍ",
+          "gloss": "BESSONS / BESSONES"
+        }
+      ],
+      "learning": [
+        {
+          "source": "A1 JUAN VALENZUELA",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "A1",
+          "appears": "SÍ",
+          "gloss": "BESSONS; GEMINIS"
+        },
+        {
+          "source": "A2",
+          "appears": "ALTRE",
+          "gloss": "Conf 2"
+        },
+        {
+          "source": "APRENEM 1",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "APRENEM 2",
+          "appears": "NO",
+          "gloss": null
+        }
+      ],
+      "specific": [
+        {
+          "source": "MEDICINES",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ÀREES MEDI NATURAL",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ÀREES MEDI SOCIAL",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ALIMENTS",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ANIMALS",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "LÀMINES GENERALITAT",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "El GENÍS I LA SANITAT",
+          "appears": null,
+          "gloss": null
+        },
+        {
+          "source": "EL GENÍS I L’EDUCACIÓ",
+          "appears": null,
+          "gloss": null
+        },
+        {
+          "source": "RECULL TOPONÍMIC",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "53 MALES MANERES",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "HISTÒRIA FILOSOFIA",
+          "appears": null,
+          "gloss": null
+        },
+        {
+          "source": "ÀGILS COMUNICACIÓ",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "SINGAPP",
+          "appears": "SÍ",
+          "gloss": "BESSONS / BESSONES (iguls)"
+        }
+      ],
+      "web": [
+        {
+          "source": "SANTI FRÍGOLA",
+          "appears": "NO",
+          "gloss": null
+        }
+      ]
+    },
+    "video_urls": [
+      {
+        "url": "https://drive.google.com/file/d/1ZfPH3SKPqVAlUH87pmJQfw3WCwDE47ij/view?usp=sharing",
+        "source": "IEC Fitxes Entrades",
+        "description": null,
+        "thumbnail_url": null
+      }
+    ],
+    "iec_metadata": {
+      "entry_id": "1419_01_bessons-t_antiga",
+      "entry_date": null,
+      "last_modified": null,
+      "contributor": null,
+      "status": null,
+      "notes": null
+    },
+    "notes": "Observacions: LALI (22/05/2024): He afegit el parell mínim BOTÓ-Oe, la variant BOTÓ-Oe i el sinònim BOTÓ-0",
+    "schema_version": 2
+  },
+  "1420_02_bessons-1d": {
+    "gloss_id": "1420_02_bessons-1d",
+    "gloss_name": "BESSONS-1d",
+    "definition": "Adj- Nat d’un mateix part, amb un altre o altres",
+    "definitions": [
+      "Adj- Nat d’un mateix part, amb un altre o altres"
+    ],
+    "translations": {
+      "english": "TWINS",
+      "spanish": "GEMELOS",
+      "catalan": null
+    },
+    "phonology": null,
+    "compound": {
+      "is_compound": true,
+      "components": [
+        {
+          "ordinal": 1,
+          "name": "GERMÀ",
+          "comp_id": "0165_dona_germa",
+          "redundant": true,
+          "phonology": {
+            "nombre_mans": "1",
+            "configuracio_ma_dominant": null,
+            "configuracio_ma_no_dominant": null,
+            "canvi_configuracio": null,
+            "relacio_articuladors_ma_dominant": null,
+            "relacio_articuladors_ma_no_dominant": null,
+            "localitzacio": "Espai neutre",
+            "orientacio_moviment": null,
+            "orientacio_localitzacio": null,
+            "canvi_orientacio": "Inclinació",
+            "tipus_contacte": null,
+            "forma_moviment": null,
+            "direccio_moviment": null,
+            "moviment_repetit": "No",
+            "vocalitzacio": null,
+            "component_no_manual": null
+          }
+        },
+        {
+          "ordinal": 2,
+          "name": "SEGON",
+          "comp_id": null,
+          "redundant": false,
+          "phonology": {
+            "nombre_mans": "1",
+            "configuracio_ma_dominant": null,
+            "configuracio_ma_no_dominant": null,
+            "canvi_configuracio": null,
+            "relacio_articuladors_ma_dominant": null,
+            "relacio_articuladors_ma_no_dominant": null,
+            "localitzacio": "Espai neutre",
+            "orientacio_moviment": null,
+            "orientacio_localitzacio": null,
+            "canvi_orientacio": "Inclinació",
+            "tipus_contacte": null,
+            "forma_moviment": null,
+            "direccio_moviment": null,
+            "moviment_repetit": "No",
+            "vocalitzacio": null,
+            "component_no_manual": null
+          }
+        }
+      ]
+    },
+    "iconicity": "SÍ (2 germans)",
+    "related_signs": {
+      "HOMÒNIM": [],
+      "SINÒNIM": [],
+      "VARIANT": [
+        "BESSONS-T_antiga"
+      ],
+      "ANTÒNIM": [],
+      "HIPÒNIM": [],
+      "HIPERÒNIM": [],
+      "VEURE TAMBÉ": []
+    },
+    "synonyms": [
+      "GERMÀ+Conf 2"
+    ],
+    "categories": [
+      "Família"
+    ],
+    "entitat_amb_nom": null,
+    "valencia": null,
+    "signes_claus": [],
+    "relacio_signes_forasters": {
+      "prestec": null,
+      "llengua_relacionada": null,
+      "glossa_llengua_relacionada": null
+    },
+    "morfologia_simultania": [],
+    "morfologia_abreujada": [
+      {
+        "glossa_abreujada": null,
+        "rol_en_aquest_signe": null
+      }
+    ],
+    "minimal_pairs": [],
+    "corpus_forms": [
+      "NOMÉS APAREIX ALS MATERIALS"
+    ],
+    "lexical_category": "Adjectiu",
+    "annotations": [],
+    "occurrences": {
+      "general": [
+        {
+          "source": "MARTÍN & ALVARADO",
+          "appears": "ALTRE",
+          "gloss": "Conf T_antiga"
+        },
+        {
+          "source": "PERELLÓ & FRÍGOLA",
+          "appears": "ALTRE",
+          "gloss": "Conf T_antiga"
+        },
+        {
+          "source": "FERRERONS",
+          "appears": "ALTRE",
+          "gloss": "Conf T_antiga i GEMANS + ACOMPANYAR-6"
+        },
+        {
+          "source": "DILSCAT",
+          "appears": "SÍ",
+          "gloss": "BESSONS 2"
+        },
+        {
+          "source": "MIRA QUÈ DIC",
+          "appears": "ALTRE",
+          "gloss": "Conf T_antiga + NENS"
+        },
+        {
+          "source": "VOCABULARI BÀSIC",
+          "appears": "ALTRE",
+          "gloss": "Conf T_antiga"
+        },
+        {
+          "source": "MATERIAL FESOCA",
+          "appears": "ALTRE",
+          "gloss": "Conf T_antiga"
+        }
+      ],
+      "learning": [
+        {
+          "source": "A1 JUAN VALENZUELA",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "A1",
+          "appears": "ALTRE",
+          "gloss": "Conf T_antiga"
+        },
+        {
+          "source": "A2",
+          "appears": "ALTRE",
+          "gloss": "Només 2n compost"
+        },
+        {
+          "source": "APRENEM 1",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "APRENEM 2",
+          "appears": "NO",
+          "gloss": null
+        }
+      ],
+      "specific": [
+        {
+          "source": "MEDICINES",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ÀREES MEDI NATURAL",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ÀREES MEDI SOCIAL",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ALIMENTS",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "ANIMALS",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "LÀMINES GENERALITAT",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "El GENÍS I LA SANITAT",
+          "appears": null,
+          "gloss": null
+        },
+        {
+          "source": "EL GENÍS I L’EDUCACIÓ",
+          "appears": null,
+          "gloss": null
+        },
+        {
+          "source": "RECULL TOPONÍMIC",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "53 MALES MANERES",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "HISTÒRIA FILOSOFIA",
+          "appears": null,
+          "gloss": null
+        },
+        {
+          "source": "ÀGILS COMUNICACIÓ",
+          "appears": "NO",
+          "gloss": null
+        },
+        {
+          "source": "SIGNAPP",
+          "appears": "ALTRE",
+          "gloss": "Conf B i glossat BESSONS / BESSONES (diferents)"
+        }
+      ],
+      "web": [
+        {
+          "source": "SANTI FRÍGOLA",
+          "appears": "NO",
+          "gloss": null
+        }
+      ]
+    },
+    "video_urls": [
+      {
+        "url": "https://drive.google.com/file/d/1f8YqJU_Lne5Az0o8gyAR1CAPKE3CbA8x/view?usp=sharing",
+        "source": "IEC Fitxes Entrades",
+        "description": null,
+        "thumbnail_url": null
+      }
+    ],
+    "iec_metadata": {
+      "entry_id": "1420_02_bessons-1d",
+      "entry_date": null,
+      "last_modified": null,
+      "contributor": null,
+      "status": null,
+      "notes": null
+    },
+    "notes": "Observacions: Vist per Santi",
+    "schema_version": 2
+  }
+}
\ No newline at end of file
diff --git a/Examples/cervesa.json b/Examples/cervesa.json
new file mode 100644
index 0000000..8d318f3
--- /dev/null
+++ b/Examples/cervesa.json
@@ -0,0 +1,232 @@
+{
+  "gloss_id": "0764_01_cervesa",
+  "gloss_name": "CERVESA",
+  "definition": "Nom – Beguda fermentada preparada a partir de cereals germinats, especialment ordi, i aromatitzada amb llúpol.",
+  "definitions": [
+    "Nom – Beguda fermentada preparada a partir de cereals germinats, especialment ordi, i aromatitzada amb llúpol."
+  ],
+  "translations": {
+    "english": "BEER",
+    "spanish": "CERVEZA",
+    "catalan": null
+  },
+  "phonology": {
+    "nombre_mans": "2a",
+    "configuracio_ma_dominant": "B (B)",
+    "configuracio_ma_no_dominant": "0_SSI (O)",
+    "canvi_configuracio": "No",
+    "relacio_articuladors_ma_dominant": "Damunt",
+    "relacio_articuladors_ma_no_dominant": "Sota",
+    "localitzacio": "Mà no-dominant: costat polze",
+    "orientacio_moviment": "Palm",
+    "orientacio_localitzacio": "AO: palm-down",
+    "canvi_orientacio": "Flexió > Extensió",
+    "tipus_contacte": "Final",
+    "forma_moviment": null,
+    "direccio_moviment": "Cap a la localització",
+    "moviment_repetit": "Sí",
+    "vocalitzacio": null,
+    "component_no_manual": null
+  },
+  "compound": {
+    "is_compound": false,
+    "components": []
+  },
+  "iconicity": "Sí",
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": [],
+    "VARIANT": [],
+    "ANTÒNIM": [],
+    "HIPÒNIM": [],
+    "HIPERÒNIM": [],
+    "VEURE TAMBÉ": []
+  },
+  "synonyms": [],
+  "categories": [
+    "Aliment"
+  ],
+  "entitat_amb_nom": null,
+  "valencia": null,
+  "signes_claus": [],
+  "relacio_signes_forasters": {
+    "prestec": null,
+    "llengua_relacionada": null,
+    "glossa_llengua_relacionada": null
+  },
+  "morfologia_simultania": [],
+  "morfologia_abreujada": [
+    {
+      "glossa_abreujada": null,
+      "rol_en_aquest_signe": null
+    }
+  ],
+  "minimal_pairs": [
+    {
+      "sign": "TAPAR-5",
+      "description": "Moviment simple vs. repetit"
+    },
+    {
+      "sign": "VÀTER-B",
+      "description": "???? (potser són iguals)"
+    }
+  ],
+  "corpus_forms": [
+    "NOMÉS APAREIX ALS MATERIALS"
+  ],
+  "lexical_category": "Nom",
+  "annotations": [],
+  "occurrences": {
+    "general": [
+      {
+        "source": "MARTÍN & ALVARADO",
+        "appears": "ALTRE",
+        "gloss": "Conf B"
+      },
+      {
+        "source": "PERELLÓ & FRÍGOLA",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      },
+      {
+        "source": "FERRERONS",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      },
+      {
+        "source": "DILSCAT",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      },
+      {
+        "source": "MIRA QUÈ DIC",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      },
+      {
+        "source": "VOCABULARI BÀSIC",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      }
+    ],
+    "learning": [
+      {
+        "source": "A1 JUAN VALENZUELA",
+        "appears": "SÍ",
+        "gloss": "No hi ha glossa"
+      },
+      {
+        "source": "A1",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      },
+      {
+        "source": "A2",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      },
+      {
+        "source": "APRENEM 1",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "APRENEM 2",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      }
+    ],
+    "specific": [
+      {
+        "source": "MEDICINES",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ÀREES MEDI SOCIAL",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ÀREES MEDI NATURAL",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ALIMENTS",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      },
+      {
+        "source": "ANIMALS",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "LÀMINES GENERALITAT",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "El GENÍS I LA SANITAT",
+        "appears": null,
+        "gloss": null
+      },
+      {
+        "source": "EL GENÍS I L’EDUCACIÓ",
+        "appears": null,
+        "gloss": null
+      },
+      {
+        "source": "RECULL TOPONÍMIC",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "53 MALES MANERES",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "HISTÒRIA FILOSOFIA",
+        "appears": null,
+        "gloss": null
+      },
+      {
+        "source": "ÀGILS COMUNICACIÓ",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "SIGNAPP",
+        "appears": "SÍ",
+        "gloss": "CERVESA"
+      }
+    ],
+    "web": [
+      {
+        "source": "SANTI FRÍGOLA",
+        "appears": "NO",
+        "gloss": null
+      }
+    ]
+  },
+  "video_urls": [
+    {
+      "url": "https://drive.google.com/file/d/1JELU8mXStloevsXlyBnO3jXWj7p-QxP0/view?usp=sharing",
+      "source": "IEC Fitxes Entrades",
+      "description": null,
+      "thumbnail_url": null
+    }
+  ],
+  "iec_metadata": {
+    "entry_id": "0764_01_cervesa",
+    "entry_date": null,
+    "last_modified": null,
+    "contributor": null,
+    "status": null,
+    "notes": null
+  },
+  "notes": "Observacions: LALI (2/12/2024): He fet una fitxa per VÀTER-B però no hi veig la diferència amb CERVESA.",
+  "schema_version": 2
+}
\ No newline at end of file
diff --git a/Examples/menjar.json b/Examples/menjar.json
new file mode 100644
index 0000000..1a8b454
--- /dev/null
+++ b/Examples/menjar.json
@@ -0,0 +1,269 @@
+{
+  "gloss_id": "0001_menjar",
+  "gloss_name": "MENJAR",
+  "definition": "Verb- Dur un aliment sòlid a la boca, mastegar-lo i empassar-lo.\n\n. Tomar la comida\n Gastar, consumir o desbaratar\n\nNom- Producte natural o elaborat que proporciona als éssers vius energia, substàncies formadores de les estructures de l’organisme i els compostos químics indispensables per al bon funcionament o la regulació dels mecanismes vitals.\nConjunto de sustancias que los seres vivos comen para subsistir",
+  "definitions": [
+    "Verb- Dur un aliment sòlid a la boca, mastegar-lo i empassar-lo.\n\n. Tomar la comida\n Gastar, consumir o desbaratar",
+    "Nom- Producte natural o elaborat que proporciona als éssers vius energia, substàncies formadores de les estructures de l’organisme i els compostos químics indispensables per al bon funcionament o la regulació dels mecanismes vitals.\nConjunto de sustancias que los seres vivos comen para subsistir"
+  ],
+  "translations": {
+    "english": "EAT; FOOD; MEAL",
+    "spanish": "COMER; COMIDA",
+    "catalan": null
+  },
+  "phonology": {
+    "nombre_mans": "1",
+    "configuracio_ma_dominant": "Q (Beak)",
+    "configuracio_ma_no_dominant": null,
+    "canvi_configuracio": "No",
+    "relacio_articuladors_ma_dominant": null,
+    "relacio_articuladors_ma_no_dominant": null,
+    "localitzacio": "Boca",
+    "orientacio_moviment": "Punta dels dits (finger tips)",
+    "orientacio_localitzacio": null,
+    "canvi_orientacio": "Extensió > Flexió",
+    "tipus_contacte": null,
+    "forma_moviment": null,
+    "direccio_moviment": null,
+    "moviment_repetit": "SÍ",
+    "vocalitzacio": "Pot aparèixer amb vocalització",
+    "component_no_manual": null
+  },
+  "compound": {
+    "is_compound": false,
+    "components": []
+  },
+  "iconicity": "Sí",
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": [],
+    "VARIANT": [
+      "CONSUM"
+    ],
+    "ANTÒNIM": [],
+    "HIPÒNIM": [],
+    "HIPERÒNIM": [],
+    "VEURE TAMBÉ": []
+  },
+  "synonyms": [
+    "ALIMENTACIÓ",
+    "ALIMENT",
+    "APROFITAR-SE-lfp",
+    "VIANDA",
+    "ÀPAT",
+    "MANDUCA",
+    "NODRIR",
+    "CONSUM"
+  ],
+  "categories": [
+    "Acte físic"
+  ],
+  "entitat_amb_nom": null,
+  "valencia": "Verb transitiu",
+  "signes_claus": [
+    {
+      "glosses": [
+        "COSA",
+        "ANIMAL",
+        "VIURE",
+        "FALTAR",
+        "PER-A",
+        "SALVAR",
+        "SOBREVIURE"
+      ],
+      "comment": null
+    },
+    {
+      "glosses": [
+        "TRAGAR",
+        "ALIMENTO",
+        "COMBUSTIBLE-XUCLAR"
+      ],
+      "comment": "Proposta Lali (03/12/2025): GRUP + COSA + IX1-substàncies + ANIMAL + PLANTA + O + DIVERSOS-2d + VIURE + MENJAR + O  + XUCLAR-0e + HAVER-DE +  PER-A + SOBREVIURE  - Grup de substàncies que els animals, plantes o altres essers vius han de menjar o absorbir (xuclar?) per sobreviure.\n\nProposta Lali (26(01/2026): DESAPARÈIXER + MOTIU-bm + USAR + DESPESA – Desparèixer amb motiu de l’ús; despesa."
+    }
+  ],
+  "relacio_signes_forasters": {
+    "prestec": null,
+    "llengua_relacionada": null,
+    "glossa_llengua_relacionada": null
+  },
+  "morfologia_simultania": [
+    {
+      "glossa_morfema": "Classificador descriptiu",
+      "significat_en_aquest_signe": "Forma de l’aliment que es menja"
+    }
+  ],
+  "morfologia_abreujada": [
+    {
+      "glossa_abreujada": null,
+      "rol_en_aquest_signe": null
+    }
+  ],
+  "minimal_pairs": [
+    {
+      "sign": "EMPASSAR-SE",
+      "description": "Moviment simple vs. repetit"
+    }
+  ],
+  "corpus_forms": [
+    "MENJAR",
+    "MENJAR-rep",
+    "MENJAR-S'HO",
+    "MENJAR-lfp"
+  ],
+  "lexical_category": "Nom o verb",
+  "annotations": [],
+  "occurrences": {
+    "general": [
+      {
+        "source": "MARTÍN & ALVARADO",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "PERELLÓ & FRÍGOLA",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "FERRERONS",
+        "appears": "SÍ",
+        "gloss": "MENAR; ALIMENT 2; ÀPAT; ALIMENTAR-SE; ALIMENTACIÓ; DIETA; VIANDA, NODRIR, MANDUCA, etc."
+      },
+      {
+        "source": "DILSCAT",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "MIRA QUÈ DIC",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "VOCABULARI BÀSIC",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      }
+    ],
+    "learning": [
+      {
+        "source": "A1 JUAN VALENZUELA",
+        "appears": "SÍ",
+        "gloss": "ALIMENT"
+      },
+      {
+        "source": "A1",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "A2",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "APRENEM 1",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "APRENEM 2",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      }
+    ],
+    "specific": [
+      {
+        "source": "MEDICINES",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "ÀREES MEDI SOCIAL",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ÀREES MEDI NATURAL",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "ALIMENTS",
+        "appears": "SÍ",
+        "gloss": "MENJAR"
+      },
+      {
+        "source": "ANIMALS",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "LÀMINES GENERALITAT",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "El GENÍS I LA SANITATSÍ",
+        "appears": "SÍ",
+        "gloss": "No hi ha glossa"
+      },
+      {
+        "source": "EL GENÍS I L’EDUCACIÓ",
+        "appears": "SÍ",
+        "gloss": "No hi ha glossa"
+      },
+      {
+        "source": "RECULL TOPONÍMIC",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "53 MALES MANERES",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "HISTÒRIA FILOSOFIA",
+        "appears": null,
+        "gloss": null
+      },
+      {
+        "source": "ÀGILS COMUNICACIÓ",
+        "appears": "NO",
+        "gloss": null
+      },
+      {
+        "source": "SIGNAPP",
+        "appears": "SÍ",
+        "gloss": "ALIMENTACIÓ; CONSUM"
+      }
+    ],
+    "web": [
+      {
+        "source": "SANTI FRÍGOLA",
+        "appears": "SÍ",
+        "gloss": "ALIMENTACIÓ"
+      }
+    ]
+  },
+  "video_urls": [
+    {
+      "url": "https://drive.google.com/file/d/155WTLpNgEXR3X9eSQ2Xbdq1HPJ0bK84_/view?usp=sharing",
+      "source": "IEC Fitxes Entrades",
+      "description": null,
+      "thumbnail_url": null
+    }
+  ],
+  "iec_metadata": {
+    "entry_id": "0001_menjar",
+    "entry_date": null,
+    "last_modified": null,
+    "contributor": null,
+    "status": null,
+    "notes": "OMISSIÓ, NUTRICIÓ, NODRIR, ENGOLIR"
+  },
+  "notes": "Observacions: Vist Santi\nSigne “Alimentació” utilitzar \"menjar + diferents\"\nVist Delfi \nLALI (20/5/2022): He afegit una fitxa per ALIMENTACIÓ\nLALI (06/07/2023) He afegit el parell mínim EMPASSAR-SE\nLALI (08/09/2025): He afegit l’accepció CONSUM",
+  "schema_version": 2
+}
\ No newline at end of file
diff --git a/backend/nest-cli.json b/backend/nest-cli.json
index f9aa683..1f450e1 100644
--- a/backend/nest-cli.json
+++ b/backend/nest-cli.json
@@ -3,6 +3,12 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true
+    "deleteOutDir": true,
+    "assets": [
+      {
+        "include": "import/**/*.json",
+        "watchAssets": true
+      }
+    ]
   }
 }
diff --git a/backend/src/import/fitxa-enum-resolver.ts b/backend/src/import/fitxa-enum-resolver.ts
index 7261123..7278e49 100644
--- a/backend/src/import/fitxa-enum-resolver.ts
+++ b/backend/src/import/fitxa-enum-resolver.ts
@@ -9,7 +9,7 @@ export type FitxaMappingField = keyof typeof mappings.fields;
 
 export interface EnumResolveResult<T = string> {
   value: T | null;
-  field: string;
+  field: FitxaMappingField;
   input: string;
 }
 
diff --git a/backend/tsconfig.json b/backend/tsconfig.json
index 000fbb1..d3efbff 100644
--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -8,6 +8,7 @@
     "allowSyntheticDefaultImports": true,
     "target": "ES2021",
     "sourceMap": true,
+    "resolveJsonModule": true,
     "outDir": "./dist",
     "baseUrl": "./",
     "incremental": true,
diff --git a/docs/fitxas-import-meeting-agenda.md b/docs/fitxas-import-meeting-agenda.md
index c2c1ae5..cd23c87 100644
--- a/docs/fitxas-import-meeting-agenda.md
+++ b/docs/fitxas-import-meeting-agenda.md
@@ -2,6 +2,8 @@
 
 Document per conduir la reunió amb l'equip del diccionari / autors de fitxes LSC.
 
+> **Resultat de la reunió (decisions consolidades):** [`fitxas-import-requirements.md`](fitxas-import-requirements.md)
+
 **Data reunió:** _______________  
 **Assistents:** _______________  
 **Fitxers de mostra:** [`Examples/`](../Examples/) (`MENJAR`, `CERVESA`, `BESSONS-1d`)  
@@ -26,13 +28,6 @@ Confirmar amb l'equip que té sentit:
 | `is_compound` | Indicador visual: signe simple vs compost | `true` / `false` |
 | `compound_signs` | Llista de parts del compost | `["GERMÀ", "SEGON"]` |
 
-**Pregunta de validació:** Enllaçar cada morfema amb la seva fitxa al diccionari quan existeixi — us encaixa?
-
-**Notes reunió:**
-
-- [ ] D'acord amb morfologia seqüencial + indicador compost
-- [ ] Enllaços entre morfemes i fitxes: sí / no / més endavant
-
 ---
 
 ## 2. Camps pendents de clarificació
@@ -43,16 +38,21 @@ Confirmar amb l'equip que té sentit:
 
 | Camp | Valors d'exemple |
 |------|------------------|
-| `alt_glosses` | ALIMENTACIÓ, ÀPAT, CONSUM, VIANDA… |
+| `alt_glosses` | ALIMENTACIÓ, ÀPAT, CONSUM, VIANDA… | 
 | `corpus_forms` | MENJAR-rep, MENJAR-S'HO, MENJAR-lfp |
 | `relacio_signes_forasters` | `prestec`, `llengua_relacionada`, `glossa_llengua_relacionada` (sovint buit) |
 
 **Preguntes:**
 
 - [ ] Què són exactament `alt_glosses`? Variants de la mateixa entrada, sinònims, o entrades que haurien de ser fitxes separades?
+Altres maneres amb les que sha identificat aquesta glossa. La glossa es una paraula catalana per definir un signe. 
+Es mes per compararho amb altres corpus. En aquest sistema utilitzem menjar, pero potser en altres corpus podrien ser, alimentacio, apat...
+Es important tindreho guardat com a referencia. No caldria potser ara per ara mostrarho en pantalla.
 - [ ] Què són `corpus_forms`? Formes attestades en materials (repetició, pronoms, etc.)?
-- [ ] En què es diferencien `alt_glosses` i `corpus_forms` en la pràctica editorial?
+El mateixc pero especific per al corpus LSC.
+El guardem tambe pero no caldra mostrarlo.
 - [ ] Quan s'omple `relacio_signes_forasters`? Com es relaciona amb SINÒNIM / VARIANT / signes relacionats normals?
+De moment res.
 
 **Decisió reunió:** Importar a SignBank? ☐ Sí ☐ No ☐ Més endavant
 
@@ -72,8 +72,11 @@ Confirmar amb l'equip que té sentit:
 **Preguntes:**
 
 - [ ] Són el mateix concepte duplicat o tenen funcions diferents (camp principal vs etiquetes múltiples)?
+Sha tret camp semantic. eren duplicats
 - [ ] Un signe pot tenir diverses `categories` diferents del `camp_semantic`?
+Si
 - [ ] L'usuari del diccionari ha de poder filtrar o veure aquests camps?
+Aixo es meu
 
 **Decisió reunió:** ☐ Importar ☐ No importar ☐ Només un dels dos (quín? _______)
 
@@ -92,7 +95,9 @@ Confirmar amb l'equip que té sentit:
 | `occ_specific` | ALIMENTS, MEDICINES, ÀREES MEDI SOCIAL |
 
 **Preguntes:**
-
+Occurrencies -> occ_
+En quins diccionaris existeixen aquestes glosses.
+No es gaire rellevant. Ignorar
 - [ ] Indiquen en quins materials o contextos apareix el signe?
 - [ ] Cal mostrar-ho al diccionari públic o és metadada interna de gestió del corpus?
 - [ ] Hi ha una llista tancada de valors possibles o poden aparèixer nous lliurement?
@@ -111,171 +116,29 @@ Confirmar si cal incloure'ls o podem ajornar-los:
 | Camp | Pregunta ràpida | Decisió |
 |------|-----------------|---------|
 | `iconicity` | És útil per a l'usuari final? | ☐ Sí ☐ No |
+Si un signe es relacionable a un objecte fisic, o si la forma en que es signa mostra la accio.
+Caminar, es fer moviment de caminar amb els dits. es iconic.
+Jo el guardaria, per tindrel mes que res.
+La posarem a nivell de signe. 
 | `valencia` | Només per verbs? Mostrar sempre? | ☐ Sí ☐ No |
+Es transitiu o no. Confiar en algo o algu. Posemlo a nivell de fitxa.
 | `signes_claus` | Què són els grups de glosses + comentari? | ☐ Sí ☐ No |
+Definicio en llengua de signes. Signes necessaris per definir un signe.
+Aixo es podria posar al costat de les definicionas
 | `morfologia_simultania` | Cal mostrar-la com la seqüencial? | ☐ Sí ☐ No |
+Seria de un compost, en comptes de ser sequencial, els signes es fan alhora
 | `morfologia_abreujada` | Cal mostrar-la? | ☐ Sí ☐ No |
+No sabem que es, pero imaginem que son tambe de compost. PREGUNTAR LALI?
 | `entitat_amb_nom` | Quan s'usa? | ☐ Sí ☐ No |
+Guardar.
 
-**Notes:**
-
----
-
-## 3. Parsing i vocabulari tancat (ENUMs)
-
-### 3.1 El problema
-
-SignBank no guarda text lliure per a la fonologia: cada camp de `phonology` del JSON s'ha de convertir en un **valor d'una llista tancada** (ENUM) a la base de dades. Si el text de la fitxa no coincideix amb els nostres valors, cal:
-
-1. **Taula de mapatge** (fitxa → SignBank), mantenint els ENUMs actuals, o  
-2. **Ampliar / canviar** els ENUMs de SignBank per reflectir el vocabulari de les fitxes, o  
-3. **Canviar l'export** del scraper perquè surti directament amb els IDs de SignBank.
-
-### 3.2 Correspondència camps JSON → SignBank
-
-| Camp JSON (`phonology`) | Camp SignBank (`VideoData`) | ENUM |
-|-------------------------|----------------------------|------|
-| `nombre_mans` | `hands` | `Hand` |
-| `configuracio` | `configuration` | `HandConfiguration` |
-| `configuracio_ma_dominant` | *(no hi ha camp separat avui)* | — |
-| `configuracio_ma_no_dominant` | *(no hi ha camp separat avui)* | — |
-| `canvi_configuracio` | `configurationChanges` | `ConfigurationChange` |
-| `relacio_articuladors` | `relationBetweenArticulators` | `RelationBetweenArticulators` |
-| `relacio_articuladors_ma_dominant` | *(no separat)* | — |
-| `relacio_articuladors_ma_no_dominant` | *(no separat)* | — |
-| `localitzacio` | `location` | `Location` |
-| `orientacio_moviment` | `movementRelatedOrientation` | `MovementRelatedOrientation` |
-| `orientacio_localitzacio` | `orientationRelatedToLocation` | `OrientationRelatedToLocation` |
-| `canvi_orientacio` | `orientationChange` | `OrientationChange` |
-| `tipus_contacte` | `contactType` | `ContactType` |
-| `forma_moviment` | `movementType` | `MovementType` |
-| `direccio_moviment` | `movementDirection` | `MovementDirection` |
-| `moviment_repetit` | `repeatedMovement` | booleà (`Sí` / `No`) |
-| `vocalitzacio` | `vocalization` | text lliure |
-| `component_no_manual` | `nonManualComponent` | text lliure |
-
-**Pregunta crítica:** Per a signes amb dues mans, les fitxes tenen valors separats per mà dominant i no dominant. SignBank avui només té **un** valor per configuració i relació entre articuladors. Cal:
-
-- [ ] Modelar mà dominant / no dominant per separat (canvi d'esquema)
-- [ ] Només guardar el valor combinat (`"B (B) /O_SSI (O)"`)
-- [ ] Altres: _______________
-
-### 3.3 Valors de mostra al JSON vs SignBank
-
-Valors reals de les 3 fitxes de mostra — discutir mapatge fila a fila:
-
-| Fitxa | Camp JSON | Valor a la fitxa | Mapa a SignBank? |
-|-------|-----------|------------------|------------------|
-| MENJAR | `nombre_mans` | `1` | → `Hand` ? |
-| MENJAR | `configuracio` | `Q (Beak)` | → `CONF_33` (Q) ? |
-| MENJAR | `localitzacio` | `Boca` | → `MOUTH` ? |
-| MENJAR | `canvi_orientacio` | `Extensió > Flexió` | → `EXTENSION_TO_FLEXION` ? |
-| MENJAR | `orientacio_moviment` | `Punta dels dits (finger tips)` | ⚠ `vocab_warnings` — no clar |
-| CERVESA | `nombre_mans` | `2a` | → `BOTH` ? |
-| CERVESA | `configuracio` | `B (B) /O_SSI (O)` | ⚠ combinat + per mà |
-| CERVESA | `relacio_articuladors` | `Damunt / Sota` | → `ABOVE_BELOW` ? |
-| CERVESA | `localitzacio` | `Mà no-dominant` | → `WEAK_HAND` ? |
-| CERVESA | `orientacio_localitzacio` | `AO: palm-down` | → `AO_PALM_DOWN` ? |
-| CERVESA | `direccio_moviment` | `Cap a la localització` | → `TOWARDS_LOCATION` ? |
-| BESSONS | `nombre_mans` | `2n COMP: 1` | ⚠ compost — com es modela? |
-| BESSONS | `localitzacio` | `2n COMP: Espai neutre` | → `NEUTRAL_SPACE` al morfema 2? |
-| BESSONS | `phonology_parts` | per morfema `2` | ⚠ v2 — cal per part? |
-
-**Notes reunió (mapatge fonologia):**
-
----
-
-### 3.4 Altres ENUMs (no fonologia)
-
-| Àmbit | Camp JSON | ENUM SignBank | Pregunta |
-|-------|-----------|---------------|----------|
-| Traduccions | `tr_ca`, `tr_es`, `tr_en` | `Language` | OK — 4 idiomes fixos |
-| Categoria | `lexical_category` | `LexicalCategory` | El text `"Nom o verb"` coincideix amb `NOUN_OR_VERB`? Llista completa a la referència |
-| Relacions | `related_signs.*` | `RelationType` | `VEURE TAMBÉ` → `ASSOCIATED_CONCEPT`? Keys en català al JSON |
-| Definicions | prefix `Verb-`, `Nom-`, `Adj-` | `LexicalCategory` | Mateix vocabulari que `lexical_category`? |
-
-**Relacions JSON → SignBank:**
-
-| Clau JSON | ENUM SignBank |
-|-----------|---------------|
-| `SINÒNIM` | `SYNONYM` |
-| `ANTÒNIM` | `ANTONYM` |
-| `HOMÒNIM` | `HOMONYM` |
-| `VARIANT` | `VARIANT` |
-| `HIPERÒNIM` | `HYPERNYM` |
-| `HIPÒNIM` | `HYPONYM` |
-| `VEURE TAMBÉ` | `ASSOCIATED_CONCEPT` |
-
-- [ ] Aquestes claus són estables a totes les fitxes?
-- [ ] Falta algun tipus de relació que useu i SignBank no té?
-
----
-
-## 4. Llista completa d'ENUMs de SignBank
-
-**Obrir durant la reunió:** [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md)
-
-Conté **tots** els valors permesos avui a SignBank, amb etiqueta en català de la UI:
-
-| ENUM | Nº valors | Relacionat amb JSON |
-|------|-----------|---------------------|
-| `Language` | 4 | `tr_*` |
-| `LexicalCategory` | 27 | `lexical_category`, prefix de definicions |
-| `RelationType` | 8 | `related_signs` |
-| `Hand` | 3 | `nombre_mans` |
-| `HandConfiguration` | 52 | `configuracio`, `configuracio_ma_*` |
-| `ConfigurationChange` | 20 | `canvi_configuracio` |
-| `RelationBetweenArticulators` | 12 | `relacio_articuladors`, `relacio_articuladors_ma_*` |
-| `Location` | 144 | `localitzacio` |
-| `MovementRelatedOrientation` | 49 | `orientacio_moviment` |
-| `OrientationRelatedToLocation` | 28 | `orientacio_localitzacio` |
-| `OrientationChange` | 17 | `canvi_orientacio` |
-| `ContactType` | 14 | `tipus_contacte` |
-| `MovementType` | 9 | `forma_moviment` |
-| `MovementDirection` | 64 | `direccio_moviment` |
-
-**Pregunta general per a cada ENUM:**
-
-> Els valors de les vostres fitxes són els mateixos que les etiquetes de la columna «Etiqueta UI (ca)», o cal una taula de correspondència? Si en falten, els afegim a SignBank o simplifiqueu l'export?
-
-**Acció acordada:**
-
-- [ ] Mantenim ENUMs SignBank + taula de mapatge (qui la fa? _______)
-- [ ] Modifiquem l'export JSON per usar IDs SignBank directament
-- [ ] Ampliem ENUMs SignBank (quins? _______)
-
----
-
-## 5. Altres temes operatius
+NOTAS
 
-| Tema | Pregunta | Decisió |
-|------|----------|---------|
-| Vídeos | `video_url` és Google Drive — tindreu fitxers `.mp4` locals per importar? | |
-| Publicació | Import directe al diccionari públic o revisió prèvia per entrada? | |
-| ID fitxa | Guardar `id` (p. ex. `0764_01_cervesa`) per traçabilitat? | ☐ Sí ☐ No |
-| Qualitat | Què fem amb `vocab_warnings` i valors dubtosos (`????` als parells mínims)? | |
+La definicio vindra en un string sense lexic category, ja que la categoria lexica ve al string, que la categoria lexica pugui ser buida. I estigui amagada.
 
-**Notes:**
-
----
-
-## 6. Accions després de la reunió
-
-| Acció | Responsable | Data |
-|-------|-------------|------|
-| Actualitzar `fitxas-import-plan.md` amb decisions | | |
-| Taula de mapatge fonologia (si s'acorda) | | |
-| Llista de camps a importar v1 | | |
-| Esquema DB (compostos + `externalId`) | | |
-
----
+Pot have configuracio ma dominant i no dominant
 
-## Annex — camps JSON no importats a v1 (referència ràpida)
+Compostos, un compost pot estar format per un video de un signe i un compost, que no te fitxa en si.
 
-| Camp | Estat |
-|------|-------|
-| `morfologia_sequencial`, `is_compound`, `compound_signs` | **v1 confirmat** |
-| `definition` (text fusionat) | No cal — redundant |
-| `vocab_warnings` | Només log d'importació |
-| `phonology_parts` | v2 (fonologia per morfema) |
-| Resta de secció 2 | Pendent decisió reunió |
+Els compostos al parseig, pretenen agafar la fonologia del compost fill. i mostrarla per columnes
+I podria ser que hi hagues un compost format per un compost. Diuen que com a maxim hi ha 2 profunditats. 
\ No newline at end of file
diff --git a/docs/fitxas-import-plan.md b/docs/fitxas-import-plan.md
index f56222b..821a87c 100644
--- a/docs/fitxas-import-plan.md
+++ b/docs/fitxas-import-plan.md
@@ -1,85 +1,12 @@
 # SignBank — Fitxas (scraped data) import plan
 
-Plan for integrating dictionary cards scraped from legacy FITXES (Word documents) into SignBank. Sample data lives in [`Examples/`](../Examples/).
+Technical implementation plan for integrating dictionary cards scraped from legacy FITXES (Word documents) into SignBank.
 
-**Last updated:** 2026-06-17  
-**Status:** Planning — no import pipeline implemented yet  
-**Sample files:** `0001_menjar.json`, `0764_01_cervesa.json`, `1420_02_bessons-1d.json`
-
----
-
-## Scope decisions (product)
-
-Fields from the scraped JSON classified by priority for SignBank v1.
-
-### Confirmed for v1 — schema + UI required
-
-| JSON field | Why it matters | Example |
-|------------|----------------|---------|
-| **`morfologia_sequencial`** | Explains how compound signs are built from ordered morphemes. Essential for understanding composed signs. | `BESSONS-1d` → `compost_1: "GERMÀ"`, `compost_2: "SEGON"` (“two brothers” = twins) |
-| **`is_compound`** | Boolean flag to distinguish simple signs from compounds in search and gloss detail. | `true` for `BESSONS-1d`, `false` for `MENJAR` |
-| **`compound_signs`** | Ordered list of gloss morphemes; pairs with sequential morphology for display. | `["GERMÀ", "SEGON"]` |
-
-**Proposed schema (Phase 1):**
-
-```prisma
-model GlossData {
-  // ... existing fields
-  isCompound              Boolean  @default(false)
-  sequentialMorphology    SequentialMorphology?
-  compoundParts           CompoundPart[]   // ordered; gloss refs + optional phonology later
-}
-
-model SequentialMorphology {
-  id          String    @id @default(uuid())
-  glossDataId String    @unique
-  glossData   GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
-  part1       String?   // maps morfologia_sequencial.compost_1
-  part2       String?   // maps morfologia_sequencial.compost_2
-  part3       String?   // maps morfologia_sequencial.compost_3
-}
-
-model CompoundPart {
-  id          String    @id @default(uuid())
-  glossDataId String
-  glossData   GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
-  position    Int       // 1, 2, 3 …
-  gloss       String    // morpheme gloss label; resolve to GlossData id when linked entry exists
-  priority    Int       @default(0)
-}
-```
-
-**UI:** Gloss detail should show a “Signe compost” section when `isCompound` is true: morpheme chain (e.g. GERMÀ + SEGON → BESSONS) with links to constituent glosses where they exist in the dictionary.
-
-`phonology_parts` remains **deferred** (v2) unless per-morpheme phonology is confirmed as needed.
-
-### Maps to existing schema — import without new tables
-
-Core fitxa content already supported: `name`, translations, `definitions[]`, phonology (with mapping), `minimal_pairs`, `related_signs`, `notes`, `video_url`, plus traceability fields `id` / `docx_path` via `externalId` / `sourceDocPath`.
-
-### Deferred — need domain clarification
+> **Source of truth for field decisions and schema v2 format:** [`fitxas-import-requirements.md`](fitxas-import-requirements.md)
 
-Not planned for v1 until the dictionary team confirms meaning and user value:
-
-| JSON field | Open question |
-|------------|---------------|
-| `alt_glosses` | How do these differ from synonyms (`related_signs.SINÒNIM`) or separate dictionary entries? |
-| `corpus_forms` | Surface variants in corpus (`MENJAR-rep`) vs alt glosses vs dictionary entry name? |
-| `relacio_signes_forasters` | When is a foreign/borrowed sign relation used vs a normal related sign? |
-| `camp_semantic` vs `categories` | Are these the same taxonomy or different levels? |
-| `occ_general`, `occ_learning`, `occ_specific` | Should end users see corpus sources, or is this internal cataloguing only? |
-| `morfologia_simultania`, `morfologia_abreujada` | Useful for display, or editor-only metadata? |
-| `iconicity`, `valencia`, `entitat_amb_nom`, `signes_claus` | Confirm display priority |
-
-See meeting agenda: [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md).
-
-### Explicitly out of scope for v1
-
-| JSON field | Reason |
-|------------|--------|
-| `definition` (merged) | Redundant with `definitions[]` |
-| `vocab_warnings` | Import-time log only, not persisted |
-| `phonology_parts` | Deferred until compound phonology UX is defined |
+**Last updated:** 2026-06-19  
+**Status:** Planning — no import pipeline implemented yet  
+**Sample files:** [`Examples/`](../Examples/) (`menjar.json`, `cervesa.json`, `bessons-1d.json`, `bessons.json`)
 
 ---
 
@@ -88,7 +15,7 @@ See meeting agenda: [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-ag
 | Goal | Success criteria |
 |------|------------------|
 | Bulk ingest scraped JSON | Script imports all fitxas without manual DB edits |
-| Preserve traceability | Each imported gloss maps back to source `id` and `docx_path` |
+| Preserve traceability | Each imported gloss maps back to source `gloss_id` |
 | Safe first run | Dry-run mode reports gaps before writing to DB |
 | Searchable published entries | Imported glosses appear in Typesense after sync |
 | Data quality visibility | Warnings logged for unmapped phonology, missing relation targets, etc. |
@@ -97,24 +24,6 @@ See meeting agenda: [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-ag
 
 ## Current state
 
-### Scraped format (`Examples/*.json`)
-
-Each file is a rich dictionary “fitxa” with roughly 30 fields:
-
-| Field group | Example fields |
-|-------------|----------------|
-| Identity | `id`, `name`, `docx_path` |
-| Translations | `tr_en`, `tr_es`, `tr_ca`, `alt_glosses` |
-| Definitions | `definitions[]`, `definition`, `lexical_category` |
-| Phonology | `phonology` (Catalan labels), `phonology_parts` (compounds), `vocab_warnings` |
-| Morphology | `morfologia_sequencial`, `morfologia_simultania`, `morfologia_abreujada` |
-| Relations | `minimal_pairs`, `related_signs`, `relacio_signes_forasters` |
-| Semantics | `iconicity`, `entitat_amb_nom`, `camp_semantic`, `valencia`, `categories`, `signes_claus` |
-| Corpus | `corpus_forms`, `occ_general`, `occ_learning`, `occ_specific` |
-| Media | `video_url` (Google Drive) |
-| Compounds | `is_compound`, `compound_signs` |
-| Meta | `notes`, `vocab_warnings` |
-
 ### SignBank model (what exists today)
 
 Core schema: `backend/prisma/schema.prisma`. Entity graph:
@@ -135,68 +44,9 @@ GlossData
 - **Draft workflow:** `GlossRequest` + `GlossData` → admin accept → `DictionaryEntry`
 - **Seed data:** `backend/prisma/seed.ts` — hand-written demo glosses only
 - **No import path:** `Examples/` is reference JSON on disk; `backend/src/examples/` is the *usage examples* CRUD module (unrelated)
+- **Partial enum infrastructure:** `backend/src/import/fitxa-enum-resolver.ts` + `fitxa-enum-mappings.json` (out of sync with schema v2 field names — see requirements doc)
 
----
-
-## Field mapping
-
-### Maps directly (or with light transformation)
-
-| Scraped field | SignBank target | Notes |
-|---------------|-----------------|-------|
-| `name` | `GlossData.gloss` | Primary gloss identifier |
-| `tr_en` | `GlossTranslation` (`ENGLISH`) | May contain `;`-separated values |
-| `tr_es` | `GlossTranslation` (`SPANISH`) | Same |
-| `tr_ca` | `GlossTranslation` (`CATALAN`) | Often empty in samples |
-| `definitions[]` | `Definition[]` | One row per array entry; parse `Verb-` / `Nom-` prefix |
-| `lexical_category` | `Definition.lexicalCategory` | Map Catalan → `LexicalCategory` enum |
-| `phonology` | `VideoData` on `SignVideo` | Requires enum mapping layer (see below) |
-| `minimal_pairs[]` | `MinimalPair` | `sign` → target gloss lookup; `description` → `distinction` |
-| `related_signs.*` | `RelatedGloss` | Map relation type keys → `RelationType` enum |
-| `notes` | `GlossData.editComment` | Reasonable fit for editorial notes |
-| `video_url` | `Video.url` | After download from Drive + upload to Dufs |
-
-### Relation type mapping
-
-| Scraped key | `RelationType` |
-|-------------|----------------|
-| `SINÒNIM` | `SYNONYM` |
-| `ANTÒNIM` | `ANTONYM` |
-| `HOMÒNIM` | `HOMONYM` |
-| `VARIANT` | `VARIANT` |
-| `HIPERÒNIM` | `HYPERNYM` |
-| `HIPÒNIM` | `HYPONYM` |
-| `VEURE TAMBÉ` | `ASSOCIATED_CONCEPT` |
-
-### Lexical category mapping (examples)
-
-| Scraped (Catalan) | `LexicalCategory` |
-|-------------------|-------------------|
-| `Nom` | `NOUN` |
-| `Verb` | `VERB` |
-| `Adjectiu` | `ADJECTIVE` |
-| `Nom o verb` | `NOUN_OR_VERB` |
-
-Full mapping table to be built during implementation by scanning all scraped files for unique values.
-
-### No schema home yet
-
-| Scraped field | Priority | Suggested approach |
-|---------------|----------|-------------------|
-| `morfologia_sequencial` | **v1** | `SequentialMorphology` + `CompoundPart[]` (see [Scope decisions](#scope-decisions-product)) |
-| `is_compound`, `compound_signs` | **v1** | `GlossData.isCompound` + `CompoundPart[]` |
-| `id` | v1 (import) | `GlossData.externalId` (unique) |
-| `docx_path` | v1 (import) | `GlossData.sourceDocPath` |
-| `alt_glosses` | deferred | TBD after domain clarification |
-| `corpus_forms` | deferred | TBD |
-| `morfologia_simultania`, `morfologia_abreujada` | deferred | TBD |
-| `iconicity`, `camp_semantic`, `valencia` | deferred | TBD |
-| `signes_claus` | deferred | TBD |
-| `relacio_signes_forasters` | deferred | TBD |
-| `categories` | deferred | TBD |
-| `occ_general`, `occ_learning`, `occ_specific` | deferred | TBD |
-| `phonology_parts` | v2 | Per-morpheme phonology when compound UX is defined |
-| `vocab_warnings` | n/a | Import log only (not persisted) |
+For fitxa JSON format, field decisions, and proposed schema changes, see [`fitxas-import-requirements.md`](fitxas-import-requirements.md).
 
 ---
 
@@ -206,44 +56,38 @@ Full mapping table to be built during implementation by scanning all scraped fil
 
 Scraped phonology uses **Catalan human labels**. SignBank stores **strict Prisma enums** (`Hand`, `HandConfiguration`, `Location`, etc.).
 
-**Scraped examples:**
+Schema v2 example (`cervesa.json`):
 
 ```json
 "nombre_mans": "2a",
-"configuracio": "B (B) /O_SSI (O)",
-"localitzacio": "Mà no-dominant",
-"orientacio_moviment": "Punta dels dits (finger tips)",
-"moviment_repetit": "Sí"
+"configuracio_ma_dominant": "B (B)",
+"configuracio_ma_no_dominant": "0_SSI (O)",
+"relacio_articuladors_ma_dominant": "Damunt",
+"relacio_articuladors_ma_no_dominant": "Sota"
 ```
 
-**SignBank enums (examples):**
-
-- `Hand`: `RIGHT`, `LEFT`, `BOTH`
-- `HandConfiguration`: `CONF_1` … `CONF_40`, Unicode variants
-- `Location`: `MOUTH`, `NEUTRAL_SPACE`, `WEAK_HAND`, …
-
 **Required:**
 
-- Per-field lookup tables (scraped label → enum value)
-- Fallback to `EMPTY` when unknown
-- Warning report per gloss (scraper already emits `vocab_warnings` — reuse pattern)
+- Per-field lookup tables (scraped label → enum value or **catalog entry**)
+- Per-hand configuration on `VideoData` (dominant + non-dominant)
+- **Extensible hand configuration catalog** — ability to add new configurations without enum migration each time (see [requirements §3.4](fitxas-import-requirements.md#34-phonology-vocabulary--extensibility--mapping))
+- `nombre_mans` → `Handedness` enum (distinct from `Hand`)
+- **UI:** phonology table with row labels + main hand + non-dominant hand columns (see [requirements §3.3](fitxas-import-requirements.md#phonology-table-ui--v1))
+- Fallback to `EMPTY` when unknown (interim until catalog supports create-on-import)
+- Warning report per gloss
 - Iterative expansion as new vocabulary appears in full dataset
 
-**Compound signs** (`1420_02_bessons-1d.json`):
-
-- Values prefixed with `2n COMP:` in top-level `phonology`
-- Per-morpheme values in `phonology_parts` keyed by morpheme index
-- Current model: **one `VideoData` per `SignVideo`**, not per compound part
+**Compound signs** (`bessons-1d.json`) — see [requirements §2.5](fitxas-import-requirements.md#25-compound-signs-domain-model):
 
-Options:
-
-1. One `SignVideo` with combined phonology (loses per-part detail)
-2. Multiple `SignVideo` rows (one per morpheme) with titles from `compound_signs`
-3. New `CompoundPhonologyPart` model linked to `SignVideo`
+- Compound glosses have **no top-level phonology** (`phonology: null`); phonology is derived from ordered components
+- 2–3 components per compound, in fixed order (e.g. `GERMÀ` + `SEGON` → `BESSONS-1d`)
+- Each component is either a **linked gloss** (`comp_id` → another entry) or an **inline morpheme** (`comp_id: null`, phonology stored on the part)
+- A linked component may itself be a compound (nested; expected max ~2 levels)
+- UI: columnar phonology display, one column per component in order
 
 ### 2. Videos
 
-Scraped `video_url` points to **Google Drive**, not Dufs paths like `gloss-videos/foo.mp4`.
+Scraped `video_urls[]` point to **Google Drive**, not Dufs paths like `gloss-videos/foo.mp4`.
 
 Import pipeline:
 
@@ -255,7 +99,7 @@ Until videos are processed, entries can import with placeholder or empty video (
 
 ### 3. Relations (two-pass import)
 
-`minimal_pairs` and `related_signs` reference gloss **strings** (e.g. `"EMPASSAR-SE"`, `"ALIMENTACIÓ"`). Targets may not exist during pass 1.
+`minimal_pairs` and `related_signs` reference gloss **strings** (e.g. `"EMPASSAR-SE"`, `"CONSUM"`). Targets may not exist during pass 1.
 
 **Strategy:**
 
@@ -276,7 +120,7 @@ Edge cases:
 "Nom- Producte natural o elaborat..."
 ```
 
-Each array entry → one `Definition` row. Parse prefix for `lexicalCategory` and optional `title`.
+Each array entry → one `Definition` row. Parse optional prefix → `lexicalCategory`; strip prefix from text. Top-level fitxa `lexical_category` is **not imported**. See [requirements §2.3](fitxas-import-requirements.md#23-definitions-and-lexical-category).
 
 ### 5. Publication workflow
 
@@ -286,9 +130,9 @@ Each array entry → one `Definition` row. Parse prefix for `lexicalCategory` an
 | **B. Import as drafts** | `GlossRequest` in `NOT_COMPLETED`; admin reviews | Slower; manual accept per entry |
 | **C. Hybrid** | Publish clean rows; flag warnings for review | More complex logic |
 
-**Recommendation:** Start with **B or C** given data quality signals in samples (`???? (potser són iguals)`, `vocab_warnings`, incomplete phonology nulls).
+**Recommendation:** Start with **B or C** given data quality signals in samples (`???? (potser són iguals)`, incomplete phonology nulls).
 
-Submit validation (`backend/src/utils/gloss-validation.ts`) requires complete phonology and at least one video — imported drafts may fail submit until phonology/video gaps are fixed.
+Submit validation (`backend/src/utils/gloss-validation.ts`) requires at least one video — imported drafts may fail submit until video gaps are fixed.
 
 ---
 
@@ -297,17 +141,23 @@ Submit validation (`backend/src/utils/gloss-validation.ts`) requires complete ph
 ```mermaid
 flowchart TD
     A[Scraped JSON directory] --> B[import-fitxas script]
-    B --> C[Core field mapper]
-    B --> D[Phonology mapper + warnings]
-    B --> E[Video downloader optional]
-    C --> F[(PostgreSQL via Prisma)]
+    C[Admin UI multi-file upload] --> D[Import API admin only]
+    B --> E[Core field mapper]
+    D --> E
+    B --> F[Phonology mapper + warnings]
     D --> F
-    E --> F
-    F --> G[Pass 2: relations resolver]
-    G --> H[Typesense sync]
-    F --> I[Gloss detail UI]
+    B --> G[Video downloader optional]
+    D --> G
+    E --> H[(PostgreSQL via Prisma)]
+    F --> H
+    G --> H
+    H --> I[Pass 2: relations resolver]
+    I --> J[Typesense sync]
+    H --> K[Gloss detail UI]
 ```
 
+CLI script (Phase 2–3) and admin UI (Phase 6) share the same import service logic.
+
 **Proposed script location:** `backend/scripts/import-fitxas.ts`
 
 **CLI flags (proposed):**
@@ -326,48 +176,28 @@ flowchart TD
 
 ## Phased implementation
 
-### Phase 1 — Schema & scope (1–2 days)
-
-**Decided:**
-
-- v1 adds **compound signs**: `isCompound`, `morfologia_sequencial`, `compound_signs` (see [Scope decisions](#scope-decisions-product))
-- Core fitxa fields import into existing models
-
-**Still to decide:**
-
-1. Publication model: direct vs review queue
-2. Per-morpheme phonology (`phonology_parts`) — v2 unless requested
-
-**Schema changes (v1 minimum):**
+See [`fitxas-import-requirements.md` §5](fitxas-import-requirements.md#5-implementation-phases) for scope per phase. Summary:
 
-```prisma
-model GlossData {
-  // ... existing fields
-  externalId    String?  @unique  // maps scraped "id"
-  sourceDocPath String?           // maps scraped "docx_path"
-  isCompound    Boolean  @default(false)
-  sequentialMorphology SequentialMorphology?
-  compoundParts CompoundPart[]
-}
-```
-
-**Other tasks:**
+### Phase 1 — Schema migration
 
+- Traceability: `externalId`, `sourceDocPath`
+- Compounds: `isCompound`, `CompoundPart[]`
+- Semantic categories: `Category` model + many-to-many with `GlossData`
+- Gloss metadata: `iconicity`, `valency`, `KeySignGroup[]` (key signs)
+- Morphology: `SimultaneousMorphology[]`, `AbbreviatedMorphology[]`, `namedEntity`
+- Definitions: make `lexicalCategory` optional on `Definition` (`LexicalCategory?`)
+- Metadata storage: corpus forms, categories, iconicity, valency, signes claus, named entity, simultaneous morphology
+- Per-hand phonology + `Handedness` enum on `VideoData`
+- Hand configuration catalog (`HandConfigurationEntry`) — migrate from closed `HandConfiguration` enum (§3.4)
 - Align frontend `RelationType` in `frontend/src/types/models.ts` with backend (add `HOMONYM`, `VARIANT`)
-- Gloss detail UI: compound morpheme chain when `isCompound`
 
-### Phase 2 — Import script (core)
+### Phase 2 — Dry-run importer
 
 **Deliverables:**
 
-- TypeScript interface for scraped JSON shape
+- TypeScript interface for schema v2 (single-entry and bundle layouts)
 - `readFitxasDir()` — load and validate JSON files
-- Mappers:
-  - `mapDefinitions()`
-  - `mapGlossTranslations()`
-  - `mapLexicalCategory()`
-  - `mapPhonology()` with `EMPTY` fallback
-  - `mapRelationType()`
+- Mappers: definitions, translations, lexical category, phonology (per-hand), relations, compounds
 - `importFitxa()` — Prisma create with nested writes
 - `--dry-run` output: per-file summary + warnings
 - Idempotent upsert by `externalId`
@@ -375,12 +205,15 @@ model GlossData {
 **Output example (dry-run):**
 
 ```
-0001_menjar.json
+menjar.json
   gloss: MENJAR
   definitions: 2
   translations: en, es
   phonology warnings: 1 (orientacio_moviment: "Punta dels dits (finger tips)")
-  relations deferred: 1 (ALIMENTACIÓ)
+  relations deferred: 1 (CONSUM)
+  stored metadata: corpus_forms(4), categories(1), signes_claus(2)
+  skipped: synonyms, occurrences, lexical_category
+  skipped: occurrences
   video: skipped (no --with-videos)
 ```
 
@@ -391,93 +224,64 @@ model GlossData {
 - Pass 2: `RelatedGloss` + `MinimalPair` resolution by gloss name
 - Unresolved relations report (`import-warnings.json`)
 
-### Phase 4 — UI for extended fields
+### Phase 4 — UI (gloss detail + edit/create rework)
 
-**v1 (confirmed):**
+Extend read-only detail **and** the edit/create flow. See [requirements §3.6](fitxas-import-requirements.md#36-gloss-edit--create-pages-ui--major-rework-planned).
 
-- Compound sign badge and morpheme chain (`isCompound` + `compound_signs` / `morfologia_sequencial`)
+**Read-only detail:** compound & morphology table, two-hand phonology table, key signs, iconicity, valency, semantic category chips.
 
-**Later (after domain clarification):**
+**Edit/create:** optional lexical category, categories combobox, phonology two-hand editor, compound & morphology block, validation for compound glosses.
 
-- Corpus forms, occurrences, semantic metadata, simultaneous/abbreviated morphology
+**Prerequisites:** Phase 1 schema + extended gloss-data API/DTOs.
 
 ### Phase 5 — Production run
 
 1. Dry-run on full scraped dataset → review warning report
-2. Fix phonology mapper gaps (iterate on `vocab_warnings` patterns)
+2. Fix phonology mapper gaps
 3. Full import on staging environment
-4. Spot-check ~20 entries:
-   - Simple sign (`CERVESA`)
-   - Multi-sense (`MENJAR`)
-   - Compound (`BESSONS-1d`)
-   - Relations and minimal pairs
-5. `typesense sync` (or restart backend sync job)
+4. Spot-check ~20 entries (simple, multi-sense, compound, relations)
+5. Typesense sync
 6. Production import with backup first
 
----
-
-## Sample file reference
-
-### `0001_menjar.json` — multi-sense, relations, morphology
+### Phase 6 — Admin import UI (deferred — complex)
 
-- 2 definitions (Verb + Nom)
-- `alt_glosses`: 8 variants
-- `morfologia_simultania`: classificador descriptiu
-- `related_signs.VEURE TAMBÉ`: `["ALIMENTACIÓ"]`
-- `minimal_pairs`: `EMPASSAR-SE`
-- `signes_claus`: 2 groups with gloss lists
-- Phonology: single hand (`nombre_mans: "1"`), `vocab_warnings` on orientation
+Admin-only page for uploading and importing fitxa JSON files through the browser. **Not started** — requires dedicated implementation with active prompting.
 
-### `0764_01_cervesa.json` — two-hand phonology
+See [requirements §3.5](fitxas-import-requirements.md#35-admin-fitxa-import-page-ui--planned-complex) for scope, dependencies, and suggested implementation slices.
 
-- Single definition (Nom)
-- Two-hand config: `B (B) /O_SSI (O)`
-- `vocab_warnings` on non-dominant configuration
-- 2 minimal pairs (one with uncertain distinction)
+**Prerequisites:** Phase 1–3 (schema + import service/API), admin auth on endpoints.
 
-### `1420_02_bessons-1d.json` — compound sign
+**Likely deliverables:**
 
-- `is_compound: true`
-- `compound_signs`: `["GERMÀ", "SEGON"]`
-- `morfologia_sequencial`: maps to compound parts
-- `phonology_parts`: per-morpheme phonology for index `2`
-- `related_signs.VARIANT`: `["BESSONS-T_antiga"]`
+- `POST /import/fitxas/dry-run` and `POST /import/fitxas` (or equivalent) — admin guarded
+- Vue page: multi-file upload, dry-run results, commit, per-file warning/error report
+- Route registered under admin navigation only
 
 ---
 
-## Open decisions (resolve before coding)
+## Open decisions
 
-| # | Question | Status | Options |
-|---|----------|--------|---------|
-| 1 | Compound morphology in v1 | **Decided** | `isCompound` + sequential morphemes + UI |
-| 2 | Publication | Open | Direct publish / Draft review / Hybrid |
-| 3 | Per-morpheme phonology | Deferred v2 | `phonology_parts` model |
-| 4 | Video source | Open | Drive download in script / Pre-exported local files |
-| 5 | `alt_glosses`, `corpus_forms`, `occ_*`, semantics | **Awaiting domain input** | See [meeting agenda](fitxas-import-meeting-agenda.md) |
-| 6 | `morfologia_simultania` / `abreujada` | Open | v1 or later |
+| # | Question | Status | Owner |
+|---|----------|--------|-------|
+| 1 | Publication workflow | Open | SignBank team |
+| 2 | Video source (Drive vs pre-exported) | Open | SignBank team |
+| 3 | Categories filter UX | Open | SignBank team |
+| 4 | `morfologia_abreujada` | Open | Ask Lali |
+| 5 | `nombre_mans` vs `Hand` enum | Open | Technical |
 
----
-
-## Meeting materials
-
-| Document | Purpose |
-|----------|---------|
-| [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md) | Ordre del dia, preguntes i checklist per a la reunió |
-| [`fitxas-enum-mappings.md`](fitxas-enum-mappings.md) | XLSX → JSON mapping workflow |
-
-Regenerar la referència d'ENUMs: `node backend/scripts/generate-enum-reference.js`
+Resolved decisions (compounds, corpus forms, occurrences, semantics, etc.) are in [`fitxas-import-requirements.md`](fitxas-import-requirements.md).
 
 ---
 
 ## Next step
 
-Build **Phase 2 dry-run importer** against the 3 files in `Examples/`:
+Build **Phase 2 dry-run importer** against schema v2 files in `Examples/`:
 
-- Maps everything that fits the current schema
-- Prints warnings for phonology, missing relation targets, and unmapped fields
+- Maps everything that fits the current + proposed schema
+- Prints warnings for phonology, missing relation targets, and skipped fields
 - Does **not** write to the database
 
-This produces a concrete gap report before any schema migration.
+This produces a concrete gap report before schema migration.
 
 ---
 
@@ -485,13 +289,16 @@ This produces a concrete gap report before any schema migration.
 
 | Resource | Path |
 |----------|------|
+| **Requirements (field decisions)** | [`fitxas-import-requirements.md`](fitxas-import-requirements.md) |
+| Meeting agenda (raw notes) | [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md) |
+| ENUM mapping workflow | [`fitxas-enum-mappings.md`](fitxas-enum-mappings.md) |
+| ENUM reference | [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md) |
+| Gap analysis | [`fitxas-mapping-analysis.json`](fitxas-mapping-analysis.json) |
 | Prisma schema | `backend/prisma/schema.prisma` |
-| Data model skill | `.cursor/skills/signbank-data-model/SKILL.md` |
-| Gloss workflow | `.cursor/skills/signbank-gloss-workflow/SKILL.md` |
-| Seed (demo data) | `backend/prisma/seed.ts` |
+| Enum resolver | `backend/src/import/fitxa-enum-resolver.ts` |
 | Gloss validation | `backend/src/utils/gloss-validation.ts` |
 | Video upload | `backend/src/videos/videos.service.ts` |
 | Typesense sync | `backend/src/typesense/typesense.service.ts` |
 | Sample scraped data | `Examples/*.json` |
-| Meeting agenda | `docs/fitxas-import-meeting-agenda.md` |
-| ENUM reference | `docs/fitxas-import-enums-reference.md` |
+
+Regenerate ENUM reference: `node backend/scripts/generate-enum-reference.js`
diff --git a/docs/fitxas-import-requirements.md b/docs/fitxas-import-requirements.md
new file mode 100644
index 0000000..f84252f
--- /dev/null
+++ b/docs/fitxas-import-requirements.md
@@ -0,0 +1,918 @@
+# SignBank — Fitxas import requirements
+
+Consolidated reference for schema v2 fitxa JSON, meeting decisions, and required SignBank changes. This document supersedes the field-mapping and scope sections in [`fitxas-import-plan.md`](fitxas-import-plan.md).
+
+**Last updated:** 2026-06-19 (extensible phonology configurations)  
+**Status:** Post-meeting decisions captured  
+**Sample data:** [`Examples/`](../Examples/) (`menjar.json`, `cervesa.json`, `bessons-1d.json`, `bessons.json`)  
+**Raw meeting notes:** [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md)  
+**ENUM reference:** [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md)
+
+This document bridges domain decisions from the dictionary team with concrete implementation work in SignBank (schema, import pipeline, UI).
+
+---
+
+## 1. Schema v2 format
+
+The sample files in `Examples/` use **schema v2** (`"schema_version": 2`). This replaces the field names described in earlier planning documents.
+
+### 1.1 Field renames and structural changes
+
+| Old (plan v1) | New (schema v2) | Notes |
+|---------------|-----------------|-------|
+| `id`, `name` | `gloss_id`, `gloss_name` | Primary identity |
+| `tr_en`, `tr_es`, `tr_ca` | `translations.{english, spanish, catalan}` | May contain `;`-separated values |
+| `alt_glosses` | `synonyms` | **Skip** — use `related_signs.*` only (see §2.2) |
+| `is_compound`, `compound_signs`, `morfologia_sequencial` | `compound.{is_compound, components[]}` | See [§1.2](#12-compound-structure) |
+| `phonology.configuracio` | `configuracio_ma_dominant` + `configuracio_ma_no_dominant` | Same split for `relacio_articuladors_ma_*` |
+| `occ_general`, `occ_learning`, `occ_specific` | `occurrences.{general, learning, specific, web}` | Structured rows: `source`, `appears`, `gloss` |
+| `video_url` | `video_urls[]` | `{url, source, description, thumbnail_url}` |
+| `camp_semantic` | **removed** | Was duplicate of `categories` |
+| `lexical_category` (root) | Still present in some fitxa files | **Skip on import** — category only from `definitions[]` prefix (§2.3) |
+| — | `schema_version: 2` | Explicit version marker |
+| — | `iec_metadata` | `{entry_id, entry_date, last_modified, contributor, status, notes}` |
+| — | `annotations` | Present in v2; purpose undefined |
+
+### 1.2 Compound structure
+
+In schema v2, compounds are nested under `compound`. See [§2.5 Compound signs](#25-compound-signs-domain-model) for the full SignBank domain model.
+
+```json
+"compound": {
+  "is_compound": true,
+  "components": [
+    {
+      "ordinal": 1,
+      "name": "GERMÀ",
+      "comp_id": "0165_dona_germa",
+      "redundant": true,
+      "phonology": { ... }
+    },
+    {
+      "ordinal": 2,
+      "name": "SEGON",
+      "comp_id": null,
+      "redundant": false,
+      "phonology": { ... }
+    }
+  ]
+}
+```
+
+- A compound typically has **2–3 ordered components** (`ordinal` / `position`).
+- Top-level `phonology` is **`null` for compounds** — phonology is never stored on the compound gloss itself; it is derived from the components (see §2.5).
+- `comp_id` links to another fitxa's `gloss_id` when that morpheme has its own dictionary entry.
+- `comp_id: null` means the morpheme is an **inline morpheme** — it has no standalone gloss entry but carries its own `phonology` block in the JSON.
+- `redundant` marks morphemes that are phonologically subsumed by the compound.
+- Per-component `phonology` in the JSON is the source for inline morphemes, or a fallback/cache when the linked gloss is not yet imported.
+
+### 1.3 Phonology — per-hand fields
+
+Schema v2 separates **dominant** (main) and **non-dominant** hand data. Example from `cervesa.json`:
+
+```json
+"phonology": {
+  "nombre_mans": "2a",
+  "configuracio_ma_dominant": "B (B)",
+  "configuracio_ma_no_dominant": "0_SSI (O)",
+  "relacio_articuladors_ma_dominant": "Damunt",
+  "relacio_articuladors_ma_no_dominant": "Sota",
+  ...
+}
+```
+
+`nombre_mans` uses the fitxa taxonomy (`1`, `2a`, `2n`, `2s`, `x`) — distinct from SignBank's `Hand` enum (`RIGHT`, `LEFT`, `BOTH`).
+
+#### Per-hand vs shared fields
+
+| Scope | Fitxa fields |
+|-------|--------------|
+| **Per hand** | `configuracio_ma_dominant`, `configuracio_ma_no_dominant`, `relacio_articuladors_ma_dominant`, `relacio_articuladors_ma_no_dominant` |
+| **Shared** (one value for the sign) | `localitzacio`, `orientacio_moviment`, `orientacio_localitzacio`, `canvi_orientacio`, `canvi_configuracio`, `tipus_contacte`, `forma_moviment`, `direccio_moviment`, `moviment_repetit`, `vocalitzacio`, `component_no_manual` |
+| **Handedness** | `nombre_mans` — determines whether the two-hand table is shown |
+
+When `nombre_mans` indicates a **multi-hand sign** (`2a`, `2n`, `2s`), SignBank must store and display phonology for **both hands**. See [§3.3 Phonology table](#phonology-table-ui--v1).
+
+### 1.4 File layout variants
+
+The import pipeline must accept both shapes:
+
+| Layout | Files | Structure |
+|--------|-------|-----------|
+| Single-entry | `menjar.json`, `cervesa.json`, `bessons-1d.json` | Root object is one fitxa |
+| Multi-entry bundle | `bessons.json` | Root object keyed by `gloss_id`, each value is a fitxa |
+
+### 1.5 Fields unchanged in meaning
+
+These fields keep the same role, only nested differently or renamed as above:
+
+- `definitions[]`, `definition` (merged — do not import)
+- `lexical_category` (top-level — **do not import**; see §2.3)
+- `minimal_pairs[]`, `related_signs.*`
+- `corpus_forms`, `categories`, `iconicity`, `valencia`, `signes_claus`
+- `morfologia_simultania`, `morfologia_abreujada`
+- `relacio_signes_forasters`, `entitat_amb_nom`
+- `notes`, `iec_metadata`
+
+---
+
+## 2. Meeting decisions (resolved)
+
+Decisions captured from [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md) (2026-06-19).
+
+```mermaid
+flowchart LR
+  subgraph importV1 [Import v1]
+    Core[Core fields + phonology + relations]
+    Store[Store metadata]
+    Ignore[Skip]
+  end
+  Core --> DB[(SignBank DB)]
+  Store --> DB
+  Ignore --> Log[Import log only]
+```
+
+### 2.1 Per-field decisions
+
+| Field | Decision | Import | Display (v1) |
+|-------|----------|--------|--------------|
+| `synonyms` | Legacy / cross-corpus labels in fitxa JSON — **not imported** | **Skip** | — |
+| `lexical_category` | Top-level gloss field in fitxa JSON — **not imported** | **Skip** | — |
+| `corpus_forms` | LSC-corpus-specific surface forms (`MENJAR-rep`, `MENJAR-S'HO`, etc.) | **Store** | Hidden |
+| `related_signs.*` | Dictionary relations (synonym, variant, antonym, …) | **Store** as `RelatedGloss` | Existing related-glosses UI — v1 |
+| `relacio_signes_forasters` | Foreign/borrowed sign relations — not used yet | **Skip** | — |
+| `categories` | Semantic field tags for grouping glosses (sports, health, food, family, …). `camp_semantic` removed from scraper as duplicate. | **Store** | v1 editor + gloss detail; search filter later |
+| `occurrences.*` | Which dictionaries/materials contain the gloss — low relevance for SignBank | **Skip** | — |
+| `iconicity` | Whether the sign form relates to a physical object or action (e.g. CAMINAR mimics walking). Fitxa: `"Sí"`, `"No"`, `"SÍ (2 germans)"`. | **Store** | Gloss detail — v1 |
+| `valencia` | **Verb valency** (English: *valency* / transitivity) — how many arguments a verb takes (e.g. `"Verb transitiu"`). Catalan *valència* — not chemical valence. | **Store** | Gloss detail — v1 |
+| `signes_claus` | **Key signs** — LSC definition via ordered gloss chains + optional comment ("signes necessaris per definir un signe"). | **Store** | Beside definitions — v1 |
+| `morfologia_simultania` | **Simultaneous morphology** — morphemes performed at the same time (not sequential). | **Store** | Compound & morphology table — v1 |
+| `morfologia_abreujada` | **Abbreviated / shortened morphology** — shortened compound forms. Meaning partly unclear; store and display. | **Store** | Compound & morphology table — v1 |
+| `entitat_amb_nom` | **Named entity** — proper-name / entity reference for the sign. | **Store** | Compound & morphology table — v1 |
+| `compound.*` | Sequential compound: morpheme chain, per-component phonology | **Store** | Compound & morphology table — v1 |
+
+### 2.2 Related glosses (`related_signs` only)
+
+SignBank implements relations via `RelatedGloss` — visible in gloss detail and editable in the related-glosses step ([`RelatedGlosses.vue`](../frontend/src/components/GlossDetail/components/RelatedGlosses.vue)).
+
+**Do not import the fitxa `synonyms[]` field.** It is ignored. All sign-to-sign links come from `related_signs` only.
+
+| Fitxa key | `RelationType` | Example (`MENJAR`) |
+|-----------|----------------|-------------------|
+| `SINÒNIM` | `SYNONYM` | *(empty in sample)* |
+| `VARIANT` | `VARIANT` | `["CONSUM"]` |
+| `ANTÒNIM` | `ANTONYM` | |
+| `HOMÒNIM` | `HOMONYM` | |
+| `HIPERÒNIM` | `HYPERNYM` | |
+| `HIPÒNIM` | `HYPONYM` | |
+| `VEURE TAMBÉ` | `ASSOCIATED_CONCEPT` | |
+
+Import pass 2: resolve each target gloss string by name; log unresolved references.
+
+The fitxa `synonyms[]` array (e.g. `ALIMENTACIÓ`, `ÀPAT` on `MENJAR`) is **discarded** — if those links matter, they must appear under the appropriate `related_signs.*` key in the source JSON.
+
+### 2.3 Definitions and lexical category
+
+Each gloss can have one or more definitions (`definitions[]` in the fitxa JSON). **Each definition carries an optional lexical category** (verb, noun, adjective, etc.) that labels the grammatical type of that sense.
+
+#### Rules
+
+| Rule | Detail |
+|------|--------|
+| **Per-definition, not per-gloss** | Lexical category belongs to each `Definition` row, not to the gloss as a whole. `MENJAR` has two senses: one Verb, one Nom. |
+| **Optional** | A definition may have no lexical category. When absent, the UI hides the label — do not show an empty or default placeholder. |
+| **Embedded in fitxa text** | Fitxa JSON encodes category as a prefix in each `definitions[]` string: `"Verb- Dur un aliment..."`, `"Nom- Producte natural..."`, `"Adj- Nat d'un mateix part..."`. |
+| **Top-level `lexical_category`** | **Removed / not imported.** The fitxa root field (e.g. `"lexical_category": "Nom o verb"` on `MENJAR`) is ignored. Lexical category exists **only** on each `Definition` row, parsed from the definition string prefix. |
+| **Import** | Parser strips the prefix → `Definition.lexicalCategory` enum; remaining text → `Definition.definition`. If no prefix, store text as-is and leave `lexicalCategory` null. Never read top-level `lexical_category`. |
+
+#### Prefix → enum mapping (examples)
+
+| Fitxa prefix | `LexicalCategory` |
+|--------------|-------------------|
+| `Verb-`, `verb` | `VERB` |
+| `Nom-`, `nom` | `NOUN` |
+| `Adj-`, `adjectiu` | `ADJECTIVE` |
+| `Nom o verb` | `NOUN_OR_VERB` |
+| `Adjectiu o nom` | `NOUN_OR_ADJECTIVE` |
+
+Full mapping built during import by scanning unique values across the dataset. See [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md).
+
+#### Schema change required
+
+Current `Definition.lexicalCategory` is **required** with `@default(NOUN)` in Prisma. This must change to **optional**:
+
+```prisma
+model Definition {
+  // ...
+  lexicalCategory  LexicalCategory?   // was required with @default(NOUN)
+}
+```
+
+#### UI
+
+- Show lexical category label next to each definition when set (e.g. "Verb", "Nom").
+- When `lexicalCategory` is null, show only the definition text — no category badge.
+- **No gloss-level lexical category field** in the UI — do not display or edit top-level `lexical_category` from the fitxa.
+
+### 2.4 Semantic categories
+
+Semantic categories group glosses by **topic or field** (e.g. sports, health, food, family). This is distinct from **lexical category** (§2.3), which describes grammatical type per definition (verb, noun).
+
+Fitxa JSON provides categories as a string array on each gloss:
+
+```json
+"categories": ["Acte físic"]        // MENJAR
+"categories": ["Aliment"]           // CERVESA
+"categories": ["Família"]           // BESSONS-1d
+```
+
+#### Rules
+
+| Rule | Detail |
+|------|--------|
+| **Many-to-many** | A gloss can have **multiple** categories. A category can be shared by **many** glosses. |
+| **Normalized storage** | Categories are first-class entities in the database (`Category` table), not free-text arrays on `GlossData`. |
+| **Open vocabulary** | Category names come from fitxa data and editor input (e.g. `Aliment`, `Família`, `Acte físic`). Not a closed enum — new labels can be added. |
+| **Unique by name** | `Category.name` is unique (case-sensitive or normalized per implementation). Import uses find-or-create. |
+| **Optional** | A gloss may have zero categories. |
+
+```mermaid
+erDiagram
+  GlossData ||--o{ GlossDataCategory : has
+  Category ||--o{ GlossDataCategory : groups
+  GlossData {
+    string gloss
+  }
+  Category {
+    string name
+  }
+```
+
+#### UI (gloss editor — v1)
+
+On gloss create/edit:
+
+- **Multi-select** with **search**: user types to filter existing categories.
+- **Select existing**: pick from categories already in the database.
+- **Add new**: if the typed label does not exist, create it and attach to the gloss.
+- Pattern: searchable combobox (`q-select` with `use-input`, `filter`, multi, and new-value or explicit "create" action).
+
+On gloss detail (read-only): show category chips/tags.
+
+**Search/browse by category** (dictionary search page) is a follow-up — store and editor support are v1.
+
+**Phonology**
+
+- Support dominant and non-dominant hand configuration separately — **required for multi-hand signs**.
+- Schema v2 already provides per-hand fields; SignBank's `VideoData` and enum resolver do not yet.
+- **UI:** side-by-side phonology table (dominant \| non-dominant columns) — see §3.3.
+- **Compound glosses do not have their own phonology** — see §2.5.
+
+### 2.5 Compound signs (domain model)
+
+Compounds are a **v1 database and UI requirement**. SignBank must model them explicitly; the current schema has no compound support.
+
+#### Rules
+
+| Rule | Detail |
+|------|--------|
+| **No top-level phonology** | When `isCompound` is true, the gloss has no `VideoData` of its own. Top-level `phonology` in the fitxa JSON is `null`. |
+| **2–3 ordered components** | A compound references other signs (or inline morphemes) in a fixed order. Example: `BESSONS-1d` = `GERMÀ` (1st) + `SEGON` (2nd) — "brother" + "second" → twins. |
+| **Phonology from components** | Display and search phonology are assembled from the components, shown in **columns** (one column per component, in order). |
+| **Linked gloss OR inline morpheme** | Each component is one of two types — not both required to be dictionary entries: |
+| | **Linked gloss** — `comp_id` resolves to another `GlossData` row. Phonology is taken from that sign (or recursively from its components if it is also a compound). |
+| | **Inline morpheme** — `comp_id` is `null`. No standalone gloss entry exists. Phonology is stored directly on the `CompoundPart` (from the embedded `phonology` block in the JSON). Example: `SEGON` in `bessons-1d.json`. |
+| **Nested compounds** | A component may reference another compound gloss (a sign that is itself `isCompound: true`). Phonology resolves recursively from that compound's ordered components. |
+| **Nesting depth** | Expected maximum ~2 levels; not confirmed 100%. Schema and resolver should allow nesting but log a warning when depth exceeds 2. |
+
+#### Phonology resolution (display / import)
+
+```mermaid
+flowchart TD
+  compoundGloss[Compound gloss isCompound true]
+  compoundGloss --> part1[Component 1 by position]
+  compoundGloss --> part2[Component 2 by position]
+  compoundGloss --> part3[Component 3 optional]
+  part1 --> linked1{linked gloss?}
+  part2 --> linked2{linked gloss?}
+  linked1 -->|yes| glossPhon1[Use linked gloss phonology]
+  linked1 -->|no| inline1[Use inline phonology on CompoundPart]
+  linked2 -->|yes| glossPhon2{linked is compound?}
+  glossPhon2 -->|yes| recurse[Resolve from its components]
+  glossPhon2 -->|no| glossPhon2simple[Use linked gloss phonology]
+  linked2 -->|no| inline2[Use inline phonology on CompoundPart]
+```
+
+#### Example: `BESSONS-1d`
+
+| Position | Name | Type | `comp_id` | Phonology source |
+|----------|------|------|-----------|------------------|
+| 1 | GERMÀ | Linked gloss | `0165_dona_germa` | From `GERMÀ` entry (or embedded fallback) |
+| 2 | SEGON | Inline morpheme | `null` | Embedded `phonology` on the component |
+
+UI shows: `GERMÀ + SEGON → BESSONS-1d` with two phonology columns.
+
+#### Compound & morphology information table (UI — v1)
+
+On gloss detail and in the editor, group the following in a **single compound / morphology section** (one information table or card group):
+
+| Row / subsection | Fitxa field | When shown |
+|----------------|-------------|------------|
+| Sequential compound chain | `compound.*` | When `isCompound` or components exist |
+| Columnar phonology | `compound.components[].phonology` | Per component, in order |
+| Simultaneous morphology | `morfologia_simultania[]` | When non-empty |
+| Abbreviated morphology | `morfologia_abreujada[]` | When non-empty |
+| Named entity | `entitat_amb_nom` | When set |
+
+Fitxa JSON shapes:
+
+```json
+"morfologia_simultania": [
+  { "glossa_morfema": "Classificador descriptiu", "significat_en_aquest_signe": "Forma de l'aliment que es menja" }
+],
+"morfologia_abreujada": [
+  { "glossa_abreujada": "…", "rol_en_aquest_signe": "…" }
+],
+"entitat_amb_nom": "…"
+```
+
+These fields are **not** limited to compound signs — `MENJAR` has simultaneous morphology but is not a compound. Still display them in the same table for consistency; hide empty subsections.
+
+### 2.6 Gloss-level metadata (iconicity, valency, key signs)
+
+Separate from the compound/morphology table — stored on the gloss and shown in gloss detail (v1).
+
+#### Iconicity (`iconicity`)
+
+Whether the sign's form is iconic — visually related to a physical object or action.
+
+| Fitxa value | Meaning |
+|-------------|---------|
+| `"Sí"` | Iconic (e.g. CAMINAR — fingers mimic walking) |
+| `"No"` | Not iconic |
+| `"SÍ (2 germans)"` | Iconic, with explanatory note |
+
+Store as nullable string on `GlossData.iconicity`.
+
+#### Valency (`valencia`)
+
+Catalan **valència** → English **verb valency** (also described as *transitivity* in the fitxa labels).
+
+Indicates how the verb relates to its arguments — e.g. `"Verb transitiu"` (transitive: takes a direct object). Relevant mainly for verb senses; nullable for non-verbs.
+
+Store as nullable string on `GlossData.valency`. Map values from fitxa text and XLSX `València` sheet during import.
+
+#### Key signs (`signes_claus`)
+
+LSC definitions expressed as **chains of gloss labels** plus an optional comment — the signs needed to define this sign in sign language.
+
+```json
+"signes_claus": [
+  {
+    "glosses": ["COSA", "ANIMAL", "VIURE", "FALTAR", "PER-A", "SALVAR", "SOBREVIURE"],
+    "comment": null
+  },
+  {
+    "glosses": ["TRAGAR", "ALIMENTO", "COMBUSTIBLE-XUCLAR"],
+    "comment": "Proposta Lali …"
+  }
+]
+```
+
+- A gloss may have **multiple key-sign groups**.
+- UI: show beside written definitions (not inside the compound table).
+- Store as `KeySignGroup[]` with ordered `glosses: string[]` and optional `comment`.
+
+### 2.7 Confirmed for v1 (unchanged from pre-meeting)
+
+| Feature | Example |
+|---------|---------|
+| Compound indicator | `compound.is_compound: true` for `BESSONS-1d` |
+| Morpheme chain (ordered) | `GERMÀ + SEGON → BESSONS-1d` |
+| No compound phonology | Top-level `phonology: null`; derived from components |
+| Columnar phonology | One column per component, in `ordinal` order |
+| Inline morpheme support | `SEGON` with `comp_id: null` and embedded phonology |
+| Nested compound reference | Component links to another `isCompound` gloss |
+| Semantic categories | Many-to-many; searchable multi-select in editor |
+| Iconicity, valency, key signs | Stored on gloss; shown in gloss detail |
+| Compound & morphology table | Sequential compound + simultaneous + abbreviated + named entity |
+| Two-hand phonology table | Dominant / non-dominant columns for multi-hand signs |
+
+### 2.8 Explicitly out of scope for v1
+
+| Field | Reason |
+|-------|--------|
+| `definition` (merged string) | Redundant with `definitions[]` |
+| `occurrences.*` | Skipped per meeting decision |
+| `relacio_signes_forasters` | Not used yet |
+| `synonyms[]` | Not imported — use `related_signs.*` only |
+| `lexical_category` (top-level) | Not imported — per-definition prefix only (§2.3) |
+| `vocab_warnings` | Import-time log only (not in schema v2) |
+
+---
+
+## 3. Required SignBank changes
+
+### 3.1 Prisma schema
+
+Current [`backend/prisma/schema.prisma`](../backend/prisma/schema.prisma) has no models for fitxa-specific metadata or compounds. Proposed additions:
+
+| Concept | Proposed model / field |
+|---------|------------------------|
+| Traceability | `GlossData.externalId` (`gloss_id`), `GlossData.sourceDocPath` |
+| **Compounds** | `GlossData.isCompound`, `CompoundPart[]` — see below |
+| **Semantic categories** | `Category` model + many-to-many with `GlossData` — see below |
+| Related glosses | Existing `RelatedGloss` — import from `related_signs.*` only |
+| Corpus forms | `CorpusForm[]` on `GlossData` |
+| Iconicity | `GlossData.iconicity` (`String?`) — e.g. `"Sí"`, `"No"` |
+| Valency | `GlossData.valency` (`String?`) — from fitxa `valencia`; verb transitivity / argument structure |
+| Key signs | `KeySignGroup[]` — `glosses: string[]`, `comment?`; maps `signes_claus` |
+| Named entity | `GlossData.namedEntity` (`String?`) — maps `entitat_amb_nom` |
+| Simultaneous morphology | `SimultaneousMorphology[]` — `morphemeGloss`, `meaningInSign` |
+| Abbreviated morphology | `AbbreviatedMorphology[]` — `abbreviatedGloss`, `roleInSign` |
+| Handedness | `Handedness` enum on `VideoData` — from `nombre_mans` (`1`, `2a`, `2n`, `2s`, `x`) |
+| Per-hand config | FK to `HandConfigurationEntry` catalog (dominant + non-dominant); articulator relations on `VideoData` — see §3.4 |
+| **Hand configuration catalog** | `HandConfigurationEntry` — extensible labels + aliases; replaces closed `HandConfiguration` enum for new values |
+| Shared phonology | Remaining `VideoData` fields (location, movement, contact, etc.) — single value per sign |
+| **Definition lexical category** | Make `Definition.lexicalCategory` **optional** (`LexicalCategory?`) — remove `@default(NOUN)` |
+
+**Semantic category model (v1 — required):**
+
+```prisma
+model Category {
+  id      String      @id @default(uuid())
+  name    String      @unique   // "Aliment", "Família", "Acte físic"
+  glosses GlossData[]
+}
+
+model GlossData {
+  // ... existing fields
+  categories Category[]
+}
+```
+
+- Import: for each string in fitxa `categories[]`, find-or-create `Category` by name and link to gloss.
+- API: `GET /categories?search=` for combobox; `POST /categories` to create; attach via gloss update payload.
+
+**Compound model (v1 — required):**
+
+A compound gloss (`isCompound: true`) has **no `SignVideo` / `VideoData` of its own**. Phonology lives on the components.
+
+Each `CompoundPart` is either a **linked gloss** or an **inline morpheme**:
+
+| Component type | DB fields | Phonology |
+|--------------|-----------|-----------|
+| Linked gloss | `linkedGlossId` → `GlossData` (resolved from `comp_id` / `compExternalId`) | Resolved from linked gloss: if simple, use its `VideoData`; if compound, recurse into its `CompoundPart[]` |
+| Inline morpheme | `linkedGlossId: null`, `inlinePhonology` → `VideoData` | Stored directly on the part (from JSON `phonology` block) |
+
+```prisma
+model GlossData {
+  // ... existing fields
+  externalId     String?  @unique
+  sourceDocPath  String?
+  isCompound     Boolean  @default(false)
+  iconicity      String?
+  valency        String?              // fitxa valencia — verb valency / transitivity
+  namedEntity    String?              // fitxa entitat_amb_nom
+  compoundParts  CompoundPart[]
+  usedInCompounds CompoundPart[] @relation("CompoundPartLinkedGloss")
+  categories     Category[]
+  keySignGroups       KeySignGroup[]
+  simultaneousMorphology SimultaneousMorphology[]
+  abbreviatedMorphology  AbbreviatedMorphology[]
+  // corpusForms — relations via RelatedGloss only (related_signs.*)
+  // Note: when isCompound, do NOT attach SignVideo/VideoData to this gloss
+}
+
+model KeySignGroup {
+  id          String    @id @default(uuid())
+  glossDataId String
+  glossData   GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+  position    Int       @default(0)
+  glosses     String[]  // ordered gloss labels
+  comment     String?
+}
+
+model SimultaneousMorphology {
+  id            String    @id @default(uuid())
+  glossDataId   String
+  glossData     GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+  morphemeGloss String    // glossa_morfema
+  meaningInSign String?   // significat_en_aquest_signe
+}
+
+model AbbreviatedMorphology {
+  id              String    @id @default(uuid())
+  glossDataId     String
+  glossData       GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+  abbreviatedGloss String?  // glossa_abreujada
+  roleInSign      String?   // rol_en_aquest_signe
+}
+
+model CompoundPart {
+  id              String     @id @default(uuid())
+  glossDataId     String
+  glossData       GlossData  @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+  position        Int        // maps ordinal; 1, 2, or 3
+  gloss           String     // display label: "GERMÀ", "SEGON"
+  compExternalId  String?    // fitxa comp_id for import traceability
+  linkedGlossId   String?    // FK when component references another gloss
+  linkedGloss     GlossData? @relation("CompoundPartLinkedGloss", fields: [linkedGlossId], references: [id])
+  redundant       Boolean    @default(false)
+  inlinePhonology VideoData? // phonology when linkedGlossId is null (inline morpheme)
+}
+```
+
+**Constraints:**
+
+- `isCompound: true` → must have 2–3 `CompoundPart` rows with unique `position` values.
+- `isCompound: false` → no `CompoundPart` rows; phonology on `SignVideo` / `VideoData` as today.
+- Nesting: `linkedGloss` may point to another `isCompound` gloss; resolver recurses (warn if depth > 2).
+
+Fields **not** in v1 schema: `occurrences`, `relacio_signes_forasters`, `synonyms`, top-level `lexical_category`.
+
+### 3.2 Import pipeline
+
+Planned script: [`backend/scripts/import-fitxas.ts`](../backend/scripts/import-fitxas.ts) (not yet created).
+
+| Task | Detail |
+|------|--------|
+| TypeScript interface | Schema v2 fitxa shape; support single-entry and bundle layouts |
+| Field mappers | Use v2 names (`gloss_name`, `translations.english`, `compound.components`, etc.) |
+| Enum resolver update | [`backend/src/import/fitxa-enum-resolver.ts`](../backend/src/import/fitxa-enum-resolver.ts) currently maps legacy `configuracio` / `relacio_articuladors` — must handle `configuracio_ma_dominant`, `configuracio_ma_no_dominant`, `relacio_articuladors_ma_*`, and `nombre_mans` → `Handedness` |
+| Definition parser | Extract optional `Verb-` / `Nom-` / `Adj-` prefix from each `definitions[]` entry → `Definition.lexicalCategory`; strip prefix from text. Leave `lexicalCategory` null when no prefix. **Skip** top-level `lexical_category`. |
+| Compound resolver | Resolve `comp_id` → `linkedGlossId`; when `comp_id` is null, map embedded `phonology` → `inlinePhonology` on `CompoundPart`. Do not create top-level `VideoData` when `isCompound`. Recurse when linked gloss is itself compound (warn if depth > 2). |
+| Category mapper | For each `categories[]` string: find-or-create `Category` by name; link to gloss (many-to-many) |
+| Metadata mapper | `iconicity`, `valencia` → `valency`, `entitat_amb_nom` → `namedEntity`, `signes_claus` → `KeySignGroup[]`, morphology arrays → `SimultaneousMorphology[]` / `AbbreviatedMorphology[]` |
+| Two-pass import | Pass 1: create glosses; pass 2: resolve `related_signs.*` and `minimal_pairs` by gloss name → `RelatedGloss` / `MinimalPair` |
+| Dry-run report | Per-file summary: stored vs skipped vs unmapped enum warnings |
+
+**Core field mapping (schema v2 → SignBank):**
+
+| Fitxa field | SignBank target |
+|-------------|-----------------|
+| `gloss_name` | `GlossData.gloss` |
+| `gloss_id` | `GlossData.externalId` |
+| `translations.*` | `GlossTranslation` |
+| `definitions[]` | `Definition[]` — optional `lexicalCategory` per row (parse prefix only) |
+| `lexical_category` (top-level) | **Skip** — not imported |
+| `phonology` | `VideoData` on `SignVideo` — **only when `isCompound` is false** |
+| `compound.*` | `isCompound` + ordered `CompoundPart[]` (linked gloss or inline phonology) |
+| `minimal_pairs[]` | `MinimalPair` |
+| `related_signs.*` | `RelatedGloss` (all relation types) |
+| `synonyms[]` | **Skip** — not imported |
+| `notes` | `GlossData.editComment` |
+| `video_urls[]` | `Video.url` (after Drive → Dufs) |
+| `categories[]` | `Category` many-to-many (find-or-create by name) |
+| `iconicity` | `GlossData.iconicity` |
+| `valencia` | `GlossData.valency` |
+| `signes_claus` | `KeySignGroup[]` |
+| `entitat_amb_nom` | `GlossData.namedEntity` |
+| `morfologia_simultania` | `SimultaneousMorphology[]` |
+| `morfologia_abreujada` | `AbbreviatedMorphology[]` |
+| `corpus_forms` | `CorpusForm[]` (hidden in UI for now) |
+
+**Relation type mapping:**
+
+| Fitxa key | `RelationType` |
+|-----------|----------------|
+| `SINÒNIM` | `SYNONYM` |
+| `ANTÒNIM` | `ANTONYM` |
+| `HOMÒNIM` | `HOMONYM` |
+| `VARIANT` | `VARIANT` |
+| `HIPERÒNIM` | `HYPERNYM` |
+| `HIPÒNIM` | `HYPONYM` |
+| `VEURE TAMBÉ` | `ASSOCIATED_CONCEPT` |
+
+### 3.3 UI (gloss detail)
+
+#### Phonology table (UI — v1) {#phonology-table-ui--v1}
+
+When a gloss uses **multiple hands** (`nombre_mans` is `2a`, `2n`, or `2s`), phonology is shown as a **table** with configuration labels on the left and **two value columns side by side**:
+
+| | **Main hand** (dominant) | **Non-dominant hand** |
+|---|--------------------------|------------------------|
+| Hand configuration | `B (B)` | `0_SSI (O)` |
+| Relation between articulators | Damunt | Sota |
+| Location | *(shared)* | *(shared)* |
+| … | … | … |
+
+**Layout rules:**
+
+| Rule | Detail |
+|------|--------|
+| **Column headers** | Main hand (dominant) \| Non-dominant hand — fixed labels, side by side |
+| **Row labels** | Left column: human-readable field names (configuration, relation between articulators, location, …) |
+| **Per-hand rows** | Different value in each hand column (configuration, articulator relation) |
+| **Shared rows** | Single value shown once (span both columns or repeat in both — implementer choice; prefer one merged cell) |
+| **Single-hand signs** | When `nombre_mans` is `1`, show **main hand column only** — hide non-dominant column |
+| **Editor** | Same table layout in gloss create/edit forms |
+| **Compounds** | Each component in the compound phonology block uses this table when that component is multi-hand |
+
+Example reference: `cervesa.json` (`nombre_mans: "2a"`, dominant `B (B)` / non-dominant `0_SSI (O)`).
+
+```mermaid
+flowchart LR
+  subgraph phonologyTable [Phonology table]
+    labels[Row labels]
+    dominant[Main hand column]
+    nonDominant[Non-dominant hand column]
+  end
+  labels --> dominant
+  labels --> nonDominant
+```
+
+#### Compound & morphology information table (v1)
+
+Single section grouping:
+
+| Subsection | Content |
+|------------|---------|
+| Sequential compound | Badge, ordered morpheme chain (`GERMÀ + SEGON → BESSONS-1d`), columnar phonology per component (each column may use the phonology table when multi-hand) |
+| Simultaneous morphology | Rows from `morfologia_simultania` (morpheme + meaning) |
+| Abbreviated morphology | Rows from `morfologia_abreujada` (abbreviated gloss + role) |
+| Named entity | `entitat_amb_nom` when set |
+
+Hide empty subsections. Shown for any gloss that has data — not only when `isCompound`.
+
+#### Other gloss detail (v1)
+
+| Feature | Priority | Notes |
+|---------|----------|-------|
+| Two-hand phonology table | v1 | Label column + main hand + non-dominant hand; configuration from catalog when available |
+| Linked gloss vs inline morpheme | v1 | Link to gloss detail when `linkedGlossId` set; show inline phonology otherwise |
+| Nested compound resolution | v1 | Recurse phonology when component links to another compound |
+| Key signs | v1 | Beside written definitions — gloss chains + comment per group |
+| Iconicity | v1 | Label or text from `iconicity` |
+| Valency | v1 | Label from `valency` (e.g. "Verb transitiu") — mainly for verbs |
+| Optional lexical category per definition | v1 | Show label (Verb, Nom, …) when set; hide when null |
+| Semantic categories (editor) | v1 | Searchable multi-select: pick existing or create new category |
+| Semantic categories (gloss detail) | v1 | Display category chips |
+| Search filter by category | Later | Typesense facet once categories are indexed |
+| Corpus forms | Hidden | Admin-only or future |
+
+### 3.4 Phonology vocabulary — extensibility & mapping
+
+#### Extensible hand configurations (DB + code — required)
+
+Fitxa phonology uses **human-readable labels** (`B (B)`, `Q (Beak)`, `T_antiga (Money)`, `0_SSI (O)`, …). SignBank today stores hand configuration as a **closed Prisma enum** (`HandConfiguration`: `CONF_1` … `CONF_40`, Unicode variants) with labels hardcoded in frontend i18n ([`phonology.ts`](../frontend/src/i18n/ca-ES/phonology.ts)).
+
+**Problem:**
+
+| Limitation | Impact |
+|------------|--------|
+| New fitxa labels not in enum / mappings | Import maps to `EMPTY` + warning ([`fitxas-mapping-analysis.json`](fitxas-mapping-analysis.json): 6 xlsx config rows without `signbankId`) |
+| Adding enum value | Requires Prisma migration + backend + frontend i18n + Typesense schema update |
+| Per-hand fields (§1.3) | Dominant and non-dominant each need a configuration — vocabulary must scale |
+
+**Requirement:** Ability to **add new phonology hand configurations** without a full application redeploy for every new label from the dictionary team.
+
+**Proposed direction (catalog table):**
+
+Move hand configuration from a fixed enum to a **database catalog** (other phonology dimensions may follow later; start with configuration):
+
+```prisma
+model HandConfigurationEntry {
+  id           String   @id @default(uuid())
+  code         String   @unique   // stable key, e.g. CONF_33 or generated slug
+  labelCa      String?
+  labelEn      String?
+  aliases      String[]           // fitxa labels: "q (beak)", "b (b)", …
+  externalId   String?            // xlsx ID_CONFIGURACIO when present
+  active       Boolean  @default(true)
+}
+
+model VideoData {
+  // replace HandConfiguration enum fields with FK or code string:
+  dominantConfigurationId     String?
+  dominantConfiguration       HandConfigurationEntry? @relation(...)
+  nonDominantConfigurationId  String?
+  nonDominantConfiguration    HandConfigurationEntry? @relation(...)
+}
+```
+
+| Layer | Change |
+|-------|--------|
+| **DB** | `HandConfigurationEntry` catalog; `VideoData` references catalog (migration from enum) |
+| **Import** | `resolveFitxaEnum('configuration', label)` → lookup catalog by alias; if missing, **create pending entry** or queue for admin review |
+| **API** | `GET /phonology/configurations?search=` for editor combobox; `POST` (admin) to add configuration + aliases |
+| **UI** | Phonology editor (§3.3 two-hand table): searchable select — pick existing or **add new configuration** (admin / editor flow TBD) |
+| **Typesense** | Index configuration codes/labels for search facets — update when catalog changes |
+| **Seed / migrate** | One-time import of current `HandConfiguration` enum values + xlsx `Configuracions` sheet into catalog |
+
+**Interim (before catalog migration):** Continue [`fitxa-enum-mappings.json`](../backend/src/import/fitxa-enum-mappings.json) + manual alias updates — not sufficient long term.
+
+> **Status:** Needs design session — enum-to-catalog migration is a breaking schema change. Plan alongside Phase 1 per-hand `VideoData` fields.
+
+#### Enum mapping gaps (current pipeline)
+
+[`fitxas-enum-mappings.md`](fitxas-enum-mappings.md) and [`fitxas-mapping-analysis.json`](fitxas-mapping-analysis.json) still need wiring for:
+
+- Per-hand configuration (`configuracio_ma_dominant`, `configuracio_ma_no_dominant`)
+- `nombre_mans` → `Handedness` (distinct from `Hand` enum)
+- XLSX sheets not yet connected: `Etiquetes-Tags`, `València`, `Entitat_amb_nom_named_entity`, `Morfologia seqüencial`
+- Combined values like `B (B) / O_SSI (O)` need split logic (v1 used single `configuracio` field)
+
+Regenerate ENUM reference: `node backend/scripts/generate-enum-reference.js`
+
+### 3.5 Admin fitxa import page (UI — planned, complex)
+
+> **Status:** Noted for planning only. **Do not implement in passing** — this feature is complex and will need a **dedicated implementation session with active prompting** (step-by-step UX, API contract, error handling, and edge cases).
+
+An **admin-only** page in the Vue frontend where authorised users upload fitxa JSON files and import them into the database.
+
+#### Access
+
+| Rule | Detail |
+|------|--------|
+| **Role** | `ADMIN` only (reuse existing auth guards / `RolesGuard`) |
+| **Route** | New admin route (e.g. `/admin/import-fitxas`) — not linked for regular users |
+
+#### Core behaviour
+
+| Capability | Detail |
+|------------|--------|
+| **Multi-file upload** | Admin selects or drops **multiple** `.json` files in one session |
+| **Format support** | Single-entry fitxa per file (`menjar.json`) and multi-entry bundles (`bessons.json`) |
+| **Parse & import** | Server parses schema v2 JSON and writes to PostgreSQL via the import pipeline |
+| **Batch** | Process all uploaded files; report per-file and per-gloss outcomes |
+
+#### Why this is complex (defer detailed design)
+
+Likely sub-features that need explicit design before coding:
+
+- **Dry-run vs commit** — preview warnings before writing to DB
+- **Upsert** — update existing glosses matched by `gloss_id` / `externalId`
+- **Two-pass relations** — `related_signs` and `minimal_pairs` resolved after all glosses exist
+- **Per-file / per-gloss error report** — unmapped phonology, missing relation targets, invalid JSON
+- **Progress & cancellation** — long-running batch for hundreds of files
+- **Publication mode** — draft vs published (ties to open publication workflow decision)
+- **Videos** — optional Drive download or skip video fields on first import
+- **Backend surface** — NestJS import module + REST endpoint(s) vs wrapping CLI script; file upload size limits
+
+#### Dependencies
+
+Must exist (or be stubbed) before the UI page:
+
+1. Phase 1 schema migration
+2. Import service / API (extracted from `import-fitxas` script logic)
+3. Auth: admin role on import endpoints
+
+#### Implementation note
+
+When starting this work, use **focused prompts** per slice, for example:
+
+1. Import API endpoint + DTOs + admin guard  
+2. Upload component (multi-file, validation)  
+3. Dry-run results panel  
+4. Commit import + progress  
+5. Error / warning report download  
+
+Do not attempt full page + backend + import logic in a single pass.
+
+### 3.6 Gloss edit & create pages (UI — major rework planned)
+
+> **Status:** Noted for planning. The current gloss create/edit flow predates fitxa import requirements and must be **extended significantly**. Treat as a **multi-session effort** alongside Phase 1 schema and API work — not a quick add-on.
+
+#### Affected pages & components
+
+| Path | Role today |
+|------|------------|
+| [`CreateGlossRequest.vue`](../frontend/src/pages/CreateGlossRequest.vue) | Create flow — **gloss name only**, then redirect to edit |
+| [`EditGlossRequest.vue`](../frontend/src/pages/EditGlossRequest.vue) | Draft request editing |
+| [`GlossPage.vue`](../frontend/src/pages/GlossPage.vue) | Published gloss view + edit |
+| [`MoreContentComponent.vue`](../frontend/src/components/GlossDetail/components/MoreContentComponent.vue) | Edit stepper: definitions → videos → optional (examples, relations) |
+| [`GlossDetailComponent.vue`](../frontend/src/components/GlossDetail/GlossDetailComponent.vue) | Shared detail / edit shell |
+| [`SignFonologyComponent.vue`](../frontend/src/components/GlossDetail/components/SignFonologyComponent.vue) | Phonology editor — **single-hand** `PhonologyData` only |
+| [`DefinitionsComponent`](../frontend/src/components/GlossDetail/components/DefinitionsComponent/) | Definitions — lexical category **required**, defaults to `NOUN` |
+
+#### Gaps vs fitxa requirements
+
+| Requirement (this doc) | Current UI |
+|------------------------|------------|
+| Optional lexical category per definition (§2.3) | Required select; always shows category |
+| Two-hand phonology table (§3.3) | Single configuration per `VideoData`; no dominant / non-dominant columns |
+| Semantic categories multi-select (§2.4) | Not present |
+| Compound & morphology table (§2.5, §3.3) | Not present — no compound parts, simultaneous / abbreviated morphology, named entity |
+| Key signs, iconicity, valency (§2.6) | Not present |
+| Compound glosses (no top-level phonology) | Assumes every gloss has `SignVideo` + phonology |
+
+#### Planned improvements (v1 editor)
+
+Extend the edit stepper (or reorganise into sections/tabs) to support:
+
+| Section | Edit capabilities |
+|---------|-------------------|
+| **Definitions** | Optional lexical category; hide when empty |
+| **Semantic categories** | Searchable multi-select; create new category inline |
+| **Gloss metadata** | Iconicity, valency (optional fields) |
+| **Key signs** | Add/edit groups: ordered gloss list + comment |
+| **Phonology** | Two-hand table when multi-hand; configuration picker backed by extensible catalog (§3.4) |
+| **Compound & morphology** | Compound parts (linked gloss or inline morpheme), simultaneous morphology, abbreviated morphology, named entity — same table as read-only detail |
+| **Videos** | Existing flow; adapt validation when `isCompound` (no top-level phonology required) |
+
+Read-only **detail view** (`MainContent.vue`) must mirror the same sections so imported fitxas display correctly.
+
+#### Dependencies
+
+1. **Phase 1** — Prisma models and fields on `GlossData`, `Definition`, `VideoData`, etc.
+2. **Backend API** — CRUD payloads extended for new fields (gloss-data service, DTOs)
+3. **Frontend types** — [`models.ts`](../frontend/src/types/models.ts) `GlossData`, `PhonologyData` updated
+4. **Validation** — [`glossValidation.ts`](../frontend/src/utils/glossValidation.ts) rules for compounds vs simple signs
+
+#### Implementation note
+
+Break into focused slices (similar to §3.5):
+
+1. Types + API client for new fields  
+2. Definitions: optional lexical category  
+3. Semantic categories combobox  
+4. Phonology two-hand table (editor + read-only)
+5. Extensible hand configuration catalog + admin/API (§3.4)
+6. Compound & morphology editor block
+7. Key signs + iconicity + valency
+8. Stepper / layout reorganisation + validation updates
+
+The create page may stay minimal (name only) or gain an early categories/metadata step — decide when implementing.
+
+---
+
+## 4. Still open
+
+| # | Question | Owner |
+|---|----------|-------|
+| 1 | `morfologia_abreujada` — exact domain meaning | Ask Lali (store and display regardless) |
+| 2 | Publication workflow (direct / draft / hybrid) | SignBank team |
+| 3 | Video pipeline (Drive download vs pre-exported files) | SignBank team |
+| 4 | `nombre_mans` vs existing `Hand` enum semantics | Technical — may keep both fields |
+| 5 | `annotations` field purpose | Domain |
+| 6 | Maximum compound nesting depth (expected ~2, not confirmed) | Domain — implement with soft warning at depth > 2 |
+| 7 | Dictionary search filter by semantic category | Later — after editor + import |
+| 8 | Admin fitxa import page — full UX and API contract | Dedicated implementation session; see §3.5 |
+| 9 | Gloss edit/create pages — full rework for new fields | Multi-session; see §3.6 |
+| 10 | Hand configuration catalog vs Prisma enum migration | Technical — see §3.4 |
+
+---
+
+## 5. Implementation phases
+
+| Phase | Scope |
+|-------|-------|
+| **1 — Schema** | Migration: compounds, metadata, per-hand phonology, handedness, traceability; **hand configuration catalog** (§3.4) |
+| **2 — Dry-run importer** | Schema v2 `Examples/`; no DB writes; gap report |
+| **3 — Full import** | DB writes, relation pass, optional video pipeline |
+| **4 — UI** | Gloss detail + **edit/create page rework** (§3.6): phonology table, compounds, categories, metadata |
+| **5 — Production** | Full dataset dry-run → staging import → spot-check → Typesense sync → production with backup |
+| **6 — Admin import UI** | Admin-only page: multi-file JSON upload, parse, dry-run preview, import — **complex; needs active prompting** (§3.5) |
+
+See [`fitxas-import-plan.md`](fitxas-import-plan.md) for architecture, CLI flags, and technical hard problems (phonology mapping, videos, relations, publication workflow).
+
+---
+
+## 6. Sample file reference
+
+### `menjar.json` — multi-sense, metadata-rich
+
+- 2 definitions (Verb + Nom) with embedded category prefixes
+- `synonyms[]`: present in JSON but **skipped** on import; relations from `related_signs.VARIANT`: `["CONSUM"]`
+- `categories`: `["Acte físic"]`
+- `morfologia_simultania`: descriptive classifier
+- `signes_claus`: 2 groups with gloss lists and comments
+- `related_signs.VARIANT`: `["CONSUM"]`
+- `minimal_pairs`: `EMPASSAR-SE`
+- Phonology: single hand (`nombre_mans: "1"`)
+
+### `cervesa.json` — two-hand phonology
+
+- Single definition (Nom)
+- `nombre_mans: "2a"` — triggers two-hand phonology table in UI
+- Per-hand: `B (B)` / `0_SSI (O)` configuration; `Damunt` / `Sota` articulator relations
+- Shared: location, orientation, contact, movement direction, repeated movement
+- 2 minimal pairs (one with uncertain distinction)
+
+### `bessons-1d.json` — compound sign
+
+- `compound.is_compound: true`; top-level `phonology: null`
+- Ordered components: `GERMÀ` (position 1, linked via `comp_id`) + `SEGON` (position 2, inline morpheme, `comp_id: null`)
+- Demonstrates both component types: linked gloss and inline phonology-only morpheme
+- `related_signs.VARIANT`: `["BESSONS-T_antiga"]`
+
+### `bessons.json` — multi-entry bundle
+
+- Contains `BESSONS-T_antiga` and `BESSONS-1d` as sibling entries
+- Demonstrates variant relation between compound and non-compound forms
+
+---
+
+## Related docs & code
+
+| Resource | Path |
+|----------|------|
+| Implementation plan | [`fitxas-import-plan.md`](fitxas-import-plan.md) |
+| Meeting agenda (raw notes) | [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md) |
+| ENUM mapping workflow | [`fitxas-enum-mappings.md`](fitxas-enum-mappings.md) |
+| ENUM reference | [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md) |
+| Gap analysis | [`fitxas-mapping-analysis.json`](fitxas-mapping-analysis.json) |
+| Prisma schema | [`backend/prisma/schema.prisma`](../backend/prisma/schema.prisma) |
+| Enum resolver | [`backend/src/import/fitxa-enum-resolver.ts`](../backend/src/import/fitxa-enum-resolver.ts) |
+| Sample data | [`Examples/`](../Examples/) |
diff --git a/frontend/src/components/GlossDetail/components/MainContent.vue b/frontend/src/components/GlossDetail/components/MainContent.vue
index 63c4993..66ebe2f 100644
--- a/frontend/src/components/GlossDetail/components/MainContent.vue
+++ b/frontend/src/components/GlossDetail/components/MainContent.vue
@@ -150,6 +150,8 @@ const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.v
 }
 
 .gloss-video-column {
+  display: flex;
+  flex-direction: column;
   flex: 0 0 42%;
   min-width: 0;
   min-height: 0;
diff --git a/frontend/src/components/GlossDetail/components/SignVideoAside.vue b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
index 31423ec..d195dfa 100644
--- a/frontend/src/components/GlossDetail/components/SignVideoAside.vue
+++ b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
@@ -23,13 +23,17 @@
       @click="emit('showAllVideos')"
     />
 
-    <GlossTranslationsComponent
+    <div
       v-if="hasGlossTranslations"
-      :gloss-data="glossData"
-      :edit-mode="false"
-      hide-section-title
-      compact
-    />
+      class="sign-video-panel__translations"
+    >
+      <GlossTranslationsComponent
+        :gloss-data="glossData"
+        :edit-mode="false"
+        hide-section-title
+        compact
+      />
+    </div>
   </div>
 </template>
 
@@ -73,12 +77,26 @@ const detailsButtonLabel = computed(() =>
 
 <style scoped>
 .sign-video-aside {
+  flex: 0 0 auto;
   border-radius: var(--sb-card-radius, 12px);
   overflow: hidden;
+  max-width: 100%;
 }
 
 .sign-video-panel {
+  display: flex;
+  flex-direction: column;
   height: 100%;
   max-height: 100%;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.sign-video-panel__translations {
+  flex: 1 1 0;
+  min-height: 0;
+  overflow-x: hidden;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
 }
 </style>
diff --git a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
index 8940920..2581cf2 100644
--- a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
+++ b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
@@ -138,7 +138,9 @@ function selectVideo(videoId: string | undefined) {
   flex: 1 1 0;
   min-height: 0;
   width: 100%;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
 }
 
 .sign-videos-browse__toolbar {
@@ -198,12 +200,15 @@ function selectVideo(videoId: string | undefined) {
 
 .sign-videos-browse__single {
   flex: 0 0 auto;
-  margin-bottom: 16px;
+  width: 100%;
+  max-width: var(--sb-video-max-width, 480px);
+  margin: 0 auto 16px;
 }
 
 .sign-videos-browse__single-video {
   border-radius: var(--sb-card-radius, 12px);
   overflow: hidden;
+  max-width: 100%;
 }
 
 .sign-videos-browse__phonology {
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index c5882f7..ec1da1a 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -19,6 +19,7 @@ const translations: TranslateKeys = {
   decline: 'Rebutjar',
   reviewRequest: 'Revisar sol·licitud',
   backToRequests: 'Tornar a sol·licituds',
+  backToSearch: 'Tornar a la cerca',
   requestedBy: 'Sol·licitat per',
   acceptedBy: 'Acceptat per',
   exitEditMode: 'Sortir del mode d\'edició',
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index 723dc33..6e65454 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -289,6 +289,7 @@ const translations: TranslateKeys = {
   decline: 'Decline',
   reviewRequest: 'Review Request',
   backToRequests: 'Back to Requests',
+  backToSearch: 'Back to Search',
   requestedBy: 'Requested by',
   addMinimalPair: 'Add minimal pair',
   addRelation: 'Add relation',
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 7938142..64e05da 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -237,6 +237,7 @@ const translations: TranslateKeys = {
   addMinimalPair: 'Añadir par mínimo',
   addRelation: 'Añadir relación',
   backToRequests: 'Volver a solicitudes',
+  backToSearch: 'Volver a búsqueda',
   BOTH: 'Ambos',
   LEFT: 'Izquierda',
   RIGHT: 'Derecha',
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index 923db66..c62625d 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -720,6 +720,7 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   decline: string;
   reviewRequest: string;
   backToRequests: string;
+  backToSearch: string;
   requestedBy: string;
   addRelation: string;
   acceptedBy: string;
diff --git a/frontend/src/pages/GlossPage.vue b/frontend/src/pages/GlossPage.vue
index 202fdcb..49dac36 100644
--- a/frontend/src/pages/GlossPage.vue
+++ b/frontend/src/pages/GlossPage.vue
@@ -38,17 +38,34 @@
       </div>
     </div>
 
-    <GlossDetailComponent
+    <div
       v-else-if="glossData"
-      v-model:edit-mode="editMode"
-      class="gloss-page__detail col column"
-      :class="{ 'gloss-page__detail--editing': editMode }"
-      :gloss-data="glossData"
-      :allow-edit="true"
-      :constrained-layout="!editMode"
-      @save-gloss="saveGloss"
-      @update:gloss-data="updateGlossData"
-    />
+      class="gloss-page__content col column"
+      :class="{ 'gloss-page__content--editing': editMode }"
+    >
+      <div
+        v-if="!editMode"
+        class="gloss-page__toolbar q-px-md q-pt-sm"
+      >
+        <q-btn
+          flat
+          icon="arrow_back"
+          :label="translate('backToSearch')"
+          @click="router.push('/search')"
+        />
+      </div>
+
+      <GlossDetailComponent
+        v-model:edit-mode="editMode"
+        class="gloss-page__detail col column"
+        :class="{ 'gloss-page__detail--editing': editMode }"
+        :gloss-data="glossData"
+        :allow-edit="true"
+        :constrained-layout="!editMode"
+        @save-gloss="saveGloss"
+        @update:gloss-data="updateGlossData"
+      />
+    </div>
   </q-page>
 </template>
 
@@ -124,6 +141,24 @@ const updateGlossData = (updatedGlossData: GlossData) => {
   flex-direction: column;
 }
 
+.gloss-page__content {
+  flex: 1 1 0;
+  min-height: 0;
+  height: 100%;
+  overflow: hidden;
+}
+
+.gloss-page__content--editing {
+  flex: 1 1 auto;
+  min-height: auto;
+  height: auto;
+  overflow: visible;
+}
+
+.gloss-page__toolbar {
+  flex: 0 0 auto;
+}
+
 .gloss-page__detail {
   flex: 1 1 0;
   min-height: 0;

From 7af2ab8fcd73b54f994576a9e817d9cb47fa6b60 Mon Sep 17 00:00:00 2001
From: Ramon <ramondonadeucaballero@gmail.com>
Date: Fri, 19 Jun 2026 16:51:08 +0200
Subject: [PATCH 09/17] feat: improve phonolgy view. Addint two hands
 configuration

---
 backend/prisma/emptySeed.ts                   |   2 +-
 .../migration.sql                             |  23 +
 backend/prisma/schema.prisma                  |  18 +-
 backend/prisma/seed.ts                        |  62 +-
 .../dto/create-gloss-request.dto.ts           |  20 +-
 backend/src/import/fitxa-enum-resolver.ts     | 251 +++--
 backend/src/search/search.service.ts          |   2 +-
 .../sign-videos/dto/create-sign-video.dto.ts  |  22 +-
 .../sign-videos/dto/update-sign-video.dto.ts  |  22 +-
 backend/src/sign-videos/dto/video-data.dto.ts |  50 +-
 .../src/sign-videos/sign-videos.service.ts    |  55 +-
 .../src/typesense/types/gloss-index.type.ts   |  10 +-
 backend/src/typesense/typesense.config.ts     |   8 +-
 backend/src/typesense/typesense.service.ts    |  14 +-
 .../GlossDetail/GlossDetailComponent.vue      |   4 +-
 .../CreateDefinitionDialog.vue                |   9 +-
 .../DefinitionsComponent.vue                  |  54 +-
 .../ExamplesComponent/ExampleCardDesktop.vue  |   2 +-
 .../ExamplesComponent/ExampleCardMobile.vue   |   2 +-
 .../GlossDetail/components/GlossHeader.vue    | 201 ++--
 .../GlossDetail/components/GlossSearch.vue    |  47 +-
 .../components/GlossTranslationsComponent.vue |   4 +-
 .../components/GlossVideoComponent.vue        |  11 +-
 .../GlossDetail/components/MainContent.vue    |   3 +
 .../components/SignFonologyComponent.vue      |  25 +-
 .../components/SignVideosBrowseView.vue       | 305 +++---
 .../components/VideosComponent.vue            | 660 ++++++++----
 frontend/src/components/HeaderComponent.vue   |  34 +-
 .../src/components/Search/SearchFilters.vue   |  41 +-
 .../Search/components/FilterInputs.vue        |  14 +-
 .../Search/components/SearchInput.vue         |   5 +-
 .../components/SearchPhonologyFilters.vue     | 119 +--
 frontend/src/components/Search/types.ts       |   8 +-
 .../src/components/Shared/EditableModule.vue  |   1 -
 .../components/Shared/PhonologyFilters.vue    | 948 +-----------------
 .../src/components/Shared/PhonologyTable.vue  | 389 +++++++
 .../components/Shared/PhonologyTableRow.vue   | 248 +++++
 .../Shared/PhonologyTableSharedRow.vue        | 121 +++
 .../UserManagement/ChangePasswordDialog.vue   |  14 +-
 .../UserManagement/CreateUserDialog.vue       |  14 +-
 .../UserManagement/DeleteUserDialog.vue       |  11 +-
 .../components/UserManagement/UsersTable.vue  |   9 +-
 frontend/src/css/app.css                      |  19 +
 frontend/src/i18n/ca-ES/index.ts              |   6 +
 frontend/src/i18n/ca-ES/phonology.ts          |  12 +
 frontend/src/i18n/en-US/index.ts              |   8 +-
 frontend/src/i18n/en-US/phonology.ts          |  12 +
 frontend/src/i18n/es-ES/index.ts              |   6 +
 frontend/src/i18n/es-ES/phonology.ts          |  12 +
 frontend/src/i18n/translateKeys.ts            |  18 +
 frontend/src/pages/CreateGlossRequest.vue     |   7 +-
 frontend/src/pages/GlossPage.vue              |   9 +-
 frontend/src/pages/SearchPage.vue             |  43 +-
 frontend/src/pages/UserManagementPage.vue     |  10 +-
 frontend/src/services/search.service.ts       |  12 +-
 frontend/src/types/api.ts                     |  19 +-
 frontend/src/types/enums.ts                   |  10 +-
 frontend/src/types/models.ts                  |  10 +-
 .../src/utils/UserManagement/tableColumns.ts  |   2 +-
 frontend/src/utils/phonologyHelpers.ts        |  65 ++
 frontend/src/utils/phonologyOptions.ts        |  21 +-
 61 files changed, 2409 insertions(+), 1754 deletions(-)
 create mode 100644 backend/prisma/migrations/20250619120000_two_hand_phonology/migration.sql
 create mode 100644 frontend/src/components/Shared/PhonologyTable.vue
 create mode 100644 frontend/src/components/Shared/PhonologyTableRow.vue
 create mode 100644 frontend/src/components/Shared/PhonologyTableSharedRow.vue
 create mode 100644 frontend/src/utils/phonologyHelpers.ts

diff --git a/backend/prisma/emptySeed.ts b/backend/prisma/emptySeed.ts
index dfbabe1..60574b7 100644
--- a/backend/prisma/emptySeed.ts
+++ b/backend/prisma/emptySeed.ts
@@ -1,4 +1,4 @@
-import { PrismaClient, Role, Language, LexicalCategory, Hand, GlossStatus, ConfigurationChange, RelationBetweenArticulators, Location, MovementType, MovementRelatedOrientation, OrientationChange, ContactType, OrientationRelatedToLocation, HandConfiguration, RelationType } from '@prisma/client';
+import { PrismaClient, Role, Language, LexicalCategory, Handedness, GlossStatus, ConfigurationChange, RelationBetweenArticulators, Location, MovementType, MovementRelatedOrientation, OrientationChange, ContactType, OrientationRelatedToLocation, HandConfiguration, RelationType } from '@prisma/client';
 import * as argon2 from 'argon2';
 
 const prisma = new PrismaClient();
diff --git a/backend/prisma/migrations/20250619120000_two_hand_phonology/migration.sql b/backend/prisma/migrations/20250619120000_two_hand_phonology/migration.sql
new file mode 100644
index 0000000..70210d7
--- /dev/null
+++ b/backend/prisma/migrations/20250619120000_two_hand_phonology/migration.sql
@@ -0,0 +1,23 @@
+-- CreateEnum
+CREATE TYPE "Handedness" AS ENUM ('ONE', 'TWO_A', 'TWO_N', 'TWO_S', 'NA');
+
+-- AlterTable: add new columns
+ALTER TABLE "VideoData" ADD COLUMN "handedness" "Handedness" NOT NULL DEFAULT 'ONE';
+ALTER TABLE "VideoData" ADD COLUMN "dominantConfiguration" "HandConfiguration";
+ALTER TABLE "VideoData" ADD COLUMN "nonDominantConfiguration" "HandConfiguration";
+ALTER TABLE "VideoData" ADD COLUMN "dominantRelationBetweenArticulators" "RelationBetweenArticulators";
+ALTER TABLE "VideoData" ADD COLUMN "nonDominantRelationBetweenArticulators" "RelationBetweenArticulators";
+
+-- Migrate data from old columns
+UPDATE "VideoData" SET "handedness" = 'ONE' WHERE "hands" IN ('RIGHT', 'LEFT');
+UPDATE "VideoData" SET "handedness" = 'TWO_S' WHERE "hands" = 'BOTH';
+UPDATE "VideoData" SET "dominantConfiguration" = "configuration";
+UPDATE "VideoData" SET "dominantRelationBetweenArticulators" = "relationBetweenArticulators";
+
+-- Drop old columns
+ALTER TABLE "VideoData" DROP COLUMN "hands";
+ALTER TABLE "VideoData" DROP COLUMN "configuration";
+ALTER TABLE "VideoData" DROP COLUMN "relationBetweenArticulators";
+
+-- DropEnum
+DROP TYPE "Hand";
diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
index ea99aab..46177fc 100644
--- a/backend/prisma/schema.prisma
+++ b/backend/prisma/schema.prisma
@@ -67,10 +67,12 @@ enum RelationType {
     HYPONYM
 }
 
-enum Hand {
-    RIGHT
-    LEFT
-    BOTH
+enum Handedness {
+    ONE
+    TWO_A
+    TWO_N
+    TWO_S
+    NA
 }
 
 enum GlossStatus {
@@ -643,10 +645,12 @@ model SignVideo {
 }
 
 model VideoData {
-    hands                        Hand
-    configuration                HandConfiguration
+    handedness                         Handedness                   @default(ONE)
+    dominantConfiguration              HandConfiguration?
+    nonDominantConfiguration           HandConfiguration?
+    dominantRelationBetweenArticulators  RelationBetweenArticulators?
+    nonDominantRelationBetweenArticulators RelationBetweenArticulators?
     configurationChanges         ConfigurationChange
-    relationBetweenArticulators  RelationBetweenArticulators
     location                     Location
     movementRelatedOrientation   MovementRelatedOrientation
     orientationRelatedToLocation OrientationRelatedToLocation
diff --git a/backend/prisma/seed.ts b/backend/prisma/seed.ts
index 7e47a84..d7c22c5 100644
--- a/backend/prisma/seed.ts
+++ b/backend/prisma/seed.ts
@@ -1,4 +1,4 @@
-import { PrismaClient, Role, Language, LexicalCategory, Hand, GlossStatus, ConfigurationChange, RelationBetweenArticulators, Location, MovementType, MovementRelatedOrientation, OrientationChange, ContactType, OrientationRelatedToLocation, HandConfiguration, RelationType, MovementDirection } from '@prisma/client';
+import { PrismaClient, Role, Language, LexicalCategory, Handedness, GlossStatus, ConfigurationChange, RelationBetweenArticulators, Location, MovementType, MovementRelatedOrientation, OrientationChange, ContactType, OrientationRelatedToLocation, HandConfiguration, RelationType, MovementDirection } from '@prisma/client';
 import * as argon2 from 'argon2';
 
 const prisma = new PrismaClient();
@@ -146,10 +146,10 @@ async function main() {
           glossData: { connect: { id: collGlossData.id } },
           videoData: {
             create: {
-              hands: senseTitle === 'Coll (part del cos)' ? Hand.RIGHT : Hand.BOTH,
-              configuration: HandConfiguration.CONF_1,
+              handedness: senseTitle === 'Coll (part del cos)' ? Handedness.ONE : Handedness.TWO_S,
+              dominantConfiguration: HandConfiguration.CONF_1,
               configurationChanges: ConfigurationChange.BENDING,
-              relationBetweenArticulators: RelationBetweenArticulators.ABOVE,
+              dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE,
               location: senseTitle === 'Coll (part del cos)' ? Location.NECK : Location.NEUTRAL_SPACE,
               movementRelatedOrientation: MovementRelatedOrientation.FRONT,
               orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -292,10 +292,10 @@ async function main() {
       glossData: { connect: { id: contentGlossData.id } },
       videoData: {
         create: {
-          hands: Hand.BOTH,
-          configuration: HandConfiguration.CONF_8,
+          handedness: Handedness.TWO_S,
+          dominantConfiguration: HandConfiguration.CONF_8,
           configurationChanges: ConfigurationChange.OPENING_AND_SPREADING,
-          relationBetweenArticulators: RelationBetweenArticulators.CROSS,
+          dominantRelationBetweenArticulators: RelationBetweenArticulators.CROSS,
           location: Location.CHEST,
           movementRelatedOrientation: MovementRelatedOrientation.FRONT,
           orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -325,10 +325,10 @@ async function main() {
       glossData: { connect: { id: felicGlossData.id } },
       videoData: {
         create: {
-          hands: Hand.RIGHT,
-          configuration: HandConfiguration.CONF_15,
+          handedness: Handedness.ONE,
+          dominantConfiguration: HandConfiguration.CONF_15,
           configurationChanges: ConfigurationChange.CLOSING_AND_WIGGLING,
-          relationBetweenArticulators: RelationBetweenArticulators.FRONT,
+          dominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT,
           location: Location.CHEEK,
           movementRelatedOrientation: MovementRelatedOrientation.FRONT,
           orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -674,10 +674,10 @@ async function main() {
         glossData: { connect: { id: petitGlossData.id } },
         videoData: {
           create: {
-            hands: Hand.BOTH,
-            configuration: HandConfiguration.CONF_23,
+            handedness: Handedness.TWO_S,
+            dominantConfiguration: HandConfiguration.CONF_23,
             configurationChanges: ConfigurationChange.CLOSING_AND_RUBBING,
-            relationBetweenArticulators: RelationBetweenArticulators.INSIDE,
+            dominantRelationBetweenArticulators: RelationBetweenArticulators.INSIDE,
             location: Location.NEUTRAL_SPACE,
             movementRelatedOrientation: MovementRelatedOrientation.FRONT,
             orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -705,10 +705,10 @@ async function main() {
         glossData: { connect: { id: granGlossData.id } },
         videoData: {
           create: {
-            hands: Hand.BOTH,
-            configuration: HandConfiguration.CONF_31,
+            handedness: Handedness.TWO_S,
+            dominantConfiguration: HandConfiguration.CONF_31,
             configurationChanges: ConfigurationChange.OPENING_AND_RUBBING,
-            relationBetweenArticulators: RelationBetweenArticulators.ABOVE_BELOW,
+            dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE_BELOW,
             location: Location.NEUTRAL_SPACE,
             movementRelatedOrientation: MovementRelatedOrientation.FRONT,
             orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -736,10 +736,10 @@ async function main() {
         glossData: { connect: { id: bancGlossData.id } },
         videoData: {
           create: {
-            hands: Hand.RIGHT,
-            configuration: HandConfiguration.CONF_12,
+            handedness: Handedness.ONE,
+            dominantConfiguration: HandConfiguration.CONF_12,
             configurationChanges: ConfigurationChange.UNBENDING,
-            relationBetweenArticulators: RelationBetweenArticulators.FRONT,
+            dominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT,
             location: Location.WEAK_HAND_PALM,
             movementRelatedOrientation: MovementRelatedOrientation.FRONT,
             orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -767,10 +767,10 @@ async function main() {
         glossData: { connect: { id: bancGlossData.id } },
         videoData: {
           create: {
-            hands: Hand.BOTH,
-            configuration: HandConfiguration.CONF_18,
+            handedness: Handedness.TWO_S,
+            dominantConfiguration: HandConfiguration.CONF_18,
             configurationChanges: ConfigurationChange.CURVING,
-            relationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
+            dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
             location: Location.HORIZONTAL_PLANE,
             movementRelatedOrientation: MovementRelatedOrientation.FRONT,
             orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -798,10 +798,10 @@ async function main() {
         glossData: { connect: { id: sotaGlossData.id } },
         videoData: {
           create: {
-            hands: Hand.RIGHT,
-            configuration: HandConfiguration.CONF_25,
+            handedness: Handedness.ONE,
+            dominantConfiguration: HandConfiguration.CONF_25,
             configurationChanges: ConfigurationChange.OPENING_AND_WIGGLING,
-            relationBetweenArticulators: RelationBetweenArticulators.BELOW,
+            dominantRelationBetweenArticulators: RelationBetweenArticulators.BELOW,
             location: Location.WEAK_HAND_PALM,
             movementRelatedOrientation: MovementRelatedOrientation.FRONT,
             orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -829,10 +829,10 @@ async function main() {
         glossData: { connect: { id: sobreGlossData.id } },
         videoData: {
           create: {
-            hands: Hand.RIGHT,
-            configuration: HandConfiguration.CONF_35,
+            handedness: Handedness.ONE,
+            dominantConfiguration: HandConfiguration.CONF_35,
             configurationChanges: ConfigurationChange.OPENING_TO_CLOSING,
-            relationBetweenArticulators: RelationBetweenArticulators.ABOVE,
+            dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE,
             location: Location.WEAK_HAND_PALM,
             movementRelatedOrientation: MovementRelatedOrientation.FRONT,
             orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -860,10 +860,10 @@ async function main() {
         glossData: { connect: { id: sobreGlossData.id } },
         videoData: {
           create: {
-            hands: Hand.BOTH,
-            configuration: HandConfiguration.CONF_42,
+            handedness: Handedness.TWO_S,
+            dominantConfiguration: HandConfiguration.CONF_42,
             configurationChanges: ConfigurationChange.CLOSING_TO_OPENING,
-            relationBetweenArticulators: RelationBetweenArticulators.FRONT_BACK,
+            dominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT_BACK,
             location: Location.NEUTRAL_SPACE,
             movementRelatedOrientation: MovementRelatedOrientation.FRONT,
             orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
diff --git a/backend/src/gloss-requests/dto/create-gloss-request.dto.ts b/backend/src/gloss-requests/dto/create-gloss-request.dto.ts
index 659a9ea..9d1d4a8 100644
--- a/backend/src/gloss-requests/dto/create-gloss-request.dto.ts
+++ b/backend/src/gloss-requests/dto/create-gloss-request.dto.ts
@@ -1,19 +1,29 @@
 import { IsString, IsOptional, ValidateNested, IsEnum, IsNotEmpty, ArrayNotEmpty, IsInt, Min, IsArray } from 'class-validator';
 import { Type, Transform } from 'class-transformer';
-import { Language, LexicalCategory, Hand, RelationType, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType } from '@prisma/client';
+import { Language, LexicalCategory, Handedness, RelationType, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType } from '@prisma/client';
 
 export class VideoDataDto {
-  @IsEnum(Hand)
-  hands: Hand;
+  @IsEnum(Handedness)
+  handedness: Handedness;
 
   @IsEnum(HandConfiguration)
-  configuration: HandConfiguration;
+  @IsOptional()
+  dominantConfiguration?: HandConfiguration;
+
+  @IsEnum(HandConfiguration)
+  @IsOptional()
+  nonDominantConfiguration?: HandConfiguration;
 
   @IsEnum(ConfigurationChange)
   configurationChanges: ConfigurationChange;
 
   @IsEnum(RelationBetweenArticulators)
-  relationBetweenArticulators: RelationBetweenArticulators;
+  @IsOptional()
+  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
+
+  @IsEnum(RelationBetweenArticulators)
+  @IsOptional()
+  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
 
   @IsEnum(Location)
   location: Location;
diff --git a/backend/src/import/fitxa-enum-resolver.ts b/backend/src/import/fitxa-enum-resolver.ts
index 7278e49..c637719 100644
--- a/backend/src/import/fitxa-enum-resolver.ts
+++ b/backend/src/import/fitxa-enum-resolver.ts
@@ -1,103 +1,148 @@
-import * as fs from 'fs';
-import * as path from 'path';
-
-const mappings = JSON.parse(
-  fs.readFileSync(path.join(__dirname, 'fitxa-enum-mappings.json'), 'utf8'),
-) as typeof import('./fitxa-enum-mappings.json');
-
-export type FitxaMappingField = keyof typeof mappings.fields;
-
-export interface EnumResolveResult<T = string> {
-  value: T | null;
-  field: FitxaMappingField;
-  input: string;
-}
-
-function normalize(input: string): string {
-  return input
-    .trim()
-    .normalize('NFD')
-    .replace(/\p{M}/gu, '')
-    .toLowerCase()
-    .replace(/\s+/g, ' ');
-}
-
-function stripCompoundPrefix(input: string): string {
-  return input.replace(/^\d+n\s+comp:\s*/i, '').trim();
-}
-
-function buildAliasIndex(
-  entries: Array<{ signbankId?: string; value?: boolean; aliases: string[] }>,
-  valueKey: 'signbankId' | 'value' = 'signbankId',
-): Map<string, string | boolean> {
-  const index = new Map<string, string | boolean>();
-  for (const entry of entries) {
-    const value = entry[valueKey];
-    if (value === undefined) continue;
-    for (const alias of entry.aliases) {
-      index.set(normalize(alias), value);
-    }
-  }
-  return index;
-}
-
-const aliasIndexes: Partial<Record<FitxaMappingField, Map<string, string | boolean>>> = {};
-
-function getIndex(field: FitxaMappingField): Map<string, string | boolean> {
-  if (!aliasIndexes[field]) {
-    const fieldData = mappings.fields[field];
-    if (!fieldData?.entries) return new Map();
-    const valueKey = field === 'repeatedMovement' ? 'value' : 'signbankId';
-    aliasIndexes[field] = buildAliasIndex(fieldData.entries as any, valueKey as any);
-  }
-  return aliasIndexes[field]!;
-}
-
-/** Resolve a scraped label to a SignBank enum ID (or boolean for repeatedMovement). */
-export function resolveFitxaEnum(
-  field: FitxaMappingField,
-  raw: string | null | undefined,
-): EnumResolveResult {
-  const input = String(raw ?? '').trim();
-  if (!input) return { value: null, field, input };
-
-  const index = getIndex(field);
-  const candidates = [input, stripCompoundPrefix(input)];
-
-  for (const candidate of candidates) {
-    const hit = index.get(normalize(candidate));
-    if (hit !== undefined) {
-      return { value: hit as string, field, input };
-    }
-  }
-
-  return { value: null, field, input };
-}
-
-/** Map JSON phonology block to SignBank VideoData enum fields. */
-export function mapPhonologyFromFitxa(phonology: Record<string, unknown>) {
-  const fieldMap: Array<[FitxaMappingField, string]> = [
-    ['configuration', 'configuracio'],
-    ['configurationChanges', 'canvi_configuracio'],
-    ['relationBetweenArticulators', 'relacio_articuladors'],
-    ['location', 'localitzacio'],
-    ['movementRelatedOrientation', 'orientacio_moviment'],
-    ['orientationRelatedToLocation', 'orientacio_localitzacio'],
-    ['orientationChange', 'canvi_orientacio'],
-    ['contactType', 'tipus_contacte'],
-    ['movementType', 'forma_moviment'],
-    ['movementDirection', 'direccio_moviment'],
-  ];
-
-  const result: Record<string, EnumResolveResult> = {};
-  for (const [field, jsonKey] of fieldMap) {
-    result[jsonKey] = resolveFitxaEnum(field, phonology[jsonKey] as string);
-  }
-
-  const repeated = resolveFitxaEnum('repeatedMovement', phonology.moviment_repetit as string);
-  result.moviment_repetit = repeated;
-
-  return result;
-}
-
-export { mappings };
+import * as fs from 'fs';

+import * as path from 'path';

+

+const mappings = JSON.parse(

+  fs.readFileSync(path.join(__dirname, 'fitxa-enum-mappings.json'), 'utf8'),

+) as typeof import('./fitxa-enum-mappings.json');

+

+export type FitxaMappingField = keyof typeof mappings.fields;

+

+export interface EnumResolveResult<T = string> {

+  value: T | null;

+  field: FitxaMappingField;

+  input: string;

+}

+

+const FITXA_HANDEDNESS_TO_SIGNBANK: Record<string, string> = {

+  '1': 'ONE',

+  '2a': 'TWO_A',

+  '2n': 'TWO_N',

+  '2s': 'TWO_S',

+  x: 'NA',

+};

+

+function normalize(input: string): string {

+  return input

+    .trim()

+    .normalize('NFD')

+    .replace(/\p{M}/gu, '')

+    .toLowerCase()

+    .replace(/\s+/g, ' ');

+}

+

+function stripCompoundPrefix(input: string): string {

+  return input.replace(/^\d+n\s+comp:\s*/i, '').trim();

+}

+

+function buildAliasIndex(

+  entries: Array<{ signbankId?: string; code?: string; value?: boolean; aliases: string[] }>,

+  valueKey: 'signbankId' | 'value' | 'code' = 'signbankId',

+): Map<string, string | boolean> {

+  const index = new Map<string, string | boolean>();

+  for (const entry of entries) {

+    const value = entry[valueKey];

+    if (value === undefined) continue;

+    for (const alias of entry.aliases) {

+      index.set(normalize(String(alias)), value);

+    }

+    if (entry.code !== undefined) {

+      index.set(normalize(String(entry.code)), entry.code);

+    }

+  }

+  return index;

+}

+

+const aliasIndexes: Partial<Record<FitxaMappingField, Map<string, string | boolean>>> = {};

+

+function getIndex(field: FitxaMappingField): Map<string, string | boolean> {

+  if (!aliasIndexes[field]) {

+    const fieldData = mappings.fields[field];

+    if (!fieldData?.entries) return new Map();

+    const valueKey = field === 'repeatedMovement' ? 'value' : 'signbankId';

+    aliasIndexes[field] = buildAliasIndex(fieldData.entries as any, valueKey as any);

+  }

+  return aliasIndexes[field]!;

+}

+

+/** Resolve a scraped label to a SignBank enum ID (or boolean for repeatedMovement). */

+export function resolveFitxaEnum(

+  field: FitxaMappingField,

+  raw: string | null | undefined,

+): EnumResolveResult {

+  const input = String(raw ?? '').trim();

+  if (!input) return { value: null, field, input };

+

+  if (field === 'handedness') {

+    const code = normalize(input);

+    const signbankId = FITXA_HANDEDNESS_TO_SIGNBANK[code] ?? null;

+    return { value: signbankId, field, input };

+  }

+

+  const index = getIndex(field);

+  const candidates = [input, stripCompoundPrefix(input)];

+

+  for (const candidate of candidates) {

+    const hit = index.get(normalize(candidate));

+    if (hit !== undefined) {

+      return { value: hit as string, field, input };

+    }

+  }

+

+  return { value: null, field, input };

+}

+

+export interface MappedPhonologyFromFitxa {

+  handedness: EnumResolveResult;

+  dominantConfiguration: EnumResolveResult;

+  nonDominantConfiguration: EnumResolveResult;

+  dominantRelationBetweenArticulators: EnumResolveResult;

+  nonDominantRelationBetweenArticulators: EnumResolveResult;

+  shared: Record<string, EnumResolveResult>;

+  moviment_repetit: EnumResolveResult;

+}

+

+/** Map JSON phonology block (schema v2) to SignBank VideoData enum fields. */

+export function mapPhonologyFromFitxa(phonology: Record<string, unknown>): MappedPhonologyFromFitxa {

+  const sharedFieldMap: Array<[FitxaMappingField, string]> = [

+    ['configurationChanges', 'canvi_configuracio'],

+    ['location', 'localitzacio'],

+    ['movementRelatedOrientation', 'orientacio_moviment'],

+    ['orientationRelatedToLocation', 'orientacio_localitzacio'],

+    ['orientationChange', 'canvi_orientacio'],

+    ['contactType', 'tipus_contacte'],

+    ['movementType', 'forma_moviment'],

+    ['movementDirection', 'direccio_moviment'],

+  ];

+

+  const shared: Record<string, EnumResolveResult> = {};

+  for (const [field, jsonKey] of sharedFieldMap) {

+    shared[jsonKey] = resolveFitxaEnum(field, phonology[jsonKey] as string);

+  }

+

+  const repeated = resolveFitxaEnum('repeatedMovement', phonology.moviment_repetit as string);

+

+  return {

+    handedness: resolveFitxaEnum('handedness', phonology.nombre_mans as string),

+    dominantConfiguration: resolveFitxaEnum(

+      'configuration',

+      phonology.configuracio_ma_dominant as string,

+    ),

+    nonDominantConfiguration: resolveFitxaEnum(

+      'configuration',

+      phonology.configuracio_ma_no_dominant as string,

+    ),

+    dominantRelationBetweenArticulators: resolveFitxaEnum(

+      'relationBetweenArticulators',

+      phonology.relacio_articuladors_ma_dominant as string,

+    ),

+    nonDominantRelationBetweenArticulators: resolveFitxaEnum(

+      'relationBetweenArticulators',

+      phonology.relacio_articuladors_ma_no_dominant as string,

+    ),

+    shared,

+    moviment_repetit: repeated,

+  };

+}

+

+export { mappings };

+
\ No newline at end of file
diff --git a/backend/src/search/search.service.ts b/backend/src/search/search.service.ts
index 9bb9d47..9c7209a 100644
--- a/backend/src/search/search.service.ts
+++ b/backend/src/search/search.service.ts
@@ -10,7 +10,7 @@ export class SearchService {
     try {
       const searchParameters = {
         q: searchQuery.query,
-        query_by: 'gloss,signVideoTitle,configuration,configurationChanges,description,relationBetweenArticulators,location,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType,hands',
+        query_by: 'gloss,signVideoTitle,dominantConfiguration,nonDominantConfiguration,configurationChanges,description,dominantRelationBetweenArticulators,nonDominantRelationBetweenArticulators,location,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType,handedness',
         filter_by: searchQuery.filter_by,
         facet_by: searchQuery.facet_by,
         page: searchQuery.page,
diff --git a/backend/src/sign-videos/dto/create-sign-video.dto.ts b/backend/src/sign-videos/dto/create-sign-video.dto.ts
index a100c6d..b5f48fa 100644
--- a/backend/src/sign-videos/dto/create-sign-video.dto.ts
+++ b/backend/src/sign-videos/dto/create-sign-video.dto.ts
@@ -1,6 +1,6 @@
 import { IsString, IsNotEmpty, IsArray, ValidateNested, IsOptional, IsNumber, IsEnum } from 'class-validator';
 import { Type } from 'class-transformer';
-import { Hand, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from '@prisma/client';
+import { Handedness, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from '@prisma/client';
 
 class VideoDto {
   @IsString()
@@ -24,20 +24,28 @@ class VideoDataDto {
   @IsNotEmpty()
   id: string;
 
-  @IsEnum(Hand)
-  hands: Hand;
+  @IsEnum(Handedness)
+  handedness: Handedness;
 
   @IsEnum(HandConfiguration)
   @IsOptional()
-  configuration?: HandConfiguration;
+  dominantConfiguration?: HandConfiguration;
 
-  @IsEnum(ConfigurationChange)
+  @IsEnum(HandConfiguration)
   @IsOptional()
-  configurationChanges?: ConfigurationChange;
+  nonDominantConfiguration?: HandConfiguration;
+
+  @IsEnum(RelationBetweenArticulators)
+  @IsOptional()
+  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
 
   @IsEnum(RelationBetweenArticulators)
   @IsOptional()
-  relationBetweenArticulators?: RelationBetweenArticulators;
+  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
+
+  @IsEnum(ConfigurationChange)
+  @IsOptional()
+  configurationChanges?: ConfigurationChange;
 
   @IsEnum(Location)
   @IsOptional()
diff --git a/backend/src/sign-videos/dto/update-sign-video.dto.ts b/backend/src/sign-videos/dto/update-sign-video.dto.ts
index af83018..5f7bdc0 100644
--- a/backend/src/sign-videos/dto/update-sign-video.dto.ts
+++ b/backend/src/sign-videos/dto/update-sign-video.dto.ts
@@ -1,6 +1,6 @@
 import { IsString, IsNotEmpty, IsArray, ValidateNested, IsOptional, IsNumber, IsEnum } from 'class-validator';
 import { Type } from 'class-transformer';
-import { Hand, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from '@prisma/client';
+import { Handedness, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from '@prisma/client';
 
 class VideoDto {
   @IsString()
@@ -24,20 +24,28 @@ class VideoDataDto {
   @IsNotEmpty()
   id: string;
 
-  @IsEnum(Hand)
-  hands: Hand;
+  @IsEnum(Handedness)
+  handedness: Handedness;
 
   @IsEnum(HandConfiguration)
   @IsOptional()
-  configuration?: HandConfiguration;
+  dominantConfiguration?: HandConfiguration;
 
-  @IsEnum(ConfigurationChange)
+  @IsEnum(HandConfiguration)
   @IsOptional()
-  configurationChanges?: ConfigurationChange;
+  nonDominantConfiguration?: HandConfiguration;
+
+  @IsEnum(RelationBetweenArticulators)
+  @IsOptional()
+  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
 
   @IsEnum(RelationBetweenArticulators)
   @IsOptional()
-  relationBetweenArticulators?: RelationBetweenArticulators;
+  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
+
+  @IsEnum(ConfigurationChange)
+  @IsOptional()
+  configurationChanges?: ConfigurationChange;
 
   @IsEnum(Location)
   @IsOptional()
diff --git a/backend/src/sign-videos/dto/video-data.dto.ts b/backend/src/sign-videos/dto/video-data.dto.ts
index da9817b..23afcf2 100644
--- a/backend/src/sign-videos/dto/video-data.dto.ts
+++ b/backend/src/sign-videos/dto/video-data.dto.ts
@@ -1,21 +1,41 @@
-import { IsEnum, IsBoolean, IsOptional } from 'class-validator';
-import { HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from '@prisma/client';
+import { IsEnum, IsBoolean, IsOptional, IsString } from 'class-validator';
+import {
+  Handedness,
+  HandConfiguration,
+  ConfigurationChange,
+  RelationBetweenArticulators,
+  Location,
+  MovementRelatedOrientation,
+  OrientationRelatedToLocation,
+  OrientationChange,
+  ContactType,
+  MovementType,
+  MovementDirection,
+} from '@prisma/client';
 
 export class VideoDataDto {
+  @IsEnum(Handedness)
+  handedness: Handedness;
+
   @IsEnum(HandConfiguration)
-  hands: HandConfiguration;
+  @IsOptional()
+  dominantConfiguration?: HandConfiguration;
 
-  @IsEnum(ConfigurationChange)
+  @IsEnum(HandConfiguration)
   @IsOptional()
-  configuration?: ConfigurationChange;
+  nonDominantConfiguration?: HandConfiguration;
 
-  @IsEnum(ConfigurationChange)
+  @IsEnum(RelationBetweenArticulators)
   @IsOptional()
-  configurationChanges?: ConfigurationChange[];
+  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
 
   @IsEnum(RelationBetweenArticulators)
   @IsOptional()
-  relationBetweenArticulators?: RelationBetweenArticulators;
+  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
+
+  @IsEnum(ConfigurationChange)
+  @IsOptional()
+  configurationChanges?: ConfigurationChange;
 
   @IsEnum(Location)
   @IsOptional()
@@ -45,7 +65,19 @@ export class VideoDataDto {
   @IsOptional()
   movementDirection?: MovementDirection;
 
+  @IsString()
+  @IsOptional()
+  vocalization?: string;
+
+  @IsString()
+  @IsOptional()
+  nonManualComponent?: string;
+
+  @IsString()
+  @IsOptional()
+  inicialization?: string;
+
   @IsBoolean()
   @IsOptional()
   repeatedMovement?: boolean;
-} 
\ No newline at end of file
+}
diff --git a/backend/src/sign-videos/sign-videos.service.ts b/backend/src/sign-videos/sign-videos.service.ts
index f241d39..9a2060e 100644
--- a/backend/src/sign-videos/sign-videos.service.ts
+++ b/backend/src/sign-videos/sign-videos.service.ts
@@ -2,10 +2,33 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CreateSignVideoDto, UpdateSignVideoDto } from './dto/index';
 import { PrismaService } from 'src/prisma/prisma.service'
-import { GlossData, Hand, Prisma } from '@prisma/client'
+import { GlossData, Handedness, Prisma } from '@prisma/client'
 import { GlossDataService } from 'src/gloss-data/gloss-data.service'
 import { GLOSS_SEARCH_SYNC_EVENT } from '../typesense/types/gloss-index.type';
 
+function buildVideoDataFields(
+  videoData: CreateSignVideoDto['videoData'] | UpdateSignVideoDto['videoData'],
+) {
+  return {
+    handedness: videoData.handedness || Handedness.ONE,
+    dominantConfiguration: videoData.dominantConfiguration ?? null,
+    nonDominantConfiguration: videoData.nonDominantConfiguration ?? null,
+    dominantRelationBetweenArticulators: videoData.dominantRelationBetweenArticulators ?? null,
+    nonDominantRelationBetweenArticulators: videoData.nonDominantRelationBetweenArticulators ?? null,
+    configurationChanges: videoData.configurationChanges || 'EMPTY',
+    location: videoData.location || 'EMPTY',
+    movementRelatedOrientation: videoData.movementRelatedOrientation || 'EMPTY',
+    orientationRelatedToLocation: videoData.orientationRelatedToLocation || 'EMPTY',
+    orientationChange: videoData.orientationChange || 'EMPTY',
+    contactType: videoData.contactType || 'EMPTY',
+    movementType: videoData.movementType || 'EMPTY',
+    movementDirection: videoData.movementDirection || 'EMPTY',
+    vocalization: videoData.vocalization || '',
+    nonManualComponent: videoData.nonManualComponent || '',
+    inicialization: videoData.inicialization || '',
+  };
+}
+
 @Injectable()
 export class SignVideosService {    
   constructor(
@@ -24,20 +47,7 @@ export class SignVideosService {
     const videoData = await this.prisma.videoData.create({
       data: {
         id: createSignVideoDto.videoData.id,
-        hands: createSignVideoDto.videoData.hands || 'RIGHT',
-        configuration: createSignVideoDto.videoData.configuration || 'EMPTY',
-        configurationChanges: createSignVideoDto.videoData.configurationChanges || 'EMPTY',
-        relationBetweenArticulators: createSignVideoDto.videoData.relationBetweenArticulators || 'EMPTY',
-        location: createSignVideoDto.videoData.location || 'EMPTY',
-        movementRelatedOrientation: createSignVideoDto.videoData.movementRelatedOrientation || 'EMPTY',
-        orientationRelatedToLocation: createSignVideoDto.videoData.orientationRelatedToLocation || 'EMPTY',
-        orientationChange: createSignVideoDto.videoData.orientationChange || 'EMPTY',
-        contactType: createSignVideoDto.videoData.contactType || 'EMPTY',
-        movementType: createSignVideoDto.videoData.movementType || 'EMPTY',
-        movementDirection: createSignVideoDto.videoData.movementDirection || 'EMPTY',
-        vocalization: createSignVideoDto.videoData.vocalization || '',
-        nonManualComponent: createSignVideoDto.videoData.nonManualComponent || '',
-        inicialization: createSignVideoDto.videoData.inicialization || ''
+        ...buildVideoDataFields(createSignVideoDto.videoData),
       }
     });
 
@@ -91,20 +101,7 @@ export class SignVideosService {
       where: { id: signVideo.videoDataId },
       data: {
         id: updateSignVideoDto.videoData.id,
-        hands: updateSignVideoDto.videoData.hands || 'RIGHT',
-        configuration: updateSignVideoDto.videoData.configuration || 'EMPTY',
-        configurationChanges: updateSignVideoDto.videoData.configurationChanges || 'EMPTY',
-        relationBetweenArticulators: updateSignVideoDto.videoData.relationBetweenArticulators || 'EMPTY',
-        location: updateSignVideoDto.videoData.location || 'EMPTY',
-        movementRelatedOrientation: updateSignVideoDto.videoData.movementRelatedOrientation || 'EMPTY',
-        orientationRelatedToLocation: updateSignVideoDto.videoData.orientationRelatedToLocation || 'EMPTY',
-        orientationChange: updateSignVideoDto.videoData.orientationChange || 'EMPTY',
-        contactType: updateSignVideoDto.videoData.contactType || 'EMPTY',
-        movementType: updateSignVideoDto.videoData.movementType || 'EMPTY',
-        movementDirection: updateSignVideoDto.videoData.movementDirection || 'EMPTY',
-        vocalization: updateSignVideoDto.videoData.vocalization || '',
-        nonManualComponent: updateSignVideoDto.videoData.nonManualComponent || '',
-        inicialization: updateSignVideoDto.videoData.inicialization || ''
+        ...buildVideoDataFields(updateSignVideoDto.videoData),
       }
     });
 
diff --git a/backend/src/typesense/types/gloss-index.type.ts b/backend/src/typesense/types/gloss-index.type.ts
index aa8c120..ed74afb 100644
--- a/backend/src/typesense/types/gloss-index.type.ts
+++ b/backend/src/typesense/types/gloss-index.type.ts
@@ -1,5 +1,5 @@
 import {
-  Hand,
+  Handedness,
   HandConfiguration,
   ConfigurationChange,
   RelationBetweenArticulators,
@@ -23,10 +23,12 @@ export interface GlossIndex {
   lexicalCategory: LexicalCategory | string;
   lexicalCategories: (LexicalCategory | string)[];
   description: string;
-  hands: Hand;
-  configuration: HandConfiguration | '';
+  handedness: Handedness;
+  dominantConfiguration: HandConfiguration | '';
+  nonDominantConfiguration: HandConfiguration | '';
+  dominantRelationBetweenArticulators: RelationBetweenArticulators | '';
+  nonDominantRelationBetweenArticulators: RelationBetweenArticulators | '';
   configurationChanges: ConfigurationChange | '';
-  relationBetweenArticulators: RelationBetweenArticulators | '';
   location: Location | '';
   movementRelatedOrientation: MovementRelatedOrientation | '';
   orientationRelatedToLocation: OrientationRelatedToLocation | '';
diff --git a/backend/src/typesense/typesense.config.ts b/backend/src/typesense/typesense.config.ts
index 99e4a28..72296a0 100644
--- a/backend/src/typesense/typesense.config.ts
+++ b/backend/src/typesense/typesense.config.ts
@@ -13,10 +13,12 @@ export const videosSchema: CollectionCreateSchema = {
     { name: 'lexicalCategory', type: 'string', facet: true },
     { name: 'lexicalCategories', type: 'string[]', facet: true, optional: true },
     { name: 'description', type: 'string', facet: true },
-    { name: 'hands', type: 'string', facet: true },
-    { name: 'configuration', type: 'string', facet: true },
+    { name: 'handedness', type: 'string', facet: true },
+    { name: 'dominantConfiguration', type: 'string', facet: true },
+    { name: 'nonDominantConfiguration', type: 'string', facet: true, optional: true },
+    { name: 'dominantRelationBetweenArticulators', type: 'string', facet: true, optional: true },
+    { name: 'nonDominantRelationBetweenArticulators', type: 'string', facet: true, optional: true },
     { name: 'configurationChanges', type: 'string', facet: true },
-    { name: 'relationBetweenArticulators', type: 'string', facet: true },
     { name: 'location', type: 'string', facet: true },
     { name: 'movementRelatedOrientation', type: 'string', facet: true },
     { name: 'orientationRelatedToLocation', type: 'string', facet: true },
diff --git a/backend/src/typesense/typesense.service.ts b/backend/src/typesense/typesense.service.ts
index 9c32b9c..fe3eff9 100644
--- a/backend/src/typesense/typesense.service.ts
+++ b/backend/src/typesense/typesense.service.ts
@@ -5,7 +5,7 @@ import { VIDEOS_COLLECTION_NAME, videosSchema } from './typesense.config';
 import { GlossIndex } from './types/gloss-index.type';
 import {
   GlossStatus,
-  Hand,
+  Handedness,
   Prisma,
 } from '@prisma/client';
 
@@ -157,10 +157,12 @@ export class TypesenseService implements OnModuleInit {
       lexicalCategory: primaryDefinition?.lexicalCategory ?? lexicalCategories[0] ?? '',
       lexicalCategories,
       description,
-      hands: videoData?.hands ?? Hand.RIGHT,
-      configuration: videoData?.configuration ?? '',
+      handedness: videoData?.handedness ?? Handedness.ONE,
+      dominantConfiguration: videoData?.dominantConfiguration ?? '',
+      nonDominantConfiguration: videoData?.nonDominantConfiguration ?? '',
+      dominantRelationBetweenArticulators: videoData?.dominantRelationBetweenArticulators ?? '',
+      nonDominantRelationBetweenArticulators: videoData?.nonDominantRelationBetweenArticulators ?? '',
       configurationChanges: videoData?.configurationChanges ?? '',
-      relationBetweenArticulators: videoData?.relationBetweenArticulators ?? '',
       location: videoData?.location ?? '',
       movementRelatedOrientation: videoData?.movementRelatedOrientation ?? '',
       orientationRelatedToLocation: videoData?.orientationRelatedToLocation ?? '',
@@ -408,11 +410,11 @@ export class TypesenseService implements OnModuleInit {
         q: searchParameters.q || '*',
         query_by:
           searchParameters.query_by ||
-          'gloss,signVideoTitle,description,configuration,location,hands,configurationChanges,relationBetweenArticulators,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType,movementDirection',
+          'gloss,signVideoTitle,description,dominantConfiguration,nonDominantConfiguration,location,handedness,configurationChanges,dominantRelationBetweenArticulators,nonDominantRelationBetweenArticulators,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType,movementDirection',
         filter_by: searchParameters.filter_by || '',
         facet_by:
           searchParameters.facet_by ||
-          'lexicalCategory,configuration,location,hands,configurationChanges,relationBetweenArticulators,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType,movementDirection,repeatedMovement,description,gloss,signVideoTitle',
+          'lexicalCategory,dominantConfiguration,nonDominantConfiguration,location,handedness,configurationChanges,dominantRelationBetweenArticulators,nonDominantRelationBetweenArticulators,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType,movementDirection,repeatedMovement,description,gloss,signVideoTitle',
         max_hits: searchParameters.max_hits || 100,
         page: searchParameters.page || 1,
         per_page: searchParameters.per_page || 20,
diff --git a/frontend/src/components/GlossDetail/GlossDetailComponent.vue b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
index 7559b5d..1619747 100644
--- a/frontend/src/components/GlossDetail/GlossDetailComponent.vue
+++ b/frontend/src/components/GlossDetail/GlossDetailComponent.vue
@@ -150,11 +150,13 @@ const handleGlossDataUpdate = (updatedGlossData: GlossData) => {
   height: 100%;
   display: flex;
   flex-direction: column;
-  overflow: hidden;
+  overflow-x: visible;
+  overflow-y: hidden;
 }
 
 .gloss-detail-card--constrained > :not(.gloss-detail-card__main) {
   flex: 0 0 auto;
+  flex-shrink: 0;
 }
 
 .gloss-detail-card--constrained .gloss-detail-card__main {
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/CreateDefinitionDialog.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/CreateDefinitionDialog.vue
index 75656ed..43c8952 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/CreateDefinitionDialog.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/CreateDefinitionDialog.vue
@@ -1,5 +1,8 @@
 <template>
-  <q-dialog v-model="showDialog" persistent>
+  <q-dialog
+    v-model="showDialog"
+    persistent
+  >
     <q-card style="min-width: 600px">
       <q-card-section>
         <div class="text-h6">
@@ -11,22 +14,22 @@
         <div class="column q-gutter-md">
           <!-- Definition Title -->
           <q-input
+            ref="titleInput"
             v-model="definition.title"
             :label="translate('definitionTitle')"
             outlined
             dense
-            ref="titleInput"
           />
 
           <!-- Definition Text -->
           <q-input
+            ref="definitionInput"
             v-model="definition.definition"
             :label="translate('definition')"
             outlined
             type="textarea"
             rows="3"
             :rules="[val => !!val || translate('definitionRequired')]"
-            ref="definitionInput"
           />
 
           <!-- Definition Video -->
diff --git a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
index b6eed4a..588d6d3 100644
--- a/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/DefinitionsComponent/DefinitionsComponent.vue
@@ -56,24 +56,24 @@
 
     <q-list v-if="!isMobile">
       <!-- Desktop -->
-        <DefinitionCardDesktop
-          v-for="(definition, index) in definitions.sort((a, b) => a.priority - b.priority)"
-          :key="definition.id || index"
-          :definition="definition"
-          :allow-edit="allowEdit"
-          :inline-edit="inlineEdit"
-          :hide-definition-video="hideDefinitionVideo"
-          @save="saveDefinition"
-          @delete="deleteDefinition"
-          @upload-video="uploadVideo"
-          @delete-video="deleteDefinitionVideo"
-          @video-error="handleVideoError"
-          @show-video="openVideo"
-          @update-translations="updateDefinitionTranslations"
-        />
-      </q-list>
-      <q-list v-else>
-        <!-- Mobile -->
+      <DefinitionCardDesktop
+        v-for="(definition, index) in definitions.sort((a, b) => a.priority - b.priority)"
+        :key="definition.id || index"
+        :definition="definition"
+        :allow-edit="allowEdit"
+        :inline-edit="inlineEdit"
+        :hide-definition-video="hideDefinitionVideo"
+        @save="saveDefinition"
+        @delete="deleteDefinition"
+        @upload-video="uploadVideo"
+        @delete-video="deleteDefinitionVideo"
+        @video-error="handleVideoError"
+        @show-video="openVideo"
+        @update-translations="updateDefinitionTranslations"
+      />
+    </q-list>
+    <q-list v-else>
+      <!-- Mobile -->
       <DefinitionCardMobile
         v-for="(definition, index) in definitions.sort((a, b) => a.priority - b.priority)"
         :key="definition.id || index"
@@ -139,8 +139,10 @@
           class="row items-center q-mb-sm"
         >
           <div class="col">
-            <div class="text-bold">{{ definition.title }}</div>
-            <div >{{ definition.definition }}</div>
+            <div class="text-bold">
+              {{ definition.title }}
+            </div>
+            <div>{{ definition.definition }}</div>
           </div>
           <div class="col-auto">
             <q-btn
@@ -179,11 +181,11 @@
   </q-dialog>
 
   <!-- Create Definition Dialog -->
-    <CreateDefinitionDialog
-      v-model="showCreateDefinitionDialog"
-      :gloss-data-id="glossData?.id || ''"
-      @definition-created="handleDefinitionCreated"
-    />
+  <CreateDefinitionDialog
+    v-model="showCreateDefinitionDialog"
+    :gloss-data-id="glossData?.id || ''"
+    @definition-created="handleDefinitionCreated"
+  />
 </template>
 
 <script setup lang="ts">
@@ -481,7 +483,7 @@ const saveSortDefinitions = async () => {
         updateData.videoDefinitionUrl = definition.videoDefinitionUrl
       }
       
-      return api.definitions.update(props.glossData!.id!, definition.id!, updateData)
+      return api.definitions.update(props.glossData.id!, definition.id!, updateData)
     })
     
     if (updatePromises.length === 0) {
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
index f1209d3..f9bb0a6 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardDesktop.vue
@@ -36,8 +36,8 @@
                 class="rounded-borders shadow-2"
                 :src="getVideoUrl(example.exampleVideoURL)"
                 muted
-                @error="$emit('videoError', $event)"
                 style="max-width: 100%; max-height: 250px; width: auto; height: auto;"
+                @error="$emit('videoError', $event)"
               />
               <q-btn
                 v-if="isEditing"
diff --git a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
index 6c5977a..ed82a6c 100644
--- a/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
+++ b/frontend/src/components/GlossDetail/components/ExamplesComponent/ExampleCardMobile.vue
@@ -52,8 +52,8 @@
                 class="rounded-borders shadow-2 full-width"
                 :src="getVideoUrl(example.exampleVideoURL)"
                 muted
-                @error="$emit('videoError', $event)"
                 style="max-width: 100%; max-height: 200px; width: 100%; height: auto; object-fit: contain;"
+                @error="$emit('videoError', $event)"
               />
               <q-btn
                 v-if="isEditing"
diff --git a/frontend/src/components/GlossDetail/components/GlossHeader.vue b/frontend/src/components/GlossDetail/components/GlossHeader.vue
index 3571cf5..65fb50b 100644
--- a/frontend/src/components/GlossDetail/components/GlossHeader.vue
+++ b/frontend/src/components/GlossDetail/components/GlossHeader.vue
@@ -1,10 +1,10 @@
 <template>
-  <q-card-section class="row justify-between items-center">
-    <div class="column">
-      <div class="row justify-between items-center">
+  <q-card-section class="gloss-header">
+    <div class="gloss-header__inner">
+      <div class="gloss-header__title column">
         <div
           v-if="!editMode || !allowEdit"
-          class="text-h4"
+          class="text-h4 gloss-header__gloss-name"
         >
           {{ localGlossData.gloss }}
         </div>
@@ -15,97 +15,91 @@
           :label="translate('gloss')"
           outlined
           debounce="500"
+          class="gloss-header__gloss-input"
           @update:model-value="saveGloss"
         />
-       
+
+        <div
+          v-if="requestStatus && requestStatus !== 'NOT_COMPLETED'"
+          class="q-mt-sm"
+        >
+          <q-chip
+            :color="getStatusColor(requestStatus)"
+            text-color="white"
+            :label="translate(requestStatus)"
+            dense
+          />
+        </div>
+        <div
+          v-if="isArchived"
+          class="q-mt-sm"
+        >
+          <q-chip
+            color="grey"
+            text-color="white"
+            :label="translate('archived')"
+            dense
+          />
+        </div>
       </div>
-      <!-- Status Info -->
-      <div
-        v-if="requestStatus && requestStatus !== 'NOT_COMPLETED'"
-        class="q-mt-sm"
-      >
-        <q-chip
-          :color="getStatusColor(requestStatus)"
-          text-color="white"
-          :label="translate(requestStatus)"
-          dense
+
+      <div class="gloss-header__actions row q-gutter-sm">
+        <q-btn
+          v-if="allowEdit && !editMode && userStore.isAdmin"
+          color="primary"
+          icon="edit"
+          :label="translate('edit')"
+          @click="emit('editGloss')"
         />
-      </div>
-      <!-- Archive Status -->
-      <div
-        v-if="isArchived"
-        class="q-mt-sm"
-      >
-        <q-chip
-          color="grey"
-          text-color="white"
-          :label="translate('archived')"
-          dense
+        <q-btn
+          v-if="allowEdit && !editMode && userStore.isAdmin && isPublished"
+          color="negative"
+          icon="archive"
+          :label="translate('archive')"
+          outline
+          @click="confirmArchive"
         />
-      </div>
-    </div>
-    <div class="row q-gutter-sm">
-      <q-btn
-        v-if="allowEdit && !editMode && userStore.isAdmin"
-        color="primary"
-        icon="edit"
-        :label="translate('edit')"
-        @click="emit('editGloss')"
-      />
-      <q-btn
-        v-if="allowEdit && !editMode && userStore.isAdmin && isPublished"
-        color="negative"
-        icon="archive"
-        :label="translate('archive')"
-        outline
-        class="q-mr-sm"
-        @click="confirmArchive"
-      />
-      <q-btn
-        v-if="allowEdit && !editMode && userStore.isAdmin && isArchived"
-        color="positive"
-        icon="unarchive"
-        :label="translate('unarchive')"
-        outline
-        class="q-mr-sm"
-        @click="confirmUnarchive"
-      />
-      <q-btn
-        v-if="allowEdit && editMode && router.currentRoute.value.path.includes('/gloss')"
-        color="negative"
-        icon="cancel"
-        :label="translate('exitEditMode')"
-        @click="emit('cancelGloss')"
-      />
-      <!-- Send Request — only outside the draft stepper (submit lives on last step) -->
-      <q-btn
-        v-if="requestStatus === 'NOT_COMPLETED' && !isDraft"
-        color="primary"
-        icon="send"
-        :label="translate('sendRequest')"
-        :loading="submitting"
-        class="q-mr-sm"
-        @click="submitRequest"
-      />
-
-      <template v-if="isConfirmRequestPage && requestStatus === RequestStatus.WAITING_FOR_APPROVAL">
         <q-btn
-          icon="check"
+          v-if="allowEdit && !editMode && userStore.isAdmin && isArchived"
           color="positive"
-          :label="translate('accept')"
+          icon="unarchive"
+          :label="translate('unarchive')"
           outline
-          class="q-mr-sm"
-          @click="acceptRequest"
+          @click="confirmUnarchive"
         />
         <q-btn
-          icon="close"
+          v-if="allowEdit && editMode && router.currentRoute.value.path.includes('/gloss')"
           color="negative"
-          :label="translate('decline')"
-          outline
-          class="q-mr-sm"
-          @click="declineRequest"
+          icon="cancel"
+          :label="translate('exitEditMode')"
+          @click="emit('cancelGloss')"
         />
-      </template>
+        <q-btn
+          v-if="requestStatus === 'NOT_COMPLETED' && !isDraft"
+          color="primary"
+          icon="send"
+          :label="translate('sendRequest')"
+          :loading="submitting"
+          @click="submitRequest"
+        />
+
+        <template v-if="isConfirmRequestPage && requestStatus === RequestStatus.WAITING_FOR_APPROVAL">
+          <q-btn
+            icon="check"
+            color="positive"
+            :label="translate('accept')"
+            outline
+            @click="acceptRequest"
+          />
+          <q-btn
+            icon="close"
+            color="negative"
+            :label="translate('decline')"
+            outline
+            @click="declineRequest"
+          />
+        </template>
+      </div>
     </div>
   </q-card-section>
 </template>
@@ -261,4 +255,43 @@ const getStatusColor = (status: RequestStatus | undefined): string => {
       return 'grey'
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.gloss-header {
+  flex: 0 0 auto;
+  flex-shrink: 0;
+  overflow: visible;
+  position: relative;
+  z-index: 2;
+}
+
+.gloss-header__inner {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.gloss-header__title {
+  flex: 1 1 180px;
+  min-width: 0;
+}
+
+.gloss-header__gloss-name {
+  word-break: break-word;
+}
+
+.gloss-header__gloss-input {
+  min-width: 200px;
+  max-width: 100%;
+}
+
+.gloss-header__actions {
+  flex: 0 0 auto;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/GlossDetail/components/GlossSearch.vue b/frontend/src/components/GlossDetail/components/GlossSearch.vue
index 1009d18..92ceeb9 100644
--- a/frontend/src/components/GlossDetail/components/GlossSearch.vue
+++ b/frontend/src/components/GlossDetail/components/GlossSearch.vue
@@ -173,7 +173,24 @@ import { getVideoUrl } from 'src/utils/videoUrl';
 import SearchInput from 'src/components/Search/components/SearchInput.vue';
 import FilterCategories from 'src/components/Search/components/FilterCategories.vue';
 import FilterInputs from 'src/components/Search/components/FilterInputs.vue';
-import type { PhonologyData } from 'src/types/models';
+
+type GlossSearchFilterInputs = {
+  handedness: string | null;
+  dominantConfiguration: string;
+  configurationChanges: string;
+  dominantRelationBetweenArticulators: string;
+  location: string;
+  movementRelatedOrientation: string;
+  orientationRelatedToLocation: string;
+  orientationChange: string;
+  contactType: string;
+  movementType: string;
+  vocalization: string;
+  nonManualComponent: string;
+  inicialization: string;
+  repeatedMovement: boolean | null;
+  movementDirection: string;
+};
 
 const t = (key: string) => translate(key);
 
@@ -199,11 +216,11 @@ const loading = ref(false);
 const page = ref(1);
 const perPage = ref(20);
 const selectedCategory = ref('');
-const filterInputs = ref<PhonologyData>({
-  hands: null,
-  configuration: '',
+const filterInputs = ref<GlossSearchFilterInputs>({
+  handedness: null,
+  dominantConfiguration: '',
   configurationChanges: '',
-  relationBetweenArticulators: '',
+  dominantRelationBetweenArticulators: '',
   location: '',
   movementRelatedOrientation: '',
   orientationRelatedToLocation: '',
@@ -212,7 +229,9 @@ const filterInputs = ref<PhonologyData>({
   movementType: '',
   vocalization: '',
   nonManualComponent: '',
-  inicialization: ''
+  inicialization: '',
+  repeatedMovement: null,
+  movementDirection: '',
 });
 
 // Computed
@@ -245,8 +264,10 @@ async function performSearch() {
     }
     
     for (const [field, value] of Object.entries(filterInputs.value)) {
-      if (value && value.trim()) {
-        filters.push(`${field}:='${value.trim()}'`);
+      if (value !== null && value !== '' && typeof value !== 'boolean') {
+        filters.push(`${field}:='${String(value).trim()}'`);
+      } else if (typeof value === 'boolean') {
+        filters.push(`${field}:=${value}`);
       }
     }
 
@@ -255,7 +276,7 @@ async function performSearch() {
       page: Number(page.value),
       limit: Number(perPage.value),
       filter_by: filters.join(' && ') || undefined,
-      facet_by: 'lexicalCategory,hands'
+      facet_by: 'lexicalCategory,handedness'
     };
     
     searchResults.value = await searchService.search(params);
@@ -274,7 +295,7 @@ function updateCategory(value: string) {
   selectedCategory.value = value;
 }
 
-function updateFilterInputs(value: PhonologyData) {
+function updateFilterInputs(value: GlossSearchFilterInputs) {
   filterInputs.value = value;
 }
 
@@ -288,10 +309,10 @@ function updatePage(value: number) {
 function clearFilters() {
   selectedCategory.value = '';
   filterInputs.value = {
-    hands: null,
-    configuration: '',
+    handedness: null,
+    dominantConfiguration: '',
     configurationChanges: '',
-    relationBetweenArticulators: '',
+    dominantRelationBetweenArticulators: '',
     location: '',
     movementRelatedOrientation: '',
     orientationRelatedToLocation: '',
diff --git a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
index 8c4b8b2..b71fee4 100644
--- a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
@@ -239,7 +239,7 @@ const deleteTranslation = async (translation: GlossTranslation) => {
   if (!translation.id) {
     const index = localGlossData.value.glossTranslations?.findIndex((t) => t === translation) ?? -1;
     if (index !== -1) {
-      localGlossData.value.glossTranslations!.splice(index, 1);
+      localGlossData.value.glossTranslations.splice(index, 1);
     }
     return;
   }
@@ -270,7 +270,7 @@ const cancelTranslation = (translation: GlossTranslation) => {
   if (!translation.id) {
     const index = localGlossData.value.glossTranslations?.findIndex((t) => t === translation) ?? -1;
     if (index !== -1) {
-      localGlossData.value.glossTranslations!.splice(index, 1);
+      localGlossData.value.glossTranslations.splice(index, 1);
     }
   }
 };
diff --git a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
index f49b808..461a7d2 100644
--- a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
@@ -3,6 +3,7 @@
     <div
       v-if="hasAnyVideoUrl || editMode"
       class="video-angle-container"
+      :class="{ 'video-angle-container--compact': compact }"
     >
       <video
         v-for="video in sortedVideosWithUrl"
@@ -311,13 +312,21 @@ const moveVideoRight = async () => {
 <style scoped>
 .video-angle-container {
   position: relative;
-  width: 100%;
+  width: min(100%, var(--sb-video-max-width, 480px));
+  max-width: 100%;
   aspect-ratio: 16 / 9;
+  max-height: var(--sb-video-max-height, none);
+  margin-inline: auto;
   background: #000;
   border-radius: var(--sb-card-radius, 12px);
   overflow: hidden;
 }
 
+.video-angle-container--compact {
+  max-height: var(--sb-video-compact-max-height, 140px);
+  width: min(100%, calc(var(--sb-video-compact-max-height, 140px) * 16 / 9));
+}
+
 .angle-video {
   position: absolute;
   inset: 0;
diff --git a/frontend/src/components/GlossDetail/components/MainContent.vue b/frontend/src/components/GlossDetail/components/MainContent.vue
index 66ebe2f..fa4ae69 100644
--- a/frontend/src/components/GlossDetail/components/MainContent.vue
+++ b/frontend/src/components/GlossDetail/components/MainContent.vue
@@ -147,6 +147,7 @@ const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.v
 
 .gloss-view-layout__body--all-videos {
   gap: 0;
+  min-height: 0;
 }
 
 .gloss-video-column {
@@ -197,11 +198,13 @@ const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.v
   .gloss-video-column {
     flex: 0 0 auto;
     width: 100%;
+    max-height: calc(var(--sb-video-max-height, 200px) + 72px);
   }
 
   .gloss-content-column {
     flex: 1 1 0;
     width: 100%;
+    min-height: 0;
   }
 }
 </style>
diff --git a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
index fec47cf..0134aef 100644
--- a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
+++ b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="sign-phonology q-mt-sm">
-    <div class="text-subtitle2 text-weight-medium q-mb-sm">
+  <div class="sign-phonology">
+    <div class="text-subtitle2 text-weight-medium sign-phonology__title">
       {{ translate('signFonology') }}
     </div>
-    <PhonologyFilters
+    <PhonologyTable
       :phonology-data="videoData"
       :is-editable="editMode"
-      :compact="compact"
+      :compact="compact ?? false"
       @update:phonology-data="$emit('update:video-data', $event)"
     />
   </div>
@@ -15,7 +15,7 @@
 <script setup lang="ts">
 import { PhonologyData } from 'src/types/models';
 import translate from 'src/utils/translate';
-import PhonologyFilters from 'src/components/Shared/PhonologyFilters.vue';
+import PhonologyTable from 'src/components/Shared/PhonologyTable.vue';
 
 defineProps<{
   videoData: PhonologyData;
@@ -27,3 +27,18 @@ defineEmits<{
   (e: 'update:video-data', value: PhonologyData): void;
 }>();
 </script>
+
+<style scoped>
+.sign-phonology {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  flex: 1 1 auto;
+  height: 100%;
+}
+
+.sign-phonology__title {
+  flex: 0 0 auto;
+  margin-bottom: 8px;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
index 2581cf2..5f1ec74 100644
--- a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
+++ b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
@@ -10,75 +10,76 @@
         @click="emit('back')"
       />
       <span
-        v-if="sortedVideos.length > 1"
+        v-if="hasMultipleVideos"
         class="text-body2 text-grey-7"
       >
-        {{ sortedVideos.length }} {{ translate('videos') }}
+        {{ pickerVideos.length }} {{ translate('videos') }}
       </span>
     </div>
 
-    <div
-      v-if="sortedVideos.length > 1"
-      class="sign-videos-browse__gallery"
-    >
-      <button
-        v-for="video in sortedVideos"
-        :key="video.id"
-        type="button"
-        class="sign-videos-browse__card"
-        :class="{ 'sign-videos-browse__card--active': video.id === selectedVideoId }"
-        @click="selectVideo(video.id)"
-      >
-        <div class="sign-videos-browse__card-title ellipsis">
-          {{ video.title || translate('videos') }}
-        </div>
-        <q-card
-          flat
-          bordered
-          class="sign-videos-browse__card-video"
+    <div class="sign-videos-browse__main">
+      <aside class="sign-videos-browse__videos">
+        <!-- Single video: show player only -->
+        <template v-if="!hasMultipleVideos && selectedVideo">
+          <div
+            v-if="selectedVideo.title"
+            class="text-subtitle2 text-weight-medium sign-videos-browse__video-title"
+          >
+            {{ selectedVideo.title }}
+          </div>
+          <q-card
+            flat
+            bordered
+            class="sign-videos-browse__player"
+          >
+            <GlossVideoComponent
+              :sign-video="selectedVideo"
+              :edit-mode="false"
+            />
+          </q-card>
+        </template>
+
+        <!-- Multiple videos: list others only (primary stays on main gloss view) -->
+        <div
+          v-else-if="pickerVideos.length"
+          class="sign-videos-browse__picker"
         >
-          <GlossVideoComponent
-            :sign-video="video"
-            :edit-mode="false"
-            compact
-          />
-        </q-card>
-      </button>
-    </div>
+          <button
+            v-for="video in pickerVideos"
+            :key="video.id ?? video.title"
+            type="button"
+            class="sign-videos-browse__picker-item"
+            :class="{ 'sign-videos-browse__picker-item--active': video.id === selectedVideoId }"
+            @click="selectVideo(video.id)"
+          >
+            <span class="sign-videos-browse__picker-label ellipsis">
+              {{ video.title || translate('videos') }}
+            </span>
+            <q-card
+              flat
+              bordered
+              class="sign-videos-browse__picker-video"
+            >
+              <GlossVideoComponent
+                :sign-video="video"
+                :edit-mode="false"
+                :compact="video.id !== selectedVideoId"
+              />
+            </q-card>
+          </button>
+        </div>
+      </aside>
 
-    <div
-      v-else-if="selectedVideo"
-      class="sign-videos-browse__single"
-    >
-      <div
-        v-if="selectedVideo.title"
-        class="text-subtitle1 text-weight-medium q-mb-sm"
+      <section
+        v-if="selectedVideo?.videoData"
+        class="sign-videos-browse__phonology"
       >
-        {{ selectedVideo.title }}
-      </div>
-      <q-card
-        flat
-        bordered
-        class="sign-videos-browse__single-video"
-      >
-        <GlossVideoComponent
-          :sign-video="selectedVideo"
+        <SignFonologyComponent
+          :video-data="selectedVideo.videoData"
           :edit-mode="false"
         />
-      </q-card>
+      </section>
     </div>
-
-    <q-card
-      v-if="selectedVideo?.videoData"
-      flat
-      bordered
-      class="sign-videos-browse__phonology"
-    >
-      <SignFonologyComponent
-        :video-data="selectedVideo.videoData"
-        :edit-mode="false"
-      />
-    </q-card>
   </div>
 </template>
 
@@ -105,20 +106,42 @@ const sortedVideos = computed(() =>
   )
 )
 
+const hasMultipleVideos = computed(() => sortedVideos.value.length > 1)
+
+const primaryVideoId = computed(() => sortedVideos.value[0]?.id ?? null)
+
+/** Other sign videos — primary is already shown on the main gloss view */
+const pickerVideos = computed(() => {
+  if (!hasMultipleVideos.value) return []
+  return sortedVideos.value.filter((video) => video.id !== primaryVideoId.value)
+})
+
 const selectedVideo = computed(() =>
   sortedVideos.value.find((video) => video.id === selectedVideoId.value) ?? null
 )
 
 watch(
-  sortedVideos,
-  (videos) => {
+  [sortedVideos, hasMultipleVideos, primaryVideoId],
+  () => {
+    const videos = sortedVideos.value
     if (!videos.length) {
       selectedVideoId.value = null
       return
     }
 
-    if (!videos.some((video) => video.id === selectedVideoId.value)) {
+    if (!hasMultipleVideos.value) {
       selectedVideoId.value = videos[0]?.id ?? null
+      return
+    }
+
+    const others = pickerVideos.value
+    if (!others.length) {
+      selectedVideoId.value = null
+      return
+    }
+
+    if (!others.some((video) => video.id === selectedVideoId.value)) {
+      selectedVideoId.value = others[0]?.id ?? null
     }
   },
   { immediate: true }
@@ -138,9 +161,7 @@ function selectVideo(videoId: string | undefined) {
   flex: 1 1 0;
   min-height: 0;
   width: 100%;
-  overflow-x: hidden;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
+  overflow: hidden;
 }
 
 .sign-videos-browse__toolbar {
@@ -152,95 +173,153 @@ function selectVideo(videoId: string | undefined) {
   gap: 12px;
 }
 
-.sign-videos-browse__gallery {
+.sign-videos-browse__main {
   display: flex;
-  gap: 16px;
-  flex: 0 0 auto;
-  overflow-x: auto;
-  overflow-y: hidden;
-  padding-bottom: 8px;
-  margin-bottom: 16px;
-  scrollbar-gutter: stable;
+  flex: 1 1 0;
+  min-height: 0;
+  gap: 20px;
+  overflow: hidden;
+}
+
+.sign-videos-browse__videos {
+  flex: 0 0 34%;
+  max-width: 380px;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  overflow-x: hidden;
+  overflow-y: auto;
   -webkit-overflow-scrolling: touch;
 }
 
-.sign-videos-browse__card {
-  flex: 0 0 380px;
-  width: 380px;
+.sign-videos-browse__video-title {
+  flex: 0 0 auto;
+}
+
+.sign-videos-browse__player {
+  flex: 0 0 auto;
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+}
+
+.sign-videos-browse__picker {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  flex: 0 0 auto;
+}
+
+.sign-videos-browse__picker-item {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
   border: 2px solid transparent;
   border-radius: var(--sb-card-radius, 12px);
   background: transparent;
   cursor: pointer;
-  padding: 4px;
+  padding: 6px;
   text-align: left;
   transition: border-color 0.2s ease, box-shadow 0.2s ease;
 }
 
-.sign-videos-browse__card:hover {
+.sign-videos-browse__picker-item:hover {
   border-color: rgba(200, 16, 47, 0.35);
 }
 
-.sign-videos-browse__card--active {
+.sign-videos-browse__picker-item--active {
   border-color: var(--primary);
   box-shadow: 0 2px 12px rgba(200, 16, 47, 0.12);
 }
 
-.sign-videos-browse__card-title {
-  font-size: 0.9rem;
+.sign-videos-browse__picker-label {
+  font-size: 0.85rem;
   font-weight: 500;
   color: rgba(0, 0, 0, 0.75);
-  margin-bottom: 8px;
-  padding: 0 4px;
+  padding: 0 2px;
 }
 
-.sign-videos-browse__card-video {
+.sign-videos-browse__picker-video {
   border-radius: var(--sb-card-radius, 12px);
   overflow: hidden;
 }
 
-.sign-videos-browse__single {
-  flex: 0 0 auto;
-  width: 100%;
-  max-width: var(--sb-video-max-width, 480px);
-  margin: 0 auto 16px;
-}
-
-.sign-videos-browse__single-video {
-  border-radius: var(--sb-card-radius, 12px);
-  overflow: hidden;
-  max-width: 100%;
-}
-
 .sign-videos-browse__phonology {
   flex: 1 1 0;
+  min-width: 0;
   min-height: 0;
-  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: var(--sb-card-radius, 12px);
-  padding: 12px 16px;
-  -webkit-overflow-scrolling: touch;
+  padding: 16px 20px;
+  background: #fff;
 }
 
 .sign-videos-browse__phonology :deep(.sign-phonology) {
+  flex: 1 1 0;
+  min-height: 0;
   margin-top: 0;
 }
 
-.sign-videos-browse__phonology :deep(.phonology-filters > .column) {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-  column-gap: 20px;
-  row-gap: 4px;
+.sign-videos-browse__phonology :deep(.text-subtitle2) {
+  font-size: 1.05rem;
+}
+
+.sign-videos-browse__phonology :deep(.phonology-table__grid) {
+  font-size: 0.95rem;
+}
+
+.sign-videos-browse__phonology :deep(.phonology-table__grid .text-caption) {
+  font-size: 0.8rem;
 }
 
-.sign-videos-browse__phonology :deep(.q-item-label) {
-  margin-bottom: 2px;
-  font-size: 0.7rem;
-  letter-spacing: 0.02em;
-  text-transform: uppercase;
-  color: rgba(0, 0, 0, 0.5);
+.sign-videos-browse__phonology :deep(.phonology-table__grid .text-body2),
+.sign-videos-browse__phonology :deep(.phonology-table__grid td),
+.sign-videos-browse__phonology :deep(.phonology-table__grid th) {
+  font-size: 0.95rem;
+  white-space: normal;
+  word-break: break-word;
+  padding: 10px 8px;
 }
 
-.sign-videos-browse__phonology :deep(.q-py-sm) {
-  padding-top: 0 !important;
-  padding-bottom: 10px !important;
+.sign-videos-browse__picker-item--active .sign-videos-browse__picker-video {
+  overflow: hidden;
+}
+
+@media (max-width: 767px) {
+  .sign-videos-browse__main {
+    flex-direction: column;
+    overflow-y: auto;
+  }
+
+  .sign-videos-browse__videos {
+    flex: 0 0 auto;
+    max-width: none;
+    width: 100%;
+  }
+
+  .sign-videos-browse__picker {
+    flex-direction: row;
+    overflow-x: auto;
+    overflow-y: hidden;
+    padding-bottom: 4px;
+  }
+
+  .sign-videos-browse__picker-item {
+    flex: 0 0 140px;
+    width: 140px;
+  }
+
+  .sign-videos-browse__picker-item--active {
+    flex: 0 0 min(280px, 72vw);
+    width: min(280px, 72vw);
+  }
+
+  .sign-videos-browse__phonology {
+    flex: 1 1 auto;
+    min-height: 50vh;
+  }
 }
 </style>
diff --git a/frontend/src/components/GlossDetail/components/VideosComponent.vue b/frontend/src/components/GlossDetail/components/VideosComponent.vue
index 64d7c1c..6a5abe3 100644
--- a/frontend/src/components/GlossDetail/components/VideosComponent.vue
+++ b/frontend/src/components/GlossDetail/components/VideosComponent.vue
@@ -7,10 +7,127 @@
       {{ translate('videos') }}
     </div>
 
+    <!-- Browse-style editor: videos left, phonology right -->
     <div
+      v-if="editMode && inlineEdit"
+      class="videos-editor"
+    >
+      <aside class="videos-editor__videos">
+        <div
+          v-if="sortedVideos.length > 1"
+          class="videos-editor__picker"
+        >
+          <button
+            v-for="(video, index) in sortedVideos"
+            :key="getVideoKey(video, index)"
+            type="button"
+            class="videos-editor__picker-item"
+            :class="{ 'videos-editor__picker-item--active': index === selectedSortedIndex }"
+            @click="selectedSortedIndex = index"
+          >
+            <span class="videos-editor__picker-label ellipsis">
+              {{ video.title || translate('videos') }}
+            </span>
+            <q-card
+              flat
+              bordered
+              class="videos-editor__picker-video"
+            >
+              <GlossVideoComponent
+                :sign-video="video"
+                :edit-mode="index === selectedSortedIndex"
+                :compact="index !== selectedSortedIndex"
+                @update:sign-video="(updated) => updateSignVideoByRef(video, updated)"
+              />
+            </q-card>
+          </button>
+        </div>
+
+        <template v-else-if="selectedVideo">
+          <q-card
+            flat
+            bordered
+            class="videos-editor__player"
+          >
+            <GlossVideoComponent
+              :sign-video="selectedVideo"
+              :edit-mode="true"
+              @update:sign-video="(updated) => { if (selectedVideo) updateSignVideoByRef(selectedVideo, updated) }"
+            />
+          </q-card>
+        </template>
+
+        <q-btn
+          v-if="!isCreatingVideo"
+          flat
+          no-caps
+          color="primary"
+          icon="add"
+          class="videos-editor__add-btn full-width"
+          :label="translate('addVideo')"
+          @click="addVideo"
+        />
+      </aside>
+
+      <section
+        v-if="selectedVideo"
+        class="videos-editor__phonology"
+      >
+        <div class="videos-editor__phonology-toolbar row items-center q-gutter-sm q-mb-md">
+          <q-input
+            v-model="selectedVideo.title"
+            :label="translate('title')"
+            outlined
+            dense
+            class="col"
+          />
+          <q-btn
+            v-if="sortedVideos.length > 1 && selectedSortedIndex > 0"
+            flat
+            round
+            dense
+            icon="keyboard_arrow_up"
+            @click="moveVideoUp"
+          >
+            <q-tooltip>{{ translate('moveLeft') }}</q-tooltip>
+          </q-btn>
+          <q-btn
+            v-if="sortedVideos.length > 1 && selectedSortedIndex < sortedVideos.length - 1"
+            flat
+            round
+            dense
+            icon="keyboard_arrow_down"
+            @click="moveVideoDown"
+          >
+            <q-tooltip>{{ translate('moveRight') }}</q-tooltip>
+          </q-btn>
+          <q-btn
+            v-if="selectedVideo.id || sortedVideos.length > 1"
+            flat
+            round
+            dense
+            icon="delete"
+            color="negative"
+            @click="confirmRemoveSelected"
+          >
+            <q-tooltip>{{ translate('delete') }}</q-tooltip>
+          </q-btn>
+        </div>
+
+        <SignFonologyComponent
+          :video-data="selectedVideo.videoData"
+          :edit-mode="true"
+          :compact="false"
+          @update:video-data="updateSelectedVideoData"
+        />
+      </section>
+    </div>
+
+    <!-- Legacy card layout (non-inline edit) -->
+    <div
+      v-else
       :class="videosRowClass"
     >
-      <!-- Add video button - visible when editMode is true and not creating a video -->
       <div
         v-if="editMode && !isCreatingVideo"
         class="col-12 col-sm-6 col-md-4"
@@ -24,9 +141,9 @@
           <q-card-section class="column items-center justify-center text-grey-7 fit">
             <q-icon
               name="add"
-              size="48px"
+              size="32px"
             />
-            <div class="text-subtitle1 q-mt-sm">
+            <div class="text-body2 q-mt-xs">
               {{ translate('addVideo') }}
             </div>
           </q-card-section>
@@ -49,37 +166,8 @@
           @delete="() => removeVideo(index)"
         >
           <template #header>
-            <div class="row items-center justify-between full-width">
-              <div class="text-subtitle1 ellipsis">
-                {{ video.title }}
-              </div>
-              <div
-                v-if="editMode && !video.isNew && !inlineEdit"
-                class="row"
-              >
-                <q-btn
-                  flat
-                  round
-                  dense
-                  icon="keyboard_arrow_left"
-                  size="sm"
-                  :disable="index === 0"
-                  @click="moveVideoLeft(index)"
-                >
-                  <q-tooltip>{{ translate('moveLeft') }}</q-tooltip>
-                </q-btn>
-                <q-btn
-                  flat
-                  round
-                  dense
-                  icon="keyboard_arrow_right"
-                  size="sm"
-                  :disable="index === sortedVideos.length - 1"
-                  @click="moveVideoRight(index)"
-                >
-                  <q-tooltip>{{ translate('moveRight') }}</q-tooltip>
-                </q-btn>
-              </div>
+            <div class="text-subtitle1 ellipsis">
+              {{ video.title }}
             </div>
           </template>
 
@@ -93,17 +181,21 @@
               class="q-mb-sm"
             />
             <div class="video-content">
-              <GlossVideoComponent
-                :sign-video="video"
-                :edit-mode="isEditing"
-                @update:sign-video="(newVideo) => updateLocalVideo(newVideo, index)"
-              />
-              <SignFonologyComponent
-                :video-data="video.videoData"
-                :edit-mode="isEditing"
-                :compact="inlineEdit"
-                @update:video-data="updateVideoData(index, $event)"
-              />
+              <div class="video-content__player">
+                <GlossVideoComponent
+                  :sign-video="video"
+                  :edit-mode="isEditing"
+                  @update:sign-video="(newVideo) => updateLocalVideo(newVideo, index)"
+                />
+              </div>
+              <div class="video-content__phonology">
+                <SignFonologyComponent
+                  :video-data="video.videoData"
+                  :edit-mode="isEditing"
+                  :compact="inlineEdit"
+                  @update:video-data="updateVideoData(index, $event)"
+                />
+              </div>
             </div>
           </template>
         </EditableModule>
@@ -113,7 +205,7 @@
 </template>
 
 <script setup lang="ts">
-import { GlossData, Sense, SignVideo, PhonologyData } from 'src/types/models';
+import { GlossData, SignVideo, PhonologyData } from 'src/types/models';
 import translate from 'src/utils/translate';
 import GlossVideoComponent from './GlossVideoComponent.vue';
 import SignFonologyComponent from './SignFonologyComponent.vue';
@@ -121,7 +213,7 @@ import EditableModule from 'src/components/Shared/EditableModule.vue';
 import { ref, watch, computed, onMounted } from 'vue';
 import { useQuasar } from 'quasar';
 import api from 'src/services/api';
-import { Hand, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from 'src/types/enums';
+import { Handedness, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from 'src/types/enums';
 
 const glossData = defineModel<GlossData>({ required: true });
 const emit = defineEmits<{
@@ -149,15 +241,14 @@ const videoItemClass = computed(() => {
 
 const $q = useQuasar();
 
-// Keep a backup of videos for cancellation
 const videosBackup = ref<SignVideo[]>([]);
 const isCreatingVideo = ref(false);
+const selectedSortedIndex = ref(0);
 
 const videos = computed(() => glossData.value?.glossVideos || []);
 
 const sortedVideos = computed(() => {
   const videoList = [...videos.value];
-  // Sort by priority (lower number = higher priority), but put new videos first
   return videoList.sort((a, b) => {
     if (a.isNew && !b.isNew) return -1;
     if (!a.isNew && b.isNew) return 1;
@@ -165,25 +256,92 @@ const sortedVideos = computed(() => {
   });
 });
 
+const selectedVideo = computed(() =>
+  sortedVideos.value[selectedSortedIndex.value] ?? null
+);
+
 watch(() => glossData.value.glossVideos, (newVideos) => {
   videosBackup.value = JSON.parse(JSON.stringify(newVideos));
 }, { deep: true });
 
+watch(sortedVideos, (list) => {
+  if (!list.length) {
+    selectedSortedIndex.value = 0;
+    return;
+  }
+  if (selectedSortedIndex.value >= list.length) {
+    selectedSortedIndex.value = list.length - 1;
+  }
+}, { immediate: true });
+
 onMounted(() => {
   if (inlineEdit && editMode && videos.value.length === 0) {
     addVideo();
   }
 });
 
-const updateLocalVideo = (newVideo: SignVideo, index: number) => {
+function getVideoKey(video: SignVideo, index: number): string {
+  return video.id || `new-${index}-${video.priority ?? 0}`;
+}
+
+function getActualIndex(video: SignVideo): number {
+  const byRef = glossData.value.glossVideos.indexOf(video);
+  if (byRef >= 0) return byRef;
+  if (video.id) {
+    return glossData.value.glossVideos.findIndex((v) => v.id === video.id);
+  }
+  return -1;
+}
+
+function updateLocalVideo(newVideo: SignVideo, index: number) {
   glossData.value.glossVideos[index] = newVideo;
-};
+}
+
+function updateSignVideoByRef(video: SignVideo, updated: SignVideo) {
+  const index = getActualIndex(video);
+  if (index >= 0) {
+    glossData.value.glossVideos[index] = updated;
+  }
+}
+
+function updateSelectedVideoData(videoData: PhonologyData) {
+  const video = selectedVideo.value;
+  if (!video) return;
+  const index = getActualIndex(video);
+  const target = glossData.value.glossVideos[index];
+  if (index >= 0 && target) {
+    target.videoData = videoData;
+  }
+}
+
+function confirmRemoveSelected() {
+  const video = selectedVideo.value;
+  if (!video) return;
+  $q.dialog({
+    title: translate('confirmDelete'),
+    message: translate('confirmDeleteMessage'),
+    persistent: true,
+    ok: {
+      color: 'negative',
+      label: translate('delete'),
+      flat: true,
+    },
+    cancel: {
+      color: 'primary',
+      flat: true,
+      label: translate('cancel'),
+    },
+  }).onOk(() => {
+    const index = getActualIndex(video);
+    if (index >= 0) {
+      void removeVideo(index);
+    }
+  });
+}
 
 const addVideo = () => {
-  // Get the highest priority
   const maxPriority = Math.max(...glossData.value.glossVideos.map(v => v.priority || 0), 0);
-  
-  // Create new video with the highest priority
+
   const newVideo: SignVideo = {
     id: '',
     title: '',
@@ -195,14 +353,14 @@ const addVideo = () => {
       id: Date.now().toString(),
       angle: translate('newAngle'),
       url: '',
-      priority: 1
+      priority: 1,
     }],
     minimalPairs: [],
     videoData: {
-      hands: Hand.RIGHT,
-      configuration: HandConfiguration.CONF_1,
+      handedness: Handedness.ONE,
+      dominantConfiguration: HandConfiguration.CONF_1,
       configurationChanges: ConfigurationChange.BENDING,
-      relationBetweenArticulators: RelationBetweenArticulators.ABOVE,
+      dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE,
       location: Location.NEUTRAL_SPACE,
       movementRelatedOrientation: MovementRelatedOrientation.FRONT,
       orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
@@ -214,69 +372,70 @@ const addVideo = () => {
       vocalization: '',
       nonManualComponent: '',
       inicialization: '',
-      id: Date.now().toString()
-    }
+      id: Date.now().toString(),
+    },
   };
 
-  // Add the video at the beginning of the array
   glossData.value.glossVideos.unshift(newVideo);
   isCreatingVideo.value = true;
-}
+  selectedSortedIndex.value = 0;
+};
 
 const removeVideo = async (index: number) => {
   const video = glossData.value.glossVideos[index];
   if (!video) return;
-  
+
   try {
     if (video.id) {
-        await api.signVideos.delete(video.id);
+      await api.signVideos.delete(video.id);
     }
-    
+
     if (index === 0 && isCreatingVideo.value) {
       isCreatingVideo.value = false;
     }
     glossData.value.glossVideos.splice(index, 1);
-    
+
+    if (selectedSortedIndex.value >= sortedVideos.value.length) {
+      selectedSortedIndex.value = Math.max(0, sortedVideos.value.length - 1);
+    }
+
     $q.notify({
       type: 'positive',
-      message: translate('videoDeleted')
+      message: translate('videoDeleted'),
     });
   } catch (error) {
     console.error('Error deleting video:', error);
     $q.notify({
       type: 'negative',
-      message: translate('errorDeletingVideo')
+      message: translate('errorDeletingVideo'),
     });
   }
-}
+};
 
 const updateSignVideo = async (video: SignVideo, index: number, silent = false) => {
   try {
     const currentVideo = glossData.value.glossVideos[index];
     if (!currentVideo) return;
 
-    // Validate if video has a videoUrl and an angle
     if (!currentVideo.videos?.[0]?.url) {
       $q.notify({
         type: 'negative',
-        message: translate('videoUrlRequired')
+        message: translate('videoUrlRequired'),
       });
       return;
     }
     if (!currentVideo.videos[0].angle) {
       $q.notify({
         type: 'negative',
-        message: translate('videoAngleRequired')
+        message: translate('videoAngleRequired'),
       });
       return;
     }
 
     let response;
     if (currentVideo.id) {
-      // Update the video
       const payload = { ...currentVideo };
-      
-      // Remove empty values from videoData (phonology)
+
       if (payload.videoData) {
         Object.keys(payload.videoData).forEach((key: string) => {
           if (payload.videoData[key as keyof PhonologyData] === '' || payload.videoData[key as keyof PhonologyData] === null || payload.videoData[key as keyof PhonologyData] === undefined) {
@@ -284,12 +443,10 @@ const updateSignVideo = async (video: SignVideo, index: number, silent = false)
           }
         });
       }
-      
+
       response = await api.signVideos.update(currentVideo.id, payload);
     } else {
-      // Create the video
       response = await api.signVideos.create(currentVideo);
-
       emit('update:glossData', response.data);
     }
 
@@ -301,7 +458,7 @@ const updateSignVideo = async (video: SignVideo, index: number, silent = false)
     if (!silent) {
       $q.notify({
         type: 'positive',
-        message: currentVideo.id ? translate('videoUpdated') : translate('videoCreated')
+        message: currentVideo.id ? translate('videoUpdated') : translate('videoCreated'),
       });
     }
   } catch (error) {
@@ -309,136 +466,119 @@ const updateSignVideo = async (video: SignVideo, index: number, silent = false)
     if (!silent) {
       $q.notify({
         type: 'negative',
-        message: translate('errorSavingVideo')
+        message: translate('errorSavingVideo'),
       });
     }
     throw error;
   }
-}
+};
 
 function getStepValidationErrors(): string[] {
-  const errors: string[] = []
-  const videos = glossData.value.glossVideos || []
+  const errors: string[] = [];
+  const videoList = glossData.value.glossVideos || [];
 
-  if (!videos.length) {
-    errors.push(translate('validation.videoRequired'))
-    return errors
+  if (!videoList.length) {
+    errors.push(translate('validation.videoRequired'));
+    return errors;
   }
 
-  for (const video of videos) {
-    const { isValid, errors: videoErrors } = validateVideo(video)
+  for (const video of videoList) {
+    const { isValid, errors: videoErrors } = validateVideo(video);
     if (!isValid) {
-      errors.push(...videoErrors)
+      errors.push(...videoErrors);
     }
   }
 
-  return errors
+  return errors;
 }
 
 async function saveAll(silent = false): Promise<boolean> {
-  const list = [...glossData.value.glossVideos]
+  const list = [...glossData.value.glossVideos];
   for (let index = 0; index < list.length; index++) {
-    const video = glossData.value.glossVideos[index]
-    if (!video) continue
-    const hasContent = video.videos?.some(v => v.url?.trim())
-    if (!hasContent && !video.id) continue
-    await updateSignVideo(video, index, silent)
+    const video = glossData.value.glossVideos[index];
+    if (!video) continue;
+    const hasContent = video.videos?.some(v => v.url?.trim());
+    if (!hasContent && !video.id) continue;
+    await updateSignVideo(video, index, silent);
   }
-  return true
+  return true;
 }
 
-defineExpose({ saveAll, getStepValidationErrors })
+defineExpose({ saveAll, getStepValidationErrors });
 
 const updateVideoData = (index: number, videoData: PhonologyData) => {
   if (glossData.value.glossVideos[index]) {
     glossData.value.glossVideos[index].videoData = videoData;
   }
-}
+};
 
 const handleVideoCancel = (index: number) => {
   if (index === 0 && isCreatingVideo.value) {
-    // If cancelling a new video creation, remove it
     removeVideo(index).catch((err) => {
-      console.error(err)
-    })
-  } else {
-    // Otherwise revert to backup
-    if (videosBackup.value[index]) {
-      glossData.value.glossVideos[index] = JSON.parse(JSON.stringify(videosBackup.value[index]));
-    }
+      console.error(err);
+    });
+  } else if (videosBackup.value[index]) {
+    glossData.value.glossVideos[index] = JSON.parse(JSON.stringify(videosBackup.value[index]));
   }
+};
+
+async function swapVideoPriorities(current: SignVideo, other: SignVideo) {
+  if (!current?.id || !other?.id) return;
+
+  const tempPriority = current.priority || 0;
+  current.priority = other.priority || 0;
+  other.priority = tempPriority;
+
+  await Promise.all([
+    api.signVideoPriority.update(current.id, { priority: current.priority }),
+    api.signVideoPriority.update(other.id, { priority: other.priority }),
+  ]);
+
+  $q.notify({
+    type: 'positive',
+    message: translate('videoOrderUpdated'),
+    position: 'bottom',
+  });
 }
 
-const moveVideoLeft = async (index: number) => {
-  if (index === 0) return;
-  
-  const sortedVideoList = sortedVideos.value;
-  const currentVideo = sortedVideoList[index];
-  const previousVideo = sortedVideoList[index - 1];
-  
-  if (!currentVideo?.id || !previousVideo?.id) return;
-  
-  try {
-    // Swap priorities
-    const tempPriority = currentVideo.priority || 0;
-    currentVideo.priority = previousVideo.priority || 0;
-    previousVideo.priority = tempPriority;
-    
-    // Update in backend
-    await Promise.all([
-      api.signVideoPriority.update(currentVideo.id, { priority: currentVideo.priority }),
-      api.signVideoPriority.update(previousVideo.id, { priority: previousVideo.priority })
-    ]);
-    
-    $q.notify({
-      type: 'positive',
-      message: translate('videoOrderUpdated'),
-      position: 'bottom'
-    });
-  } catch (error) {
-    console.error('Error updating video order:', error);
-    $q.notify({
-      type: 'negative',
-      message: translate('errorUpdatingVideoOrder'),
-      position: 'bottom'
+function moveVideoUp() {
+  const index = selectedSortedIndex.value;
+  if (index <= 0) return;
+  const current = sortedVideos.value[index];
+  const previous = sortedVideos.value[index - 1];
+  if (!current || !previous) return;
+  swapVideoPriorities(current, previous)
+    .then(() => {
+      selectedSortedIndex.value = index - 1;
+    })
+    .catch((error) => {
+      console.error('Error updating video order:', error);
+      $q.notify({
+        type: 'negative',
+        message: translate('errorUpdatingVideoOrder'),
+        position: 'bottom',
+      });
     });
-  }
 }
 
-const moveVideoRight = async (index: number) => {
-  const sortedVideoList = sortedVideos.value;
-  if (index === sortedVideoList.length - 1) return;
-  
-  const currentVideo = sortedVideoList[index];
-  const nextVideo = sortedVideoList[index + 1];
-  
-  if (!currentVideo?.id || !nextVideo?.id) return;
-  
-  try {
-    // Swap priorities
-    const tempPriority = currentVideo.priority || 0;
-    currentVideo.priority = nextVideo.priority || 0;
-    nextVideo.priority = tempPriority;
-    
-    // Update in backend
-    await Promise.all([
-      api.signVideoPriority.update(currentVideo.id, { priority: currentVideo.priority }),
-      api.signVideoPriority.update(nextVideo.id, { priority: nextVideo.priority })
-    ]);
-    
-    $q.notify({
-      type: 'positive',
-      message: translate('videoOrderUpdated'),
-      position: 'bottom'
-    });
-  } catch (error) {
-    console.error('Error updating video order:', error);
-    $q.notify({
-      type: 'negative',
-      message: translate('errorUpdatingVideoOrder'),
-      position: 'bottom'
+function moveVideoDown() {
+  const index = selectedSortedIndex.value;
+  if (index >= sortedVideos.value.length - 1) return;
+  const current = sortedVideos.value[index];
+  const next = sortedVideos.value[index + 1];
+  if (!current || !next) return;
+  swapVideoPriorities(current, next)
+    .then(() => {
+      selectedSortedIndex.value = index + 1;
+    })
+    .catch((error) => {
+      console.error('Error updating video order:', error);
+      $q.notify({
+        type: 'negative',
+        message: translate('errorUpdatingVideoOrder'),
+        position: 'bottom',
+      });
     });
-  }
 }
 
 function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] } {
@@ -446,7 +586,7 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
 
   if (!video.videos?.length) {
     errors.push(translate('errors.atLeastOneVideoRequired'));
-  } 
+  }
   video.videos.forEach((v, index) => {
     if (!v.angle?.trim()) {
       errors.push(translate('errors.angleRequired', { index: index + 1 }));
@@ -456,13 +596,13 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
     }
   });
 
-  if (!video.videoData?.hands) {
-    errors.push(translate('errors.handsRequired'));
+  if (!video.videoData?.handedness) {
+    errors.push(translate('errors.handednessRequired'));
   }
 
   return {
     isValid: errors.length === 0,
-    errors
+    errors,
   };
 }
 </script>
@@ -472,6 +612,100 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
   width: 100%;
 }
 
+.videos-editor {
+  display: flex;
+  gap: 20px;
+  min-height: 420px;
+  align-items: stretch;
+}
+
+.videos-editor__videos {
+  flex: 0 0 34%;
+  max-width: 380px;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.videos-editor__picker {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  overflow-y: auto;
+  max-height: 100%;
+}
+
+.videos-editor__picker-item {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  border: 2px solid transparent;
+  border-radius: var(--sb-card-radius, 12px);
+  background: transparent;
+  cursor: pointer;
+  padding: 6px;
+  text-align: left;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.videos-editor__picker-item:hover {
+  border-color: rgba(200, 16, 47, 0.35);
+}
+
+.videos-editor__picker-item--active {
+  border-color: var(--primary);
+  box-shadow: 0 2px 12px rgba(200, 16, 47, 0.12);
+}
+
+.videos-editor__picker-label {
+  font-size: 0.85rem;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.75);
+  padding: 0 2px;
+}
+
+.videos-editor__picker-video,
+.videos-editor__player {
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+}
+
+.videos-editor__add-btn {
+  flex: 0 0 auto;
+  min-height: 40px;
+  font-size: 0.85rem;
+  border: 1px dashed rgba(0, 0, 0, 0.2);
+  border-radius: var(--sb-card-radius, 12px);
+}
+
+.videos-editor__phonology {
+  flex: 1 1 0;
+  min-width: 0;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: var(--sb-card-radius, 12px);
+  padding: 16px 20px;
+  background: #fff;
+  overflow: hidden;
+}
+
+.videos-editor__phonology-toolbar {
+  flex: 0 0 auto;
+}
+
+.videos-editor__phonology :deep(.sign-phonology) {
+  flex: 1 1 0;
+  min-height: 0;
+  margin-top: 0;
+}
+
+.videos-editor__phonology :deep(.phonology-table__grid) {
+  font-size: 0.95rem;
+}
+
 .videos-row--horizontal-scroll {
   overflow-x: auto;
   overflow-y: hidden;
@@ -480,26 +714,86 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
 }
 
 .videos-row__item {
-  flex: 0 0 420px;
-  width: 420px;
-  max-width: 420px;
+  flex: 0 0 min(720px, 95vw);
+  width: min(720px, 95vw);
+  max-width: min(720px, 95vw);
 }
 
 .overflow-auto {
-  scrollbar-position: top;
+  overflow: auto;
 }
 
 .video-content {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  gap: 16px;
   width: 100%;
 }
 
+.video-content__player {
+  flex: 0 0 34%;
+  max-width: 360px;
+  min-width: 0;
+}
+
+.video-content__phonology {
+  flex: 1 1 0;
+  min-width: 0;
+}
+
 .add-video-card {
-  height: 200px;
+  height: 120px;
   transition: all 0.3s ease;
 }
 
 .add-video-card:hover {
   background: rgba(0, 0, 0, 0.03);
 }
-</style>
 
+@media (max-width: 767px) {
+  .videos-editor {
+    flex-direction: column;
+    min-height: auto;
+  }
+
+  .videos-editor__videos {
+    flex: 0 0 auto;
+    max-width: none;
+    width: 100%;
+  }
+
+  .videos-editor__picker {
+    flex-direction: row;
+    overflow-x: auto;
+    overflow-y: hidden;
+    padding-bottom: 4px;
+  }
+
+  .videos-editor__picker-item {
+    flex: 0 0 140px;
+    width: 140px;
+  }
+
+  .videos-editor__picker-item--active {
+    flex: 0 0 min(280px, 72vw);
+    width: min(280px, 72vw);
+  }
+
+  .video-content {
+    flex-direction: column;
+  }
+
+  .video-content__player {
+    flex: 0 0 auto;
+    max-width: none;
+    width: 100%;
+  }
+
+  .videos-row__item {
+    flex: 0 0 min(100%, 92vw);
+    width: min(100%, 92vw);
+    max-width: min(100%, 92vw);
+  }
+}
+</style>
diff --git a/frontend/src/components/HeaderComponent.vue b/frontend/src/components/HeaderComponent.vue
index 9e1293d..558f46c 100644
--- a/frontend/src/components/HeaderComponent.vue
+++ b/frontend/src/components/HeaderComponent.vue
@@ -23,8 +23,8 @@
 
         <q-item
           v-if="route.path !== '/search' && route.path !== '/'"
-          clickable
           v-ripple
+          clickable
           :active="isActive('/search')"
           active-class="nav-item-active"
           @click="navigateTo('/search')"
@@ -37,8 +37,8 @@
 
         <q-item
           v-if="userStore.isLoggedIn"
-          clickable
           v-ripple
+          clickable
           :active="isActive('/my-requests')"
           active-class="nav-item-active"
           @click="navigateTo('/my-requests')"
@@ -60,8 +60,8 @@
           </q-item-label>
 
           <q-item
-            clickable
             v-ripple
+            clickable
             :active="isActive('/confirm-requests')"
             active-class="nav-item-active"
             @click="navigateTo('/confirm-requests')"
@@ -73,8 +73,8 @@
           </q-item>
 
           <q-item
-            clickable
             v-ripple
+            clickable
             :active="isActive('/user-management')"
             active-class="nav-item-active"
             @click="navigateTo('/user-management')"
@@ -91,28 +91,38 @@
         <q-separator class="q-mb-sm" />
         <q-item
           v-if="!userStore.isLoggedIn"
-          clickable
           v-ripple
-          @click="openLogin"
+          clickable
           class="rounded-borders"
+          @click="openLogin"
         >
           <q-item-section avatar>
-            <q-icon name="login" color="primary" />
+            <q-icon
+              name="login"
+              color="primary"
+            />
+          </q-item-section>
+          <q-item-section class="text-primary">
+            {{ translate('login') }}
           </q-item-section>
-          <q-item-section class="text-primary">{{ translate('login') }}</q-item-section>
         </q-item>
 
         <q-item
           v-if="userStore.isLoggedIn"
-          clickable
           v-ripple
-          @click="userStore.logout"
+          clickable
           class="rounded-borders"
+          @click="userStore.logout"
         >
           <q-item-section avatar>
-            <q-icon name="logout" color="negative" />
+            <q-icon
+              name="logout"
+              color="negative"
+            />
+          </q-item-section>
+          <q-item-section class="text-negative">
+            {{ translate('logout') }}
           </q-item-section>
-          <q-item-section class="text-negative">{{ translate('logout') }}</q-item-section>
         </q-item>
       </div>
     </q-drawer>
diff --git a/frontend/src/components/Search/SearchFilters.vue b/frontend/src/components/Search/SearchFilters.vue
index 7b7842d..fcaacd1 100644
--- a/frontend/src/components/Search/SearchFilters.vue
+++ b/frontend/src/components/Search/SearchFilters.vue
@@ -1,18 +1,31 @@
 <template>
-  <q-card class="filters-sidebar" flat bordered style="overflow-y: auto;">
+  <q-card
+    class="filters-sidebar"
+    flat
+    bordered
+    style="overflow-y: auto;"
+  >
     <q-card-section>
       <div class="row items-center justify-between q-mb-sm">
         <div class="text-subtitle2">
           {{ t('filters') }}
         </div>
-        <q-btn flat dense color="grey" :label="t('clear')"
-          :disable="!selectedCategory && !selectedHands && Object.keys(filterInputs).length === 0"
-          @click="clearFilters" />
+        <q-btn
+          flat
+          dense
+          color="grey"
+          :label="t('clear')"
+          :disable="!selectedCategory && !selectedHandedness && Object.keys(filterInputs).length === 0"
+          @click="clearFilters"
+        />
       </div>
       <div class="filters-content">
         <!-- <FilterCategories :selected-category="selectedCategory"
           @update:selected-category="$emit('update:selectedCategory', $event)" /> -->
-        <FilterInputs :phonology-data="filterInputs" @update:phonology-data="$emit('update:filterInputs', $event)" />
+        <FilterInputs
+          :phonology-data="filterInputs"
+          @update:phonology-data="$emit('update:filterInputs', $event)"
+        />
       </div>
     </q-card-section>
   </q-card>
@@ -25,10 +38,10 @@ import FilterInputs from './components/FilterInputs.vue'
 
 // Create a type for filter inputs that allows empty values
 type FilterInputs = {
-  hands: string | null
-  configuration: string
+  handedness: string | null
+  dominantConfiguration: string
   configurationChanges: string
-  relationBetweenArticulators: string
+  dominantRelationBetweenArticulators: string
   location: string
   movementRelatedOrientation: string
   orientationRelatedToLocation: string
@@ -47,14 +60,14 @@ const t = (key: string) => translate(key)
 defineProps<{
   searchQuery: string
   selectedCategory: string
-  selectedHands: string
+  selectedHandedness: string
   filterInputs: FilterInputs
 }>()
 
 const emit = defineEmits<{
   (e: 'update:searchQuery', value: string): void;
   (e: 'update:selectedCategory', value: string): void;
-  (e: 'update:selectedHands', value: string): void;
+  (e: 'update:selectedHandedness', value: string): void;
   (e: 'update:filterInputs', value: FilterInputs): void;
   (e: 'search'): void;
   (e: 'clear'): void
@@ -62,12 +75,12 @@ const emit = defineEmits<{
 
 function clearFilters() {
   emit('update:selectedCategory', '')
-  emit('update:selectedHands', '')
+  emit('update:selectedHandedness', '')
   emit('update:filterInputs', {
-    hands: null,
-    configuration: '',
+    handedness: null,
+    dominantConfiguration: '',
     configurationChanges: '',
-    relationBetweenArticulators: '',
+    dominantRelationBetweenArticulators: '',
     location: '',
     movementRelatedOrientation: '',
     orientationRelatedToLocation: '',
diff --git a/frontend/src/components/Search/components/FilterInputs.vue b/frontend/src/components/Search/components/FilterInputs.vue
index 9d55927..59e4be8 100644
--- a/frontend/src/components/Search/components/FilterInputs.vue
+++ b/frontend/src/components/Search/components/FilterInputs.vue
@@ -7,12 +7,13 @@
 </template>
 
 <script setup lang="ts">
-// Create a type for filter inputs that allows empty values
+import SearchPhonologyFilters from './SearchPhonologyFilters.vue';
+
 type FilterInputs = {
-  hands: string | null;
-  configuration: string;
+  handedness: string | null;
+  dominantConfiguration: string;
   configurationChanges: string;
-  relationBetweenArticulators: string;
+  dominantRelationBetweenArticulators: string;
   location: string;
   movementRelatedOrientation: string;
   orientationRelatedToLocation: string;
@@ -26,8 +27,6 @@ type FilterInputs = {
   movementDirection: string;
 };
 
-import SearchPhonologyFilters from './SearchPhonologyFilters.vue';
-
 defineProps<{
   phonologyData: FilterInputs;
 }>();
@@ -35,5 +34,4 @@ defineProps<{
 defineEmits<{
   (e: 'update:phonology-data', value: FilterInputs): void;
 }>();
-
-</script> 
\ No newline at end of file
+</script>
diff --git a/frontend/src/components/Search/components/SearchInput.vue b/frontend/src/components/Search/components/SearchInput.vue
index 5557556..b12d2ce 100644
--- a/frontend/src/components/Search/components/SearchInput.vue
+++ b/frontend/src/components/Search/components/SearchInput.vue
@@ -12,7 +12,10 @@
         @keyup.enter="$emit('search')"
       >
         <template #prepend>
-          <q-icon name="search" color="grey-6" />
+          <q-icon
+            name="search"
+            color="grey-6"
+          />
         </template>
       </q-input>
     </div>
diff --git a/frontend/src/components/Search/components/SearchPhonologyFilters.vue b/frontend/src/components/Search/components/SearchPhonologyFilters.vue
index e97044f..381c41c 100644
--- a/frontend/src/components/Search/components/SearchPhonologyFilters.vue
+++ b/frontend/src/components/Search/components/SearchPhonologyFilters.vue
@@ -1,43 +1,37 @@
 <template>
   <div class="phonology-filters overflow-x-hidden">
     <div class="column q-col-gutter-md">
-      <!-- Hands -->
+      <!-- Handedness -->
       <div class="col-12">
         <q-item-label
           v-if="!isEditable"
           caption
         >
-          {{ translate('hands') }}
+          {{ translate('handedness') }}
         </q-item-label>
         <div
           v-if="!isEditable"
           class="q-py-sm"
         >
           <span
-            v-if="localData.hands"
+            v-if="localData.handedness"
             class="text-body2"
-          >{{ getHandLabel(localData.hands) }}</span>
+          >{{ getHandednessLabel(localData.handedness) }}</span>
           <span
             v-else
             class="text-grey-5"
           >{{ translate('notSet') }}</span>
         </div>
-        <q-btn-toggle
+        <q-select
           v-else
-          v-model="localData.hands"
-          :options="[
-            { label: translate('activeHand'), value: 'RIGHT' },
-            { label: translate('both'), value: 'BOTH' }
-          ]"
-          spread
-          no-caps
-          unelevated
-          toggle-color="primary"
-          color="grey-3"
-          text-color="grey-8"
-          class="full-width"
+          v-model="localData.handedness"
+          :options="phonologyOptions.handednessOptions"
+          :label="translate('handedness')"
           clearable
-          @update:model-value="updateField('hands', $event)"
+          emit-value
+          map-options
+          options-dense
+          @update:model-value="updateField('handedness', $event)"
         />
       </div>
 
@@ -54,9 +48,9 @@
           class="q-py-sm"
         >
           <span
-            v-if="localData.configuration"
+            v-if="localData.dominantConfiguration"
             class="text-body2"
-          >{{ getConfigurationLabel(localData.configuration) }}</span>
+          >{{ getConfigurationLabel(localData.dominantConfiguration) }}</span>
           <span
             v-else
             class="text-grey-5"
@@ -64,8 +58,8 @@
         </div>
         <q-select
           v-else
-          v-model="localData.configuration"
-          :options="filteredOptions.configuration"
+          v-model="localData.dominantConfiguration"
+          :options="filteredOptions.dominantConfiguration"
           :label="translate('configuration')"
           clearable
           emit-value
@@ -73,8 +67,8 @@
           options-dense
           use-input
           input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.handConfigurationOptions, 'configuration')"
-          @update:model-value="updateField('configuration', $event)"
+          @filter="(val, update) => filterFn(val, update, phonologyOptions.handConfigurationOptions, 'dominantConfiguration')"
+          @update:model-value="updateField('dominantConfiguration', $event)"
         />
       </div>
 
@@ -142,9 +136,9 @@
           class="q-py-sm"
         >
           <span
-            v-if="localData.relationBetweenArticulators"
+            v-if="localData.dominantRelationBetweenArticulators"
             class="text-body2"
-          >{{ getRelationBetweenArticulatorsLabel(localData.relationBetweenArticulators) }}</span>
+          >{{ getRelationBetweenArticulatorsLabel(localData.dominantRelationBetweenArticulators) }}</span>
           <span
             v-else
             class="text-grey-5"
@@ -152,8 +146,8 @@
         </div>
         <q-select
           v-else
-          v-model="localData.relationBetweenArticulators"
-          :options="filteredOptions.relationBetweenArticulators"
+          v-model="localData.dominantRelationBetweenArticulators"
+          :options="filteredOptions.dominantRelationBetweenArticulators"
           :label="translate('relationBetweenArticulators')"
           clearable
           emit-value
@@ -161,8 +155,8 @@
           options-dense
           use-input
           input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.relationBetweenArticulatorsOptions, 'relationBetweenArticulators')"
-          @update:model-value="updateField('relationBetweenArticulators', $event)"
+          @filter="(val, update) => filterFn(val, update, phonologyOptions.relationBetweenArticulatorsOptions, 'dominantRelationBetweenArticulators')"
+          @update:model-value="updateField('dominantRelationBetweenArticulators', $event)"
         />
       </div>
 
@@ -540,28 +534,31 @@
             class="text-grey-5"
           >{{ translate('notSet') }}</span>
         </div>
-        <div v-else class="column">
+        <div
+          v-else
+          class="column"
+        >
           <q-label>
             {{ translate('repeatedMovement') }}
           </q-label>
           <q-btn-toggle
-          v-model="localData.repeatedMovement"
-          :options="[
-            { label: translate('yes'), value: true },
-            { label: translate('no'), value: false }
-          ]"
-          spread
-          no-caps
-          unelevated
-          :label="translate('repeatedMovement')"
-          toggle-color="primary"
-          color="grey-3"
-          text-color="grey-8"
-          class="full-width"
-          clearable
-          @update:model-value="updateBooleanField('repeatedMovement', $event)"
-        />
-      </div>
+            v-model="localData.repeatedMovement"
+            :options="[
+              { label: translate('yes'), value: true },
+              { label: translate('no'), value: false }
+            ]"
+            spread
+            no-caps
+            unelevated
+            :label="translate('repeatedMovement')"
+            toggle-color="primary"
+            color="grey-3"
+            text-color="grey-8"
+            class="full-width"
+            clearable
+            @update:model-value="updateBooleanField('repeatedMovement', $event)"
+          />
+        </div>
       </div>
     </div>
   </div>
@@ -574,10 +571,10 @@ import { usePhonologyOptions } from '../../../utils/phonologyOptions';
 
 // Create a type for filter inputs that allows empty values
 type FilterInputs = {
-  hands: string | null;
-  configuration: string;
+  handedness: string | null;
+  dominantConfiguration: string;
   configurationChanges: string;
-  relationBetweenArticulators: string;
+  dominantRelationBetweenArticulators: string;
   location: string;
   movementRelatedOrientation: string;
   orientationRelatedToLocation: string;
@@ -611,10 +608,10 @@ const localData = ref<FilterInputs>({ ...props.phonologyData });
 
 // Initialize filtered options with the original options
 const filteredOptions = ref({
-  hands: phonologyOptions.handOptions,
-  configuration: phonologyOptions.handConfigurationOptions,
+  handedness: phonologyOptions.handednessOptions,
+  dominantConfiguration: phonologyOptions.handConfigurationOptions,
   configurationChanges: phonologyOptions.configurationChangeOptions,
-  relationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions,
+  dominantRelationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions,
   location: phonologyOptions.locationOptions,
   movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions,
   orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions,
@@ -661,17 +658,9 @@ const updateField = (field: keyof FilterInputs, value: string | string[] | numbe
   emit('update:phonologyData', localData.value);
 };
 
-const getHandLabel = (hands: string) => {
-  switch (hands) {
-    case 'RIGHT':
-      return translate('right');
-    case 'LEFT':
-      return translate('left');
-    case 'BOTH':
-      return translate('both');
-    default:
-      return '';
-  }
+const getHandednessLabel = (handedness: string) => {
+  const option = phonologyOptions.handednessOptions.find(o => o.value === handedness);
+  return option ? option.label : '';
 };
 
 const getConfigurationLabel = (configuration: string) => {
diff --git a/frontend/src/components/Search/types.ts b/frontend/src/components/Search/types.ts
index cec4375..fe580e8 100644
--- a/frontend/src/components/Search/types.ts
+++ b/frontend/src/components/Search/types.ts
@@ -1,8 +1,8 @@
 export interface FilterInputs {
-  hands: string;
-  configuration: string;
+  handedness: string;
+  dominantConfiguration: string;
   configurationChanges: string;
-  relationBetweenArticulators: string;
+  dominantRelationBetweenArticulators: string;
   location: string;
   movementRelatedOrientation: string;
   locationRelatedOrientation: string;
@@ -14,4 +14,4 @@ export interface FilterInputs {
   inicialization: string;
   repeatedMovement: boolean;
   movementDirection: string;
-} 
\ No newline at end of file
+}
diff --git a/frontend/src/components/Shared/EditableModule.vue b/frontend/src/components/Shared/EditableModule.vue
index 81e47b6..d50f7f1 100644
--- a/frontend/src/components/Shared/EditableModule.vue
+++ b/frontend/src/components/Shared/EditableModule.vue
@@ -71,7 +71,6 @@
         type="submit"
       />
     </div>
-
   </q-form>
 </template>
 
diff --git a/frontend/src/components/Shared/PhonologyFilters.vue b/frontend/src/components/Shared/PhonologyFilters.vue
index 4ebba28..74a9adb 100644
--- a/frontend/src/components/Shared/PhonologyFilters.vue
+++ b/frontend/src/components/Shared/PhonologyFilters.vue
@@ -1,953 +1,23 @@
 <template>
-  <div class="phonology-filters overflow-x-hidden">
-    <div class="column q-col-gutter-md">
-      <!-- Hands -->
-      <div class="col">
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('hands') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.hands"
-            class="text-body2"
-          >{{ getHandLabel(localData.hands) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-btn-toggle
-          v-else
-          v-model="localData.hands"
-          :options="[
-            { label: translate('activeHand'), value: 'RIGHT' },
-            { label: translate('both'), value: 'BOTH' }
-          ]"
-          spread
-          no-caps
-          unelevated
-          toggle-color="primary"
-          color="grey-3"
-          text-color="grey-8"
-          class="full-width"
-          :clearable="route.path === '/search'"
-          @update:model-value="updateField('hands', $event)"
-        />
-      </div>
-
-      <!-- Configuration -->
-      <div class="col-12 col-sm-6 col-md-4">
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('configuration') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.configuration"
-            class="text-body2"
-          >{{ getConfigurationLabel(localData.configuration) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.configuration"
-          :options="filteredOptions.configuration"
-          :label="translate('configuration')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.handConfigurationOptions, 'configuration')"
-          @update:model-value="updateField('configuration', $event)"
-        />
-      </div>
-
-      <!-- Configuration Changes -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('configurationChanges') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.configurationChanges"
-            class="text-body2"
-          >{{ getConfigurationChangesLabel(localData.configurationChanges) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.configurationChanges"
-          :options="filteredOptions.configurationChanges"
-          :label="translate('configurationChanges')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.configurationChangeOptions, 'configurationChanges')"
-          @update:model-value="updateField('configurationChanges', $event)"
-        >
-          <template #option="{ opt }">
-            <q-item v-close-popup>
-              <q-item-section>
-                <q-item-label>{{ opt.label }}</q-item-label>
-                <q-item-label
-                  v-if="opt.description"
-                  caption
-                >
-                  {{ opt.description }}
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-          </template>
-        </q-select>
-      </div>
-
-      <!-- Relation Between Articulators -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('relationBetweenArticulators') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.relationBetweenArticulators"
-            class="text-body2"
-          >{{ getRelationBetweenArticulatorsLabel(localData.relationBetweenArticulators) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.relationBetweenArticulators"
-          :options="filteredOptions.relationBetweenArticulators"
-          :label="translate('relationBetweenArticulators')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.relationBetweenArticulatorsOptions, 'relationBetweenArticulators')"
-          @update:model-value="updateField('relationBetweenArticulators', $event)"
-        />
-      </div>
-
-      <!-- Location -->
-      <div class="col-12 col-sm-6 col-md-4">
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('location') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.location"
-            class="text-body2"
-          >{{ getLocationLabel(localData.location) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.location"
-          :options="filteredOptions.location"
-          :label="translate('location')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.locationOptions, 'location')"
-          @update:model-value="updateField('location', $event)"
-        />
-      </div>
-
-      <!-- Movement Related Orientation -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('movementRelatedOrientation') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.movementRelatedOrientation"
-            class="text-body2"
-          >{{ getMovementRelatedOrientationLabel(localData.movementRelatedOrientation) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.movementRelatedOrientation"
-          :options="filteredOptions.movementRelatedOrientation"
-          :label="translate('movementRelatedOrientation')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.movementRelatedOrientationOptions, 'movementRelatedOrientation')"
-          @update:model-value="updateField('movementRelatedOrientation', $event)"
-        />
-      </div>
-
-      <!-- Orientation Related To Location -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('orientationRelatedToLocation') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.orientationRelatedToLocation"
-            class="text-body2"
-          >{{ getOrientationRelatedToLocationLabel(localData.orientationRelatedToLocation) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.orientationRelatedToLocation"
-          :options="filteredOptions.orientationRelatedToLocation"
-          :label="translate('orientationRelatedToLocation')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.orientationRelatedToLocationOptions, 'orientationRelatedToLocation')"
-          @update:model-value="updateField('orientationRelatedToLocation', $event)"
-        />
-      </div>
-
-      <!-- Orientation Change -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('orientationChange') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.orientationChange"
-            class="text-body2"
-          >{{ getOrientationChangeLabel(localData.orientationChange) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.orientationChange"
-          :options="filteredOptions.orientationChange"
-          :label="translate('orientationChange')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.orientationChangeOptions, 'orientationChange')"
-          @update:model-value="updateField('orientationChange', $event)"
-        />
-      </div>
-
-      <!-- Contact Type -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('contactType') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.contactType"
-            class="text-body2"
-          >{{ getContactTypeLabel(localData.contactType) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.contactType"
-          :options="filteredOptions.contactType"
-          :label="translate('contactType')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.contactTypeOptions, 'contactType')"
-          @update:model-value="updateField('contactType', $event)"
-        />
-      </div>
-
-      <!-- Movement Type -->
-      <div class="col-12 col-sm-6 col-md-4">
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('movementType') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.movementType"
-            class="text-body2"
-          >{{ getMovementTypeLabel(localData.movementType) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.movementType"
-          :options="filteredOptions.movementType"
-          :label="translate('movementType')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.movementTypeOptions, 'movementType')"
-          @update:model-value="updateField('movementType', $event)"
-        />
-      </div>
-
-      <!-- Movement Direction -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('movementDirection') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.movementDirection"
-            class="text-body2"
-          >{{ getMovementDirectionLabel(localData.movementDirection) }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-select
-          v-else
-          v-model="localData.movementDirection"
-          :options="filteredOptions.movementDirection"
-          :label="translate('movementDirection')"
-          clearable
-          emit-value
-          map-options
-          options-dense
-          use-input
-          input-debounce="300"
-          @filter="(val, update) => filterFn(val, update, phonologyOptions.movementDirectionOptions, 'movementDirection')"
-          @update:model-value="updateField('movementDirection', $event)"
-        />
-      </div>
-
-      <!-- Vocalization -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('vocalization') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.vocalization"
-            class="text-body2"
-          >{{ localData.vocalization }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-input
-          v-else
-          v-model="localData.vocalization"
-          :label="translate('vocalization')"
-          clearable
-          outlined
-          dense
-          @update:model-value="updateField('vocalization', $event)"
-        />
-      </div>
-
-      <!-- Non Manual Component -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('nonManualComponent') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.nonManualComponent"
-            class="text-body2"
-          >{{ localData.nonManualComponent }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-input
-          v-else
-          v-model="localData.nonManualComponent"
-          :label="translate('nonManualComponent')"
-          clearable
-          outlined
-          dense
-          @update:model-value="updateField('nonManualComponent', $event)"
-        />
-      </div>
-
-      <!-- Inicialization -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          v-if="!isEditable"
-          caption
-        >
-          {{ translate('inicialization') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.inicialization"
-            class="text-body2"
-          >{{ localData.inicialization }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('notSet') }}</span>
-        </div>
-        <q-input
-          v-else
-          v-model="localData.inicialization"
-          :label="translate('inicialization')"
-          clearable
-          outlined
-          dense
-          @update:model-value="updateField('inicialization', $event)"
-        />
-      </div>
-
-      <!-- Repeated Movement -->
-      <div
-        v-if="!compact"
-        class="col-12 col-sm-6 col-md-4"
-      >
-        <q-item-label
-          caption
-        >
-          {{ translate('repeatedMovement') }}
-        </q-item-label>
-        <div
-          v-if="!isEditable"
-          class="q-py-sm"
-        >
-          <span
-            v-if="localData.repeatedMovement"
-            class="text-body2"
-          >{{ translate('yes') }}</span>
-          <span
-            v-else
-            class="text-grey-5"
-          >{{ translate('no') }}</span>
-        </div>
-        <q-btn-toggle
-          v-else
-          v-model="localData.repeatedMovement"
-          :options="[
-            { label: translate('yes'), value: true },
-            { label: translate('no'), value: false }
-          ]"
-          spread
-          no-caps
-          unelevated
-          toggle-color="primary"
-          color="grey-3"
-          text-color="grey-8"
-          class="full-width"
-          :clearable="route.path === '/search'"
-          @update:model-value="updateBooleanField('repeatedMovement', $event)"
-        />
-      </div>
-
-      <!-- Advanced phonology (compact creation mode) -->
-      <div
-        v-if="compact && isEditable"
-        class="col-12"
-      >
-        <q-expansion-item
-          expand-separator
-          icon="tune"
-          :label="translate('advancedPhonology')"
-          header-class="text-subtitle2"
-        >
-          <div class="column q-col-gutter-md q-pt-sm">
-            <!-- Configuration Changes -->
-            <div class="col-12 col-sm-6">
-              <q-select
-                v-model="localData.configurationChanges"
-                :options="filteredOptions.configurationChanges"
-                :label="translate('configurationChanges')"
-                clearable
-                emit-value
-                map-options
-                options-dense
-                outlined
-                dense
-                use-input
-                input-debounce="300"
-                @filter="(val, update) => filterFn(val, update, phonologyOptions.configurationChangeOptions, 'configurationChanges')"
-                @update:model-value="updateField('configurationChanges', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-select
-                v-model="localData.relationBetweenArticulators"
-                :options="filteredOptions.relationBetweenArticulators"
-                :label="translate('relationBetweenArticulators')"
-                clearable
-                emit-value
-                map-options
-                options-dense
-                outlined
-                dense
-                use-input
-                input-debounce="300"
-                @filter="(val, update) => filterFn(val, update, phonologyOptions.relationBetweenArticulatorsOptions, 'relationBetweenArticulators')"
-                @update:model-value="updateField('relationBetweenArticulators', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-select
-                v-model="localData.movementRelatedOrientation"
-                :options="filteredOptions.movementRelatedOrientation"
-                :label="translate('movementRelatedOrientation')"
-                clearable
-                emit-value
-                map-options
-                options-dense
-                outlined
-                dense
-                use-input
-                input-debounce="300"
-                @filter="(val, update) => filterFn(val, update, phonologyOptions.movementRelatedOrientationOptions, 'movementRelatedOrientation')"
-                @update:model-value="updateField('movementRelatedOrientation', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-select
-                v-model="localData.orientationRelatedToLocation"
-                :options="filteredOptions.orientationRelatedToLocation"
-                :label="translate('orientationRelatedToLocation')"
-                clearable
-                emit-value
-                map-options
-                options-dense
-                outlined
-                dense
-                use-input
-                input-debounce="300"
-                @filter="(val, update) => filterFn(val, update, phonologyOptions.orientationRelatedToLocationOptions, 'orientationRelatedToLocation')"
-                @update:model-value="updateField('orientationRelatedToLocation', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-select
-                v-model="localData.orientationChange"
-                :options="filteredOptions.orientationChange"
-                :label="translate('orientationChange')"
-                clearable
-                emit-value
-                map-options
-                options-dense
-                outlined
-                dense
-                use-input
-                input-debounce="300"
-                @filter="(val, update) => filterFn(val, update, phonologyOptions.orientationChangeOptions, 'orientationChange')"
-                @update:model-value="updateField('orientationChange', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-select
-                v-model="localData.contactType"
-                :options="filteredOptions.contactType"
-                :label="translate('contactType')"
-                clearable
-                emit-value
-                map-options
-                options-dense
-                outlined
-                dense
-                use-input
-                input-debounce="300"
-                @filter="(val, update) => filterFn(val, update, phonologyOptions.contactTypeOptions, 'contactType')"
-                @update:model-value="updateField('contactType', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-select
-                v-model="localData.movementDirection"
-                :options="filteredOptions.movementDirection"
-                :label="translate('movementDirection')"
-                clearable
-                emit-value
-                map-options
-                options-dense
-                outlined
-                dense
-                use-input
-                input-debounce="300"
-                @filter="(val, update) => filterFn(val, update, phonologyOptions.movementDirectionOptions, 'movementDirection')"
-                @update:model-value="updateField('movementDirection', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-input
-                v-model="localData.vocalization"
-                :label="translate('vocalization')"
-                clearable
-                outlined
-                dense
-                @update:model-value="updateField('vocalization', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-input
-                v-model="localData.nonManualComponent"
-                :label="translate('nonManualComponent')"
-                clearable
-                outlined
-                dense
-                @update:model-value="updateField('nonManualComponent', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-input
-                v-model="localData.inicialization"
-                :label="translate('inicialization')"
-                clearable
-                outlined
-                dense
-                @update:model-value="updateField('inicialization', $event)"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-btn-toggle
-                v-model="localData.repeatedMovement"
-                :options="[
-                  { label: translate('yes'), value: true },
-                  { label: translate('no'), value: false }
-                ]"
-                spread
-                no-caps
-                unelevated
-                toggle-color="primary"
-                color="grey-3"
-                text-color="grey-8"
-                class="full-width"
-                @update:model-value="updateBooleanField('repeatedMovement', $event)"
-              />
-            </div>
-          </div>
-        </q-expansion-item>
-      </div>
-    </div>
-  </div>
+  <PhonologyTable
+    :phonology-data="phonologyData"
+    :is-editable="isEditable"
+    :compact="compact"
+    @update:phonology-data="$emit('update:phonologyData', $event)"
+  />
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
-import translate from 'src/utils/translate';
-import { usePhonologyOptions } from '../../utils/phonologyOptions';
 import type { PhonologyData } from 'src/types/models';
-import { useRoute } from 'vue-router';
+import PhonologyTable from './PhonologyTable.vue';
 
-const route = useRoute();
-
-interface SelectOption {
-  value: string;
-  label: string;
-  description?: string;
-}
-
-const props = defineProps<{
+defineProps<{
   phonologyData: PhonologyData;
   isEditable?: boolean;
   compact?: boolean;
 }>();
 
-const emit = defineEmits<{
+defineEmits<{
   (e: 'update:phonologyData', value: PhonologyData): void;
 }>();
-
-const phonologyOptions = usePhonologyOptions();
-const localData = ref<PhonologyData>({ ...props.phonologyData });
-
-// Initialize filtered options with the original options
-const filteredOptions = ref({
-  hands: phonologyOptions.handOptions,
-  configuration: phonologyOptions.handConfigurationOptions,
-  configurationChanges: phonologyOptions.configurationChangeOptions,
-  relationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions,
-  location: phonologyOptions.locationOptions,
-  movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions,
-  orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions,
-  orientationChange: phonologyOptions.orientationChangeOptions,
-  contactType: phonologyOptions.contactTypeOptions,
-  movementType: phonologyOptions.movementTypeOptions,
-  movementDirection: phonologyOptions.movementDirectionOptions,
-});
-
-// Keep local data in sync with prop changes
-watch(() => props.phonologyData, (newValue) => {
-  localData.value = { ...newValue };
-}, { deep: true });
-
-// Custom filter function that searches both in value and label
-function filterFn(
-  val: string, 
-  update: (callback: () => void) => void,
-  options: SelectOption[],
-  key: keyof typeof filteredOptions.value
-) {
-  if (val === '') {
-    update(() => {
-      filteredOptions.value[key] = options;
-    });
-    return;
-  }
-
-  update(() => {
-    const needle = val.toLowerCase();
-    filteredOptions.value[key] = options.filter(opt => {
-      const haystack = opt.label.toLowerCase();
-      const haystackValue = opt.value.toLowerCase();
-      return haystack.includes(needle) || haystackValue.includes(needle);
-    });
-  });
-}
-
-const updateField = (field: keyof PhonologyData, value: string | string[] | number | null | boolean) => {
-  localData.value = {
-    ...localData.value,
-    [field]: value !== null ? String(value) : ''
-  };
-  emit('update:phonologyData', localData.value);
-};
-
-const getHandLabel = (hands: string) => {
-  switch (hands) {
-    case 'RIGHT':
-      return translate('right');
-    case 'LEFT':
-      return translate('left');
-    case 'BOTH':
-      return translate('both');
-    default:
-      return '';
-  }
-};
-
-const getConfigurationLabel = (configuration: string) => {
-  const option = phonologyOptions.handConfigurationOptions.find(o => o.value === configuration);
-  return option ? option.label : '';
-};
-
-const getConfigurationChangesLabel = (configurationChanges: string) => {
-  const option = phonologyOptions.configurationChangeOptions.find(o => o.value === configurationChanges);
-  return option ? option.label : '';
-};
-
-const getRelationBetweenArticulatorsLabel = (relationBetweenArticulators: string) => {
-  const option = phonologyOptions.relationBetweenArticulatorsOptions.find(o => o.value === relationBetweenArticulators);
-  return option ? option.label : '';
-};
-
-const getLocationLabel = (location: string) => {
-  const option = phonologyOptions.locationOptions.find(o => o.value === location);
-  return option ? option.label : '';
-};
-
-const getMovementRelatedOrientationLabel = (movementRelatedOrientation: string) => {
-  const option = phonologyOptions.movementRelatedOrientationOptions.find(o => o.value === movementRelatedOrientation);
-  return option ? option.label : '';
-};
-
-const getOrientationRelatedToLocationLabel = (orientationRelatedToLocation: string) => {
-  const option = phonologyOptions.orientationRelatedToLocationOptions.find(o => o.value === orientationRelatedToLocation);
-  return option ? option.label : '';
-};
-
-const getOrientationChangeLabel = (orientationChange: string) => {
-  const option = phonologyOptions.orientationChangeOptions.find(o => o.value === orientationChange);
-  return option ? option.label : '';
-};
-
-const getContactTypeLabel = (contactType: string) => {
-  const option = phonologyOptions.contactTypeOptions.find(o => o.value === contactType);
-  return option ? option.label : '';
-};
-
-const getMovementTypeLabel = (movementType: string) => {
-  const option = phonologyOptions.movementTypeOptions.find(o => o.value === movementType);
-  return option ? option.label : '';
-};
-
-const getMovementDirectionLabel = (movementDirection: string) => {
-  const option = phonologyOptions.movementDirectionOptions.find(o => o.value === movementDirection);
-  return option ? option.label : '';
-};
-
-const updateBooleanField = (field: keyof PhonologyData, value: boolean) => {
-  localData.value = {
-    ...localData.value,
-    [field]: value
-  };
-  emit('update:phonologyData', localData.value);
-};
 </script>
-
-<style scoped>
-.phonology-filters {
-  width: 100%;
-  max-height: 100%;
-}
-
-
-.custom-scrollbar::-webkit-scrollbar {
-  width: 6px;
-}
-
-.custom-scrollbar::-webkit-scrollbar-track {
-  background: #f1f1f1;
-}
-
-.custom-scrollbar::-webkit-scrollbar-thumb {
-  background: #888;
-  border-radius: 3px;
-}
-</style> 
\ No newline at end of file
diff --git a/frontend/src/components/Shared/PhonologyTable.vue b/frontend/src/components/Shared/PhonologyTable.vue
new file mode 100644
index 0000000..56bb07a
--- /dev/null
+++ b/frontend/src/components/Shared/PhonologyTable.vue
@@ -0,0 +1,389 @@
+<template>
+  <div class="phonology-table">
+    <div class="phonology-table__handedness q-mb-md">
+      <div class="text-caption text-grey-7 q-mb-xs">
+        {{ translate('handedness') }}
+      </div>
+      <div
+        v-if="!isEditable"
+        class="text-body2"
+      >
+        <span v-if="localData.handedness">
+          {{ getHandednessLabel(localData.handedness) }}
+          <q-tooltip v-if="getHandednessDescription(localData.handedness)">
+            {{ getHandednessDescription(localData.handedness) }}
+          </q-tooltip>
+        </span>
+        <span v-else>{{ translate('notSet') }}</span>
+      </div>
+      <q-btn-toggle
+        v-else
+        v-model="localData.handedness"
+        :options="phonologyOptions.handednessOptions"
+        spread
+        no-caps
+        unelevated
+        toggle-color="primary"
+        color="grey-3"
+        text-color="grey-8"
+        class="full-width"
+        @update:model-value="emitUpdate"
+      />
+    </div>
+
+    <div class="phonology-table__scroll">
+      <q-markup-table
+        flat
+        bordered
+        dense
+        wrap-cells
+        class="phonology-table__grid"
+      >
+        <colgroup>
+          <col class="phonology-table__col-label">
+          <col
+            v-if="multiHand"
+            class="phonology-table__col-hand"
+          >
+          <col
+            v-if="multiHand"
+            class="phonology-table__col-hand"
+          >
+          <col
+            v-if="!multiHand"
+            class="phonology-table__col-value"
+          >
+        </colgroup>
+        <thead>
+          <tr>
+            <th class="text-left phonology-table__label-header" />
+            <th class="text-center phonology-table__hand-header">
+              {{ translate('mainHand') }}
+            </th>
+            <th
+              v-if="multiHand"
+              class="text-center phonology-table__hand-header"
+            >
+              {{ translate('nonDominantHand') }}
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <!-- Per-hand: configuration -->
+          <PhonologyTableRow
+            :label="translate('configuration')"
+            :dominant-value="localData.dominantConfiguration ?? null"
+            :non-dominant-value="localData.nonDominantConfiguration ?? null"
+            :multi-hand="multiHand"
+            :is-editable="!!isEditable"
+            :options="filteredOptions.configuration"
+            @update:dominant="updateField('dominantConfiguration', $event)"
+            @update:non-dominant="updateField('nonDominantConfiguration', $event)"
+            @update:both="updateBoth('dominantConfiguration', 'nonDominantConfiguration', $event)"
+            @filter="(val, update) => filterFn(val, update, phonologyOptions.handConfigurationOptions, 'configuration')"
+          />
+
+          <!-- Per-hand: relation between articulators -->
+          <PhonologyTableRow
+            v-if="!compact || !isEditable"
+            :label="translate('relationBetweenArticulators')"
+            :dominant-value="localData.dominantRelationBetweenArticulators ?? null"
+            :non-dominant-value="localData.nonDominantRelationBetweenArticulators ?? null"
+            :multi-hand="multiHand"
+            :is-editable="!!isEditable"
+            :options="filteredOptions.relationBetweenArticulators"
+            @update:dominant="updateField('dominantRelationBetweenArticulators', $event)"
+            @update:non-dominant="updateField('nonDominantRelationBetweenArticulators', $event)"
+            @update:both="updateBoth('dominantRelationBetweenArticulators', 'nonDominantRelationBetweenArticulators', $event)"
+            @filter="(val, update) => filterFn(val, update, phonologyOptions.relationBetweenArticulatorsOptions, 'relationBetweenArticulators')"
+          />
+
+          <!-- Shared rows -->
+          <template
+            v-for="row in visibleSharedRows"
+            :key="row.field"
+          >
+            <PhonologyTableRow
+              v-if="multiHand && isEditable"
+              :label="row.label"
+              :row-type="row.type"
+              shared-across-hands
+              :dominant-value="row.type === 'select' ? asStringValue(localData[row.field]) : null"
+              :non-dominant-value="row.type === 'select' ? asStringValue(localData[row.field]) : null"
+              :value="row.type !== 'select' ? localData[row.field] : undefined"
+              :multi-hand="multiHand"
+              :is-editable="true"
+              :options="row.optionsKey ? filteredOptions[row.optionsKey] : []"
+              @update:both="updateSharedRow(row.field, $event)"
+              @update:dominant="updateSharedRow(row.field, $event)"
+              @update:non-dominant="updateSharedRow(row.field, $event)"
+              @filter="(val, update) => row.optionsKey && row.allOptions && filterFn(val, update, row.allOptions, row.optionsKey)"
+            />
+            <PhonologyTableSharedRow
+              v-else
+              :label="row.label"
+              :value="localData[row.field]"
+              :multi-hand="multiHand"
+              :is-editable="!!isEditable"
+              :row-type="row.type"
+              :options="row.optionsKey ? filteredOptions[row.optionsKey] : []"
+              @update="updateSharedRow(row.field, $event)"
+              @filter="(val, update) => row.optionsKey && row.allOptions && filterFn(val, update, row.allOptions, row.optionsKey)"
+            />
+          </template>
+        </tbody>
+      </q-markup-table>
+    </div>
+
+    <!-- Compact mode: advanced fields in expansion -->
+    <q-expansion-item
+      v-if="compact && isEditable"
+      expand-separator
+      icon="tune"
+      :label="translate('advancedPhonology')"
+      header-class="text-subtitle2 q-mt-md"
+    >
+      <div class="q-pt-sm">
+        <PhonologyTableRow
+          :label="translate('relationBetweenArticulators')"
+          :dominant-value="localData.dominantRelationBetweenArticulators ?? null"
+          :non-dominant-value="localData.nonDominantRelationBetweenArticulators ?? null"
+          :multi-hand="multiHand"
+          :is-editable="true"
+          :options="filteredOptions.relationBetweenArticulators"
+          @update:dominant="updateField('dominantRelationBetweenArticulators', $event)"
+          @update:non-dominant="updateField('nonDominantRelationBetweenArticulators', $event)"
+          @update:both="updateBoth('dominantRelationBetweenArticulators', 'nonDominantRelationBetweenArticulators', $event)"
+          @filter="(val, update) => filterFn(val, update, phonologyOptions.relationBetweenArticulatorsOptions, 'relationBetweenArticulators')"
+        />
+        <PhonologyTableRow
+          v-for="row in advancedSharedRows"
+          :key="row.field"
+          :label="row.label"
+          :row-type="row.type"
+          shared-across-hands
+          :dominant-value="row.type === 'select' ? asStringValue(localData[row.field]) : null"
+          :non-dominant-value="row.type === 'select' ? asStringValue(localData[row.field]) : null"
+          :value="row.type !== 'select' ? localData[row.field] : undefined"
+          :multi-hand="multiHand"
+          :is-editable="true"
+          :options="row.optionsKey ? filteredOptions[row.optionsKey] : []"
+          @update:both="updateSharedRow(row.field, $event)"
+          @update:dominant="updateSharedRow(row.field, $event)"
+          @update:non-dominant="updateSharedRow(row.field, $event)"
+          @filter="(val, update) => row.optionsKey && row.allOptions && filterFn(val, update, row.allOptions, row.optionsKey)"
+        />
+      </div>
+    </q-expansion-item>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue';
+import translate from 'src/utils/translate';
+import { usePhonologyOptions, getOptionLabel } from 'src/utils/phonologyOptions';
+import { isMultiHand } from 'src/utils/phonologyHelpers';
+import type { PhonologyData } from 'src/types/models';
+import PhonologyTableRow from './PhonologyTableRow.vue';
+import PhonologyTableSharedRow from './PhonologyTableSharedRow.vue';
+
+const props = defineProps<{
+  phonologyData: PhonologyData;
+  isEditable?: boolean;
+  compact?: boolean;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:phonologyData', value: PhonologyData): void;
+}>();
+
+const phonologyOptions = usePhonologyOptions();
+const localData = ref<PhonologyData>({ ...props.phonologyData });
+
+const multiHand = computed(() => isMultiHand(localData.value.handedness));
+
+type SharedRowDef = {
+  field: keyof PhonologyData;
+  label: string;
+  type: 'select' | 'text' | 'boolean';
+  optionsKey?: keyof typeof filteredOptions.value;
+  allOptions?: { value: string; label: string }[];
+  compactOnly?: boolean;
+  advanced?: boolean;
+};
+
+const sharedRowDefs: SharedRowDef[] = [
+  { field: 'configurationChanges', label: translate('configurationChanges'), type: 'select', optionsKey: 'configurationChanges', allOptions: phonologyOptions.configurationChangeOptions, advanced: true },
+  { field: 'location', label: translate('location'), type: 'select', optionsKey: 'location', allOptions: phonologyOptions.locationOptions },
+  { field: 'movementRelatedOrientation', label: translate('movementRelatedOrientation'), type: 'select', optionsKey: 'movementRelatedOrientation', allOptions: phonologyOptions.movementRelatedOrientationOptions, advanced: true },
+  { field: 'orientationRelatedToLocation', label: translate('orientationRelatedToLocation'), type: 'select', optionsKey: 'orientationRelatedToLocation', allOptions: phonologyOptions.orientationRelatedToLocationOptions, advanced: true },
+  { field: 'orientationChange', label: translate('orientationChange'), type: 'select', optionsKey: 'orientationChange', allOptions: phonologyOptions.orientationChangeOptions, advanced: true },
+  { field: 'contactType', label: translate('contactType'), type: 'select', optionsKey: 'contactType', allOptions: phonologyOptions.contactTypeOptions, advanced: true },
+  { field: 'movementType', label: translate('movementType'), type: 'select', optionsKey: 'movementType', allOptions: phonologyOptions.movementTypeOptions },
+  { field: 'movementDirection', label: translate('movementDirection'), type: 'select', optionsKey: 'movementDirection', allOptions: phonologyOptions.movementDirectionOptions, advanced: true },
+  { field: 'vocalization', label: translate('vocalization'), type: 'text', advanced: true },
+  { field: 'nonManualComponent', label: translate('nonManualComponent'), type: 'text', advanced: true },
+  { field: 'inicialization', label: translate('inicialization'), type: 'text', advanced: true },
+  { field: 'repeatedMovement', label: translate('repeatedMovement'), type: 'boolean', advanced: true },
+];
+
+const visibleSharedRows = computed(() => {
+  if (props.compact && props.isEditable) {
+    return sharedRowDefs.filter(r => !r.advanced && r.field !== 'configurationChanges');
+  }
+  return sharedRowDefs.filter(r => !r.advanced || !props.compact);
+});
+
+const advancedSharedRows = computed(() =>
+  sharedRowDefs.filter(r => r.advanced),
+);
+
+const filteredOptions = ref({
+  configuration: phonologyOptions.handConfigurationOptions,
+  relationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions,
+  configurationChanges: phonologyOptions.configurationChangeOptions,
+  location: phonologyOptions.locationOptions,
+  movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions,
+  orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions,
+  orientationChange: phonologyOptions.orientationChangeOptions,
+  contactType: phonologyOptions.contactTypeOptions,
+  movementType: phonologyOptions.movementTypeOptions,
+  movementDirection: phonologyOptions.movementDirectionOptions,
+});
+
+watch(() => props.phonologyData, (newValue) => {
+  localData.value = { ...newValue };
+}, { deep: true });
+
+function filterFn(
+  val: string,
+  update: (callback: () => void) => void,
+  options: { value: string; label: string }[],
+  key: keyof typeof filteredOptions.value,
+) {
+  if (val === '') {
+    update(() => {
+      filteredOptions.value[key] = options;
+    });
+    return;
+  }
+  update(() => {
+    const needle = val.toLowerCase();
+    filteredOptions.value[key] = options.filter(opt =>
+      opt.label.toLowerCase().includes(needle) || opt.value.toLowerCase().includes(needle),
+    );
+  });
+}
+
+function getHandednessLabel(handedness: string) {
+  return getOptionLabel(phonologyOptions.handednessOptions, handedness);
+}
+
+function getHandednessDescription(handedness: string) {
+  const option = phonologyOptions.handednessOptions.find(o => o.value === handedness);
+  return option?.description ?? '';
+}
+
+function updateField(field: keyof PhonologyData, value: string | boolean | null) {
+  localData.value = {
+    ...localData.value,
+    [field]: value === null || value === '' ? null : value,
+  };
+  emitUpdate();
+}
+
+function updateBoth(
+  dominantField: keyof PhonologyData,
+  nonDominantField: keyof PhonologyData,
+  value: string | null,
+) {
+  localData.value = {
+    ...localData.value,
+    [dominantField]: value,
+    [nonDominantField]: value,
+  };
+  emitUpdate();
+}
+
+function updateSharedRow(field: keyof PhonologyData, value: string | boolean | null) {
+  updateField(field, value);
+}
+
+function asStringValue(value: unknown): string | null {
+  if (value == null || value === '') return null;
+  return String(value);
+}
+
+function emitUpdate() {
+  emit('update:phonologyData', { ...localData.value });
+}
+</script>
+
+<style scoped>
+.phonology-table {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  flex: 1 1 auto;
+}
+
+.phonology-table__handedness {
+  flex: 0 0 auto;
+}
+
+.phonology-table__scroll {
+  flex: 1 1 0;
+  min-height: 0;
+  overflow-x: hidden;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+
+.phonology-table__scroll :deep(.q-markup-table) {
+  overflow: visible;
+}
+
+.phonology-table__grid {
+  width: 100%;
+  table-layout: fixed;
+}
+
+.phonology-table__grid :deep(thead th) {
+  position: sticky;
+  top: 0;
+  z-index: 2;
+  background: #fff;
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.12);
+  font-weight: 600;
+  font-size: 0.8rem;
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+.phonology-table__grid :deep(.phonology-table__col-label) {
+  width: 34%;
+}
+
+.phonology-table__grid :deep(.phonology-table__col-hand) {
+  width: 33%;
+}
+
+.phonology-table__grid :deep(.phonology-table__col-value) {
+  width: 66%;
+}
+
+@media (max-width: 1023px) {
+  .phonology-table__grid :deep(td),
+  .phonology-table__grid :deep(th) {
+    white-space: normal;
+    word-break: break-word;
+    vertical-align: top;
+  }
+
+  .phonology-table__grid :deep(.text-body2) {
+    font-size: 0.9rem;
+    line-height: 1.35;
+  }
+}
+</style>
diff --git a/frontend/src/components/Shared/PhonologyTableRow.vue b/frontend/src/components/Shared/PhonologyTableRow.vue
new file mode 100644
index 0000000..54dc9cb
--- /dev/null
+++ b/frontend/src/components/Shared/PhonologyTableRow.vue
@@ -0,0 +1,248 @@
+<template>
+  <tr>
+    <td class="text-caption text-grey-8 phonology-table-row__label">
+      {{ label }}
+    </td>
+
+    <!-- Read-only -->
+    <template v-if="!isEditable">
+      <template v-if="displayMode === 'merged'">
+        <td
+          colspan="2"
+          class="text-body2 text-center phonology-table-row__hand-cell phonology-table-row__hand-cell--merged"
+        >
+          {{ mergedDisplayLabel }}
+        </td>
+      </template>
+      <template v-else-if="displayMode === 'split'">
+        <td class="text-body2 text-center phonology-table-row__hand-cell">
+          {{ dominantDisplayLabel }}
+        </td>
+        <td class="text-body2 text-center phonology-table-row__hand-cell">
+          {{ nonDominantDisplayLabel }}
+        </td>
+      </template>
+      <template v-else>
+        <td
+          colspan="1"
+          class="text-body2 text-center phonology-table-row__hand-cell"
+        >
+          {{ dominantDisplayLabel }}
+        </td>
+      </template>
+    </template>
+
+    <!-- Editable -->
+    <template v-else>
+      <template v-if="editLayout === 'merged'">
+        <td
+          colspan="2"
+          class="phonology-table-row__hand-cell phonology-table-row__hand-cell--merged"
+        >
+          <component
+            :is="editControl"
+            merged
+            @update="onMergedUpdate"
+            @filter="onFilter"
+          />
+        </td>
+      </template>
+      <template v-else-if="editLayout === 'split'">
+        <td class="phonology-table-row__hand-cell">
+          <component
+            :is="editControl"
+            hand="dominant"
+            @update="emit('update:dominant', $event)"
+            @filter="onFilter"
+          />
+        </td>
+        <td class="phonology-table-row__hand-cell">
+          <component
+            :is="editControl"
+            hand="nonDominant"
+            @update="emit('update:non-dominant', $event)"
+            @filter="onFilter"
+          />
+        </td>
+      </template>
+      <template v-else>
+        <td class="phonology-table-row__hand-cell">
+          <component
+            :is="editControl"
+            hand="dominant"
+            merged
+            @update="emit('update:dominant', $event)"
+            @filter="onFilter"
+          />
+        </td>
+      </template>
+    </template>
+  </tr>
+</template>
+
+<script setup lang="ts">
+import { computed, defineComponent, h } from 'vue';
+import { QSelect, QInput, QBtnToggle } from 'quasar';
+import translate from 'src/utils/translate';
+import { getOptionLabel, type PhonologySelectOption } from 'src/utils/phonologyOptions';
+
+const props = withDefaults(defineProps<{
+  label: string;
+  rowType?: 'select' | 'text' | 'boolean';
+  dominantValue?: string | null | undefined;
+  nonDominantValue?: string | null | undefined;
+  value?: unknown;
+  multiHand: boolean;
+  isEditable?: boolean;
+  sharedAcrossHands?: boolean;
+  options?: PhonologySelectOption[];
+}>(), {
+  rowType: 'select',
+  sharedAcrossHands: false,
+  options: () => [],
+});
+
+const emit = defineEmits<{
+  (e: 'update:dominant', value: string | null): void;
+  (e: 'update:non-dominant', value: string | null): void;
+  (e: 'update:both', value: string | boolean | null): void;
+  (e: 'filter', val: string, update: (callback: () => void) => void): void;
+}>();
+
+const displayMode = computed(() => {
+  if (!props.multiHand) return 'single';
+  if (props.sharedAcrossHands) return 'merged';
+  return 'split';
+});
+
+const editLayout = computed(() => {
+  if (!props.isEditable) return displayMode.value;
+  if (!props.multiHand) return 'single';
+  if (props.sharedAcrossHands) return 'merged';
+  return 'split';
+});
+
+const dominantLabel = computed(() => getOptionLabel(props.options, props.dominantValue));
+const nonDominantLabel = computed(() => getOptionLabel(props.options, props.nonDominantValue));
+
+const dominantDisplayLabel = computed(() => formatReadLabel('dominant'));
+const nonDominantDisplayLabel = computed(() => formatReadLabel('nonDominant'));
+const mergedDisplayLabel = computed(() => {
+  if (props.rowType === 'select') {
+    if (dominantLabel.value) return dominantLabel.value;
+    if (nonDominantLabel.value) return nonDominantLabel.value;
+    return translate('notSet');
+  }
+  return formatReadLabel('shared');
+});
+
+function formatReadLabel(hand: 'dominant' | 'nonDominant' | 'shared'): string {
+  if (props.rowType === 'boolean') {
+    return props.value ? translate('yes') : translate('no');
+  }
+  if (props.rowType === 'text') {
+    const text = String(props.value ?? '').trim();
+    return text || translate('notSet');
+  }
+  if (hand === 'nonDominant') {
+    return nonDominantLabel.value || translate('notSet');
+  }
+  return dominantLabel.value || translate('notSet');
+}
+
+function onFilter(val: string, update: (callback: () => void) => void) {
+  emit('filter', val, update);
+}
+
+function onMergedUpdate(value: string | boolean | null) {
+  emit('update:both', value);
+}
+
+function getSelectValue(hand: 'dominant' | 'nonDominant', merged = false) {
+  if (merged) {
+    return props.dominantValue ?? props.nonDominantValue ?? null;
+  }
+  return hand === 'dominant' ? props.dominantValue : props.nonDominantValue;
+}
+
+const editControl = defineComponent({
+  name: 'PhonologyTableRowEditControl',
+  props: {
+    hand: { type: String, default: 'dominant' },
+    merged: { type: Boolean, default: false },
+  },
+  emits: ['update', 'filter'],
+  setup(controlProps, { emit: controlEmit }) {
+    return () => {
+      if (props.rowType === 'text') {
+        return h(QInput, {
+          modelValue: String(props.value ?? ''),
+          clearable: true,
+          dense: true,
+          outlined: true,
+          class: controlProps.merged ? 'phonology-table-row__merged-select' : undefined,
+          'onUpdate:modelValue': (val: string | number | null) =>
+            controlEmit('update', val != null ? String(val) : ''),
+        });
+      }
+
+      if (props.rowType === 'boolean') {
+        return h(QBtnToggle, {
+          modelValue: Boolean(props.value),
+          spread: true,
+          noCaps: true,
+          unelevated: true,
+          toggleColor: 'primary',
+          color: 'grey-3',
+          textColor: 'grey-8',
+          class: controlProps.merged ? 'phonology-table-row__merged-select' : undefined,
+          options: [
+            { label: translate('yes'), value: true },
+            { label: translate('no'), value: false },
+          ],
+          'onUpdate:modelValue': (val: boolean) => controlEmit('update', val),
+        });
+      }
+
+      const handKey = controlProps.hand === 'nonDominant' ? 'nonDominant' : 'dominant';
+      return h(QSelect, {
+        modelValue: getSelectValue(handKey, controlProps.merged),
+        options: props.options,
+        clearable: true,
+        emitValue: true,
+        mapOptions: true,
+        optionsDense: true,
+        dense: true,
+        outlined: true,
+        useInput: true,
+        inputDebounce: 300,
+        class: controlProps.merged ? 'phonology-table-row__merged-select' : undefined,
+        onFilter: (val: string, update: (callback: () => void) => void) =>
+          controlEmit('filter', val, update),
+        'onUpdate:modelValue': (val: string | null) => controlEmit('update', val),
+      });
+    };
+  },
+});
+</script>
+
+<style scoped>
+.phonology-table-row__label {
+  vertical-align: top;
+}
+
+.phonology-table-row__hand-cell {
+  vertical-align: top;
+  text-align: center;
+}
+
+.phonology-table-row__hand-cell--merged {
+  text-align: center;
+}
+
+.phonology-table-row__merged-select {
+  max-width: 280px;
+  margin: 0 auto;
+}
+
+</style>
diff --git a/frontend/src/components/Shared/PhonologyTableSharedRow.vue b/frontend/src/components/Shared/PhonologyTableSharedRow.vue
new file mode 100644
index 0000000..03bf3c4
--- /dev/null
+++ b/frontend/src/components/Shared/PhonologyTableSharedRow.vue
@@ -0,0 +1,121 @@
+<template>
+  <tr>
+    <td class="text-caption text-grey-8 phonology-table-shared-row__label">
+      {{ label }}
+    </td>
+    <td
+      :colspan="multiHand ? 2 : 1"
+      class="phonology-table-shared-row__value phonology-table-shared-row__value--centered"
+    >
+      <template v-if="!isEditable">
+        <span
+          v-if="displayValue"
+          class="text-body2"
+        >{{ displayValue }}</span>
+        <span
+          v-else
+          class="text-grey-5"
+        >{{ translate('notSet') }}</span>
+      </template>
+      <template v-else>
+        <q-select
+          v-if="rowType === 'select'"
+          :model-value="stringValue"
+          :options="options"
+          clearable
+          emit-value
+          map-options
+          options-dense
+          dense
+          outlined
+          use-input
+          input-debounce="300"
+          class="phonology-table-shared-row__control"
+          @filter="onFilter"
+          @update:model-value="emit('update', $event)"
+        />
+        <q-input
+          v-else-if="rowType === 'text'"
+          :model-value="stringValue"
+          clearable
+          dense
+          outlined
+          class="phonology-table-shared-row__control"
+          @update:model-value="emit('update', $event != null ? String($event) : '')"
+        />
+        <q-btn-toggle
+          v-else
+          :model-value="boolValue"
+          :options="[
+            { label: translate('yes'), value: true },
+            { label: translate('no'), value: false },
+          ]"
+          spread
+          no-caps
+          unelevated
+          toggle-color="primary"
+          color="grey-3"
+          text-color="grey-8"
+          class="phonology-table-shared-row__control"
+          @update:model-value="emit('update', $event)"
+        />
+      </template>
+    </td>
+  </tr>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import translate from 'src/utils/translate';
+import { getOptionLabel, type PhonologySelectOption } from 'src/utils/phonologyOptions';
+
+const props = defineProps<{
+  label: string;
+  value: unknown;
+  multiHand: boolean;
+  isEditable?: boolean;
+  rowType: 'select' | 'text' | 'boolean';
+  options?: PhonologySelectOption[];
+}>();
+
+const emit = defineEmits<{
+  (e: 'update', value: string | boolean | null): void;
+  (e: 'filter', val: string, update: (callback: () => void) => void): void;
+}>();
+
+const stringValue = computed(() => (props.value == null ? '' : String(props.value)));
+const boolValue = computed(() => Boolean(props.value));
+
+const displayValue = computed(() => {
+  if (props.rowType === 'boolean') {
+    return props.value ? translate('yes') : translate('no');
+  }
+  if (props.rowType === 'select' && props.options) {
+    return getOptionLabel(props.options, stringValue.value);
+  }
+  return stringValue.value;
+});
+
+function onFilter(val: string, update: (callback: () => void) => void) {
+  emit('filter', val, update);
+}
+</script>
+
+<style scoped>
+.phonology-table-shared-row__label {
+  vertical-align: top;
+}
+
+.phonology-table-shared-row__value {
+  vertical-align: top;
+}
+
+.phonology-table-shared-row__value--centered {
+  text-align: center;
+}
+
+.phonology-table-shared-row__control {
+  max-width: 360px;
+  margin: 0 auto;
+}
+</style>
diff --git a/frontend/src/components/UserManagement/ChangePasswordDialog.vue b/frontend/src/components/UserManagement/ChangePasswordDialog.vue
index 5249715..149d1f6 100644
--- a/frontend/src/components/UserManagement/ChangePasswordDialog.vue
+++ b/frontend/src/components/UserManagement/ChangePasswordDialog.vue
@@ -1,12 +1,20 @@
 <template>
-  <q-dialog v-model="dialogVisible" @hide="$emit('close')">
+  <q-dialog
+    v-model="dialogVisible"
+    @hide="$emit('close')"
+  >
     <q-card style="min-width: 400px">
       <q-card-section>
-        <div class="text-h6">{{ translate('changePassword') }}</div>
+        <div class="text-h6">
+          {{ translate('changePassword') }}
+        </div>
       </q-card-section>
 
       <q-card-section>
-        <q-form @submit="handleSubmit" class="q-gutter-md">
+        <q-form
+          class="q-gutter-md"
+          @submit="handleSubmit"
+        >
           <div class="text-body2 q-mb-md">
             {{ translate('changePasswordFor', { username: user?.username }) }}
           </div>
diff --git a/frontend/src/components/UserManagement/CreateUserDialog.vue b/frontend/src/components/UserManagement/CreateUserDialog.vue
index 066240c..3376bba 100644
--- a/frontend/src/components/UserManagement/CreateUserDialog.vue
+++ b/frontend/src/components/UserManagement/CreateUserDialog.vue
@@ -1,12 +1,20 @@
 <template>
-  <q-dialog v-model="dialogVisible" @hide="$emit('close')">
+  <q-dialog
+    v-model="dialogVisible"
+    @hide="$emit('close')"
+  >
     <q-card style="min-width: 350px; max-width: 400px;">
       <q-card-section>
-        <div class="text-h6">{{ translate('createUser') }}</div>
+        <div class="text-h6">
+          {{ translate('createUser') }}
+        </div>
       </q-card-section>
 
       <q-card-section>
-        <q-form @submit="handleSubmit" class="q-gutter-sm">
+        <q-form
+          class="q-gutter-sm"
+          @submit="handleSubmit"
+        >
           <q-input
             v-model="form.username"
             :label="translate('username')"
diff --git a/frontend/src/components/UserManagement/DeleteUserDialog.vue b/frontend/src/components/UserManagement/DeleteUserDialog.vue
index 43e9939..02ad1b6 100644
--- a/frontend/src/components/UserManagement/DeleteUserDialog.vue
+++ b/frontend/src/components/UserManagement/DeleteUserDialog.vue
@@ -1,8 +1,13 @@
 <template>
-  <q-dialog v-model="dialogVisible" @hide="$emit('close')">
+  <q-dialog
+    v-model="dialogVisible"
+    @hide="$emit('close')"
+  >
     <q-card>
       <q-card-section>
-        <div class="text-h6">{{ translate('confirmDelete') }}</div>
+        <div class="text-h6">
+          {{ translate('confirmDelete') }}
+        </div>
       </q-card-section>
 
       <q-card-section>
@@ -19,8 +24,8 @@
         <q-btn
           :label="translate('delete')"
           color="negative"
-          @click="handleDelete"
           :loading="loading"
+          @click="handleDelete"
         />
       </q-card-actions>
     </q-card>
diff --git a/frontend/src/components/UserManagement/UsersTable.vue b/frontend/src/components/UserManagement/UsersTable.vue
index ebd810e..115116c 100644
--- a/frontend/src/components/UserManagement/UsersTable.vue
+++ b/frontend/src/components/UserManagement/UsersTable.vue
@@ -1,8 +1,13 @@
 <template>
-  <q-card flat class="col column no-wrap">
+  <q-card
+    flat
+    class="col column no-wrap"
+  >
     <q-card-section>
       <div class="row items-center justify-between">
-        <div class="text-h6">{{ translate('allUsers') }}</div>
+        <div class="text-h6">
+          {{ translate('allUsers') }}
+        </div>
         <q-input
           v-model="searchQueryModel"
           :placeholder="translate('searchUsers')"
diff --git a/frontend/src/css/app.css b/frontend/src/css/app.css
index a9021ad..975720b 100644
--- a/frontend/src/css/app.css
+++ b/frontend/src/css/app.css
@@ -3,6 +3,25 @@
   --primary: #c8102f;
   --sb-card-radius: 12px;
   --sb-transition: 0.2s ease;
+  --sb-video-max-width: 480px;
+  --sb-video-max-height: none;
+  --sb-video-compact-max-height: 140px;
+}
+
+@media (max-width: 1023px) {
+  :root {
+    --sb-video-max-width: 360px;
+    --sb-video-max-height: min(32vh, 200px);
+    --sb-video-compact-max-height: 120px;
+  }
+}
+
+@media (max-width: 599px) {
+  :root {
+    --sb-video-max-width: 100%;
+    --sb-video-max-height: min(28vh, 168px);
+    --sb-video-compact-max-height: 100px;
+  }
 }
 
 body {
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index ec1da1a..a3e6db7 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -67,6 +67,9 @@ const translations: TranslateKeys = {
   portuguese: 'Portuguès',
   russian: 'Rus',
   hands: 'Mans',
+  handedness: 'Nombre de mans',
+  mainHand: 'Mà dominant',
+  nonDominantHand: 'Mà no dominant',
   configuration: 'Configuració',
   configurationChanges: 'Canvis de configuració',
   vocalization: 'Vocalització',
@@ -81,6 +84,8 @@ const translations: TranslateKeys = {
   rightHand: 'Mà dreta',
   leftHand: 'Mà esquerra',
   bothHands: 'Ambdues mans',
+  useSameForBothHands: 'Mateix valor per a ambdues mans',
+  editHandsSeparately: 'Editar cada mà per separat',
   showConfigurationDetails: 'Mostrar detalls de configuració',
   configurationDetails: 'Detalls de configuració',
   resultsFound: 'Resultats trobats',
@@ -180,6 +185,7 @@ const translations: TranslateKeys = {
     invalidVideoFile: 'Si us plau, seleccioneu un vídeo vàlid.',
     videoSizeExceeded: 'El vídeo és massa gran. La mida màxima és de {maxSize}MB.',
     unsupportedVideoFormat: 'Si us plau, utilitzeu format MP4, WebM o OGG.',
+    handednessRequired: 'Cal indicar el nombre de mans',
     failedToPlayVideo: 'No s\'ha pogut reproduir el vídeo',
     failedToCreateDefinition: 'No s\'ha pogut crear la definició',
     failedToSortDefinitions: 'No s\'ha pogut ordenar les definicions'
diff --git a/frontend/src/i18n/ca-ES/phonology.ts b/frontend/src/i18n/ca-ES/phonology.ts
index 05a6766..eedcbce 100644
--- a/frontend/src/i18n/ca-ES/phonology.ts
+++ b/frontend/src/i18n/ca-ES/phonology.ts
@@ -44,6 +44,18 @@ const phonology : PhonologyTranslateKeys = {
       WIGGLING: 'Vibració',
       WIGGLING_description: 'Oscil·lació alterna dels dits seleccionats'
     },
+    handedness: {
+      ONE: '1',
+      ONE_description: 'Signe amb una mà',
+      TWO_A: '2a',
+      TWO_A_description: 'Signe amb dues mans assimètric',
+      TWO_N: '2n',
+      TWO_N_description: 'Signe amb dues mans no mirall',
+      TWO_S: '2s',
+      TWO_S_description: 'Signe amb dues mans simètric',
+      NA: 'x',
+      NA_description: 'No aplicable',
+    },
     handConfiguration: {
       EMPTY: '------- BUIT -------',
       CONF_1: '0',
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index 6e65454..0a4ad82 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -69,6 +69,9 @@ const translations: TranslateKeys = {
   portuguese: 'Portuguese',
   russian: 'Russian',
   hands: 'Hands',
+  handedness: 'Handedness',
+  mainHand: 'Main hand',
+  nonDominantHand: 'Non-dominant hand',
   configuration: 'Configuration',
   configurationChanges: 'Configuration changes',
   vocalization: 'Vocalization',
@@ -85,6 +88,8 @@ const translations: TranslateKeys = {
   rightHand: 'Right hand',
   leftHand: 'Left hand',
   bothHands: 'Both hands',
+  useSameForBothHands: 'Use same value for both hands',
+  editHandsSeparately: 'Edit each hand separately',
   showConfigurationDetails: 'Show configuration details',
   configurationDetails: 'Configuration details',
   resultsFound: 'Results found',
@@ -190,7 +195,8 @@ const translations: TranslateKeys = {
     failedToCreateDefinition: 'Failed to create definition',
     failedToPlayVideo: 'Failed to play video',
     failedToSortDefinitions: 'Failed to sort definitions',
-    unsupportedVideoFormat: 'Unsupported video format'
+    unsupportedVideoFormat: 'Unsupported video format',
+    handednessRequired: 'Handedness is required',
   },
   sendRequest: 'Send Request',
   requestSubmittedSuccessfully: 'Request submitted successfully',
diff --git a/frontend/src/i18n/en-US/phonology.ts b/frontend/src/i18n/en-US/phonology.ts
index 00564ca..7b9c591 100644
--- a/frontend/src/i18n/en-US/phonology.ts
+++ b/frontend/src/i18n/en-US/phonology.ts
@@ -43,6 +43,18 @@ const phonology : PhonologyTranslateKeys = {
       WIGGLING: 'Wiggling',
       WIGGLING_description: 'Alternated bending of the selected fingers'
     },
+    handedness: {
+      ONE: '1',
+      ONE_description: 'One-handed sign',
+      TWO_A: '2a',
+      TWO_A_description: 'Two-handed asymmetrical',
+      TWO_N: '2n',
+      TWO_N_description: 'Two-handed non-mirrored',
+      TWO_S: '2s',
+      TWO_S_description: 'Two-handed symmetrical',
+      NA: 'x',
+      NA_description: 'Not applicable',
+    },
     handConfiguration: {
       EMPTY: '------- BUIT -------',
       CONF_1: 'BABY_O',
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 64e05da..ed25f7d 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -63,6 +63,9 @@ const translations: TranslateKeys = {
   portuguese: 'Portugués',
   russian: 'Ruso',
   hands: 'Manos',
+  handedness: 'Número de manos',
+  mainHand: 'Mano dominante',
+  nonDominantHand: 'Mano no dominante',
   configuration: 'Configuración',
   configurationChanges: 'Cambios de configuración',
   vocalization: 'Vocalización',
@@ -77,6 +80,8 @@ const translations: TranslateKeys = {
   rightHand: 'Mano derecha',
   leftHand: 'Mano izquierda',
   bothHands: 'Ambas manos',
+  useSameForBothHands: 'Mismo valor para ambas manos',
+  editHandsSeparately: 'Editar cada mano por separado',
   showConfigurationDetails: 'Mostrar detalles de configuración',
   configurationDetails: 'Detalles de configuración',
   resultsFound: 'Resultados encontrados',
@@ -176,6 +181,7 @@ const translations: TranslateKeys = {
     invalidVideoFile: 'Por favor seleccione un archivo de vídeo válido.',
     videoSizeExceeded: 'El tamaño del archivo de vídeo debe ser menor a 20MB',
     unsupportedVideoFormat: 'Por favor, utilice un formato MP4, WebM o OGG.',
+    handednessRequired: 'El número de manos es obligatorio',
     failedToSortDefinitions: 'Error al ordenar las definiciones',
   },
   ACCEPTED: 'Aceptado',
diff --git a/frontend/src/i18n/es-ES/phonology.ts b/frontend/src/i18n/es-ES/phonology.ts
index 47b73fb..d47596f 100644
--- a/frontend/src/i18n/es-ES/phonology.ts
+++ b/frontend/src/i18n/es-ES/phonology.ts
@@ -43,6 +43,18 @@ const phonology : PhonologyTranslateKeys = {
       WIGGLING: 'Vibración',
       WIGGLING_description: 'Oscilación alterna de los dedos seleccionados'
     },
+    handedness: {
+      ONE: '1',
+      ONE_description: 'Signo con una mano',
+      TWO_A: '2a',
+      TWO_A_description: 'Signo con dos manos asimétrico',
+      TWO_N: '2n',
+      TWO_N_description: 'Signo con dos manos no espejadas',
+      TWO_S: '2s',
+      TWO_S_description: 'Signo con dos manos simétrico',
+      NA: 'x',
+      NA_description: 'No aplicable',
+    },
     handConfiguration: {
       EMPTY: 'Vacío',
       CONF_1: 'BABY_O',
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index c62625d..306fef1 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -42,6 +42,18 @@ export interface PhonologyTranslateKeys {
       WIGGLING: string;
       WIGGLING_description: string;
     };
+    handedness: {
+      ONE: string;
+      ONE_description: string;
+      TWO_A: string;
+      TWO_A_description: string;
+      TWO_N: string;
+      TWO_N_description: string;
+      TWO_S: string;
+      TWO_S_description: string;
+      NA: string;
+      NA_description: string;
+    };
     handConfiguration: {
       EMPTY: string;
       CONF_1: string;
@@ -534,6 +546,9 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   portuguese: string;
   russian: string;
   hands: string;
+  handedness: string;
+  mainHand: string;
+  nonDominantHand: string;
   configuration: string;
   configurationChanges: string;
   vocalization: string;
@@ -548,6 +563,8 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   rightHand: string;
   leftHand: string;
   bothHands: string;
+  useSameForBothHands: string;
+  editHandsSeparately: string;
   showConfigurationDetails: string;
   configurationDetails: string;
   resultsFound: string;
@@ -654,6 +671,7 @@ interface TranslateKeys extends PhonologyTranslateKeys {
     failedToCreateDefinition: string;
     failedToSortDefinitions: string;
     unsupportedVideoFormat: string;
+    handednessRequired: string;
   };
   ACCEPTED: string;
   DENIED: string;
diff --git a/frontend/src/pages/CreateGlossRequest.vue b/frontend/src/pages/CreateGlossRequest.vue
index 2cb065e..1d30860 100644
--- a/frontend/src/pages/CreateGlossRequest.vue
+++ b/frontend/src/pages/CreateGlossRequest.vue
@@ -1,10 +1,11 @@
 <template>
-  <q-page padding 
-  :style-fn="(header: number, height: number) => {
+  <q-page
+    padding 
+    :style-fn="(header: number, height: number) => {
       pageHeight = height-header
       return { height: `${height - header}px` };
     }"
-    >
+  >
     <div class="row justify-center">
       <div class="col-12 col-md-8 col-lg-6">
         <q-card class="q-pa-lg">
diff --git a/frontend/src/pages/GlossPage.vue b/frontend/src/pages/GlossPage.vue
index 49dac36..939032d 100644
--- a/frontend/src/pages/GlossPage.vue
+++ b/frontend/src/pages/GlossPage.vue
@@ -136,7 +136,8 @@ const updateGlossData = (updatedGlossData: GlossData) => {
 .gloss-page {
   height: calc(100vh - 64px);
   max-height: calc(100vh - 64px);
-  overflow: hidden;
+  overflow-x: visible;
+  overflow-y: hidden;
   display: flex;
   flex-direction: column;
 }
@@ -145,7 +146,8 @@ const updateGlossData = (updatedGlossData: GlossData) => {
   flex: 1 1 0;
   min-height: 0;
   height: 100%;
-  overflow: hidden;
+  overflow-x: visible;
+  overflow-y: hidden;
 }
 
 .gloss-page__content--editing {
@@ -163,7 +165,8 @@ const updateGlossData = (updatedGlossData: GlossData) => {
   flex: 1 1 0;
   min-height: 0;
   height: 100%;
-  overflow: hidden;
+  overflow-x: visible;
+  overflow-y: hidden;
 }
 
 .gloss-page__detail--editing {
diff --git a/frontend/src/pages/SearchPage.vue b/frontend/src/pages/SearchPage.vue
index 2d218ba..4d0adb0 100644
--- a/frontend/src/pages/SearchPage.vue
+++ b/frontend/src/pages/SearchPage.vue
@@ -29,7 +29,11 @@
     </div>
 
     <!-- Main Content: Filters and Results -->
-    <div v-if="$q.screen.gt.md" class="row q-col-gutter-md col" :style="{ overflowY: 'auto' }">
+    <div
+      v-if="$q.screen.gt.md"
+      class="row q-col-gutter-md col"
+      :style="{ overflowY: 'auto' }"
+    >
       <!-- Filters Sidebar -->
       <div 
         v-show="showFilters" 
@@ -39,7 +43,7 @@
         <SearchFilters
           v-model:search-query="searchQuery"
           v-model:selected-category="selectedLexicalCategory"
-          v-model:selected-hands="selectedHands"
+          v-model:selected-handedness="selectedHandedness"
           v-model:filter-inputs="filterInputs"
           @search="performSearch"
           @clear="performSearch"
@@ -60,7 +64,11 @@
         />
       </div>
     </div>
-    <div v-else class="column q-col-gutter-md col q-mt-md no-wrap" :style="{ overflowY: 'auto' }">
+    <div
+      v-else
+      class="column q-col-gutter-md col q-mt-md no-wrap"
+      :style="{ overflowY: 'auto' }"
+    >
       <!-- Filters Sidebar -->
       <div 
         v-show="showFilters" 
@@ -69,7 +77,7 @@
         <SearchFilters
           v-model:search-query="searchQuery"
           v-model:selected-category="selectedLexicalCategory"
-          v-model:selected-hands="selectedHands"
+          v-model:selected-handedness="selectedHandedness"
           v-model:filter-inputs="filterInputs"
           @search="performSearch"
           @clear="performSearch"
@@ -77,10 +85,11 @@
       </div>
 
       <!-- Search Results -->
-      <div class="col fit" 
-        v-show="!showFilters"
+      <div
+        v-show="!showFilters" 
+        class="col fit"
         :style="{ overflowY: 'auto' }"
-        >
+      >
         <SearchResults
           :results="searchResults"
           :loading="loading"
@@ -110,10 +119,10 @@ import translate from 'src/utils/translate';
 
 // Create a type for filter inputs that allows empty values
 type FilterInputs = {
-  hands: string | null;
-  configuration: string;
+  handedness: string | null;
+  dominantConfiguration: string;
   configurationChanges: string;
-  relationBetweenArticulators: string;
+  dominantRelationBetweenArticulators: string;
   location: string;
   movementRelatedOrientation: string;
   orientationRelatedToLocation: string;
@@ -156,12 +165,12 @@ const showFilters = ref(false);
 
 // Filters state
 const selectedLexicalCategory = ref<string>('');
-const selectedHands = ref<string>('');
+const selectedHandedness = ref<string>('');
 const filterInputs = ref<FilterInputs>({
-  hands: null,
-  configuration: '',
+  handedness: null,
+  dominantConfiguration: '',
   configurationChanges: '',
-  relationBetweenArticulators: '',
+  dominantRelationBetweenArticulators: '',
   location: '',
   movementRelatedOrientation: '',
   orientationRelatedToLocation: '',
@@ -180,8 +189,8 @@ const filterBy = computed(() => {
   const filters = [];
   
   
-  if (selectedHands.value !== '' && selectedHands.value !== null) {
-    filters.push(`hands:='${selectedHands.value}'`);
+  if (selectedHandedness.value !== '' && selectedHandedness.value !== null) {
+    filters.push(`handedness:='${selectedHandedness.value}'`);
   }
   
   // Add text input filters - using contains operator for fuzzy matching
@@ -228,7 +237,7 @@ async function performSearch() {
       page: Number(page.value),
       limit: Number(perPage.value),
       filter_by: filterBy.value || undefined,
-      facet_by: 'lexicalCategory,hands,configuration,configurationChanges,relationBetweenArticulators,location,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType'
+      facet_by: 'lexicalCategory,handedness,dominantConfiguration,configurationChanges,dominantRelationBetweenArticulators,location,movementRelatedOrientation,orientationRelatedToLocation,orientationChange,contactType,movementType'
     };
     
     searchResults.value = await searchService.search(params);
diff --git a/frontend/src/pages/UserManagementPage.vue b/frontend/src/pages/UserManagementPage.vue
index 6099190..79916e2 100644
--- a/frontend/src/pages/UserManagementPage.vue
+++ b/frontend/src/pages/UserManagementPage.vue
@@ -1,11 +1,15 @@
 <template>
-  <q-page class="q-pa-md column no-wrap" 
+  <q-page
+    class="q-pa-md column no-wrap" 
     :style-fn="(header: number, height: number) => {
       pageHeight = height-header
       return { height: `${height - header}px` };
-    }">
+    }"
+  >
     <div class="row q-mb-md items-center justify-between">
-      <div class="text-h4">{{ translate('userManagement') }}</div>
+      <div class="text-h4">
+        {{ translate('userManagement') }}
+      </div>
       <q-btn
         :label="translate('createUser')"
         color="primary"
diff --git a/frontend/src/services/search.service.ts b/frontend/src/services/search.service.ts
index 2fb4395..6b3bece 100644
--- a/frontend/src/services/search.service.ts
+++ b/frontend/src/services/search.service.ts
@@ -13,10 +13,10 @@ export interface SearchResult {
   id: string;
   url: string | null;
   signVideoTitle: string | null;
-  hands: string | null;
-  configuration: string | null;
+  handedness: string | null;
+  dominantConfiguration: string | null;
   configurationChanges: string | null;
-  relationBetweenArticulators: string | null;
+  dominantRelationBetweenArticulators: string | null;
   location: string | null;
   movementRelatedOrientation: string | null;
   locationRelatedOrientation: string | null;
@@ -61,10 +61,10 @@ class SearchService {
   getFacetFields() {
     return [
       { field: 'lexicalCategory', label: translate('lexicalCategory') },
-      { field: 'hands', label: translate('hands') },
-      { field: 'configuration', label: translate('configuration') },
+      { field: 'handedness', label: translate('handedness') },
+      { field: 'dominantConfiguration', label: translate('configuration') },
       { field: 'configurationChanges', label: translate('configurationChanges') },
-      { field: 'relationBetweenArticulators', label: translate('relationBetweenArticulators') },
+      { field: 'dominantRelationBetweenArticulators', label: translate('relationBetweenArticulators') },
       { field: 'location', label: translate('location') },
       { field: 'movementRelatedOrientation', label: translate('movementRelatedOrientation') },
       { field: 'locationRelatedOrientation', label: translate('locationRelatedOrientation') },
diff --git a/frontend/src/types/api.ts b/frontend/src/types/api.ts
index 65103f9..408fe3e 100644
--- a/frontend/src/types/api.ts
+++ b/frontend/src/types/api.ts
@@ -1,4 +1,5 @@
-import type { GlossData , Language, RequestStatus, Hand } from './models'
+import type { GlossData , Language, RequestStatus } from './models'
+import type { Handedness } from './enums'
 
 export type WordStatus = 'PUBLISHED' | 'DRAFT' | 'PENDING';
 
@@ -95,10 +96,12 @@ export interface UpdateVideoDto {
   url: string;
   priority?: number;
   videoData: {
-    hands: Hand;
-    configuration: string;
+    handedness: Handedness;
+    dominantConfiguration: string;
+    nonDominantConfiguration?: string;
     configurationChanges: string;
-    relationBetweenArticulators: string;
+    dominantRelationBetweenArticulators: string;
+    nonDominantRelationBetweenArticulators?: string;
     location: string;
     movementRelatedOrientation: string;
     locationRelatedOrientation: string;
@@ -179,10 +182,12 @@ export interface GlossRequestDetailResponse extends GlossRequestResponse {
     url: string;
     priority: number;
     videoData: {
-      hands: Hand;
-      configuration: string;
+      handedness: Handedness;
+      dominantConfiguration: string;
+      nonDominantConfiguration?: string;
       configurationChanges: string;
-      relationBetweenArticulators: string;
+      dominantRelationBetweenArticulators: string;
+      nonDominantRelationBetweenArticulators?: string;
       location: string;
       movementRelatedOrientation: string;
       locationRelatedOrientation: string;
diff --git a/frontend/src/types/enums.ts b/frontend/src/types/enums.ts
index 5ee4018..c8f5e3c 100644
--- a/frontend/src/types/enums.ts
+++ b/frontend/src/types/enums.ts
@@ -253,10 +253,12 @@ export enum MovementType {
     STRAIGHT_TO_CIRCLE = 'STRAIGHT_TO_CIRCLE'
 }
 
-export enum Hand {
-    RIGHT = 'RIGHT',
-    LEFT = 'LEFT',
-    BOTH = 'BOTH'
+export enum Handedness {
+    ONE = 'ONE',
+    TWO_A = 'TWO_A',
+    TWO_N = 'TWO_N',
+    TWO_S = 'TWO_S',
+    NA = 'NA',
 }
 
 export enum Location {
diff --git a/frontend/src/types/models.ts b/frontend/src/types/models.ts
index 5a862d3..e23a5ff 100644
--- a/frontend/src/types/models.ts
+++ b/frontend/src/types/models.ts
@@ -1,6 +1,6 @@
 import type { RelatedGloss, MinimalPair } from "./gloss"
 import type { 
-  Hand,
+  Handedness,
   HandConfiguration,
   ConfigurationChange,
   RelationBetweenArticulators,
@@ -81,10 +81,12 @@ export interface Video {
 }
 
 export interface PhonologyData {
-  hands: Hand;
-  configuration: HandConfiguration;
+  handedness: Handedness;
+  dominantConfiguration?: HandConfiguration | null;
+  nonDominantConfiguration?: HandConfiguration | null;
+  dominantRelationBetweenArticulators?: RelationBetweenArticulators | null;
+  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators | null;
   configurationChanges: ConfigurationChange;
-  relationBetweenArticulators: RelationBetweenArticulators;
   location: Location;
   movementRelatedOrientation: MovementRelatedOrientation;
   orientationRelatedToLocation: OrientationRelatedToLocation;
diff --git a/frontend/src/utils/UserManagement/tableColumns.ts b/frontend/src/utils/UserManagement/tableColumns.ts
index 1fdc992..76e5935 100644
--- a/frontend/src/utils/UserManagement/tableColumns.ts
+++ b/frontend/src/utils/UserManagement/tableColumns.ts
@@ -1,4 +1,4 @@
-import { Role } from 'src/types/models';
+import type { Role } from 'src/types/models';
 import translate from 'src/utils/translate';
 
 export const getUserTableColumns = () => [
diff --git a/frontend/src/utils/phonologyHelpers.ts b/frontend/src/utils/phonologyHelpers.ts
new file mode 100644
index 0000000..9ac4dfb
--- /dev/null
+++ b/frontend/src/utils/phonologyHelpers.ts
@@ -0,0 +1,65 @@
+import { Handedness } from 'src/types/enums';
+
+export function isMultiHand(handedness: Handedness | string | null | undefined): boolean {
+  return handedness === Handedness.TWO_A
+    || handedness === Handedness.TWO_N
+    || handedness === Handedness.TWO_S;
+}
+
+export type PhonologyDisplayMode = 'single' | 'merged' | 'split';
+
+export function isPhonologyValueEmpty(value: string | null | undefined): boolean {
+  return value == null || value === '';
+}
+
+export function getPhonologyDisplayMode(
+  dominant: string | null | undefined,
+  nonDominant: string | null | undefined,
+  multiHand: boolean,
+): PhonologyDisplayMode {
+  if (!multiHand) return 'single';
+
+  const dominantEmpty = isPhonologyValueEmpty(dominant);
+  const nonDominantEmpty = isPhonologyValueEmpty(nonDominant);
+
+  if (dominantEmpty && nonDominantEmpty) return 'merged';
+  if (!dominantEmpty && !nonDominantEmpty && dominant === nonDominant) return 'merged';
+  if (dominantEmpty !== nonDominantEmpty) return 'merged';
+
+  return 'split';
+}
+
+export function mapFitxaHandednessCode(code: string): Handedness | null {
+  const normalized = String(code).trim().toLowerCase();
+  switch (normalized) {
+    case '1':
+      return Handedness.ONE;
+    case '2a':
+      return Handedness.TWO_A;
+    case '2n':
+      return Handedness.TWO_N;
+    case '2s':
+      return Handedness.TWO_S;
+    case 'x':
+      return Handedness.NA;
+    default:
+      return null;
+  }
+}
+
+export function handednessToFitxaCode(handedness: Handedness): string {
+  switch (handedness) {
+    case Handedness.ONE:
+      return '1';
+    case Handedness.TWO_A:
+      return '2a';
+    case Handedness.TWO_N:
+      return '2n';
+    case Handedness.TWO_S:
+      return '2s';
+    case Handedness.NA:
+      return 'x';
+    default:
+      return '1';
+  }
+}
diff --git a/frontend/src/utils/phonologyOptions.ts b/frontend/src/utils/phonologyOptions.ts
index cf71bcc..14fea72 100644
--- a/frontend/src/utils/phonologyOptions.ts
+++ b/frontend/src/utils/phonologyOptions.ts
@@ -1,5 +1,5 @@
 import {
-  Hand,
+  Handedness,
   HandConfiguration,
   ConfigurationChange,
   RelationBetweenArticulators,
@@ -22,11 +22,15 @@ interface SelectOption {
 export function usePhonologyOptions() {
   const  t = (key: string) => translate(key);
 
-  const handOptions: SelectOption[] = Object.values(Hand).map(value => ({
+  const handednessOptions: SelectOption[] = Object.values(Handedness).map(value => ({
     value,
-    label: t(`phonology.hand.${value}`),
+    label: t(`phonology.handedness.${value}`),
+    description: t(`phonology.handedness.${value}_description`),
   }));
 
+  /** @deprecated Use handednessOptions */
+  const handOptions = handednessOptions;
+
   const handConfigurationOptions: SelectOption[] = Object.values(HandConfiguration).map(value => ({
     value,
     label: t(`phonology.handConfiguration.${value}`),
@@ -79,6 +83,7 @@ export function usePhonologyOptions() {
   }));
 
   return {
+    handednessOptions,
     handOptions,
     handConfigurationOptions,
     configurationChangeOptions,
@@ -91,4 +96,12 @@ export function usePhonologyOptions() {
     movementTypeOptions,
     movementDirectionOptions,
   };
-} 
\ No newline at end of file
+}
+
+export type PhonologySelectOption = SelectOption;
+
+export function getOptionLabel(options: SelectOption[], value: string | null | undefined): string {
+  if (!value) return '';
+  const option = options.find(o => o.value === value);
+  return option ? option.label : value;
+}

From f2cd329a1dc5d6fead87d3519aa91920ba1f8be8 Mon Sep 17 00:00:00 2001
From: Ramon <ramondonadeucaballero@gmail.com>
Date: Fri, 19 Jun 2026 18:49:17 +0200
Subject: [PATCH 10/17] feat: add compound feature

---
 .cursor/skills/signbank-data-model/SKILL.md   |   4 +-
 .../skills/signbank-dev-environment/SKILL.md  |  10 +-
 .../skills/signbank-prisma-migrate/SKILL.md   | 103 ++++
 .../migration.sql                             |  36 ++
 .../migration.sql                             |  11 +
 backend/prisma/schema.prisma                  |  41 +-
 backend/prisma/seed.ts                        |   4 +
 backend/prisma/seed/compound-bessons-1d.ts    | 395 ++++++++++++++++
 .../src/gloss-data/dto/update-compound.dto.ts |  79 ++++
 .../src/gloss-data/gloss-data.controller.ts   |  12 +-
 backend/src/gloss-data/gloss-data.service.ts  | 260 +++++++++-
 backend/src/glosses/compound-include.ts       |  43 ++
 backend/src/glosses/compound-phonology.ts     | 108 +++++
 backend/src/glosses/glosses.service.ts        |   2 +
 .../src/sign-videos/sign-videos.service.ts    |  18 +-
 .../src/typesense/types/gloss-index.type.ts   |   1 +
 backend/src/typesense/typesense.config.ts     |   1 +
 backend/src/typesense/typesense.service.ts    |  61 ++-
 docs/fitxas-import-plan.md                    |  15 +-
 docs/fitxas-import-requirements.md            |  13 +-
 docs/fitxas-import-tasks.md                   |  94 ++++
 .../components/CompoundComponent.vue          | 174 +++++++
 .../components/CompoundEditorComponent.vue    | 446 ++++++++++++++++++
 .../components/CompoundPartVideoCard.vue      |  73 +++
 .../components/CompoundPhonologyDialog.vue    |  90 ++++
 .../components/CompoundPhonologyTable.vue     | 278 +++++++++++
 .../components/GlossTranslationsComponent.vue |   9 +
 .../components/GlossVideoComponent.vue        |  16 +-
 .../GlossDetail/components/MainContent.vue    |  46 +-
 .../components/MoreContentComponent.vue       | 126 +++--
 .../GlossDetail/components/SignVideoAside.vue |  14 +-
 frontend/src/i18n/ca-ES/index.ts              |  38 +-
 frontend/src/i18n/en-US/index.ts              |  38 +-
 frontend/src/i18n/es-ES/index.ts              |  38 +-
 frontend/src/i18n/translateKeys.ts            |  36 ++
 frontend/src/services/api.ts                  |   4 +
 frontend/src/types/models.ts                  |  20 +-
 frontend/src/utils/compoundEditor.ts          | 105 +++++
 frontend/src/utils/compoundPhonology.ts       | 119 +++++
 frontend/src/utils/defaultPhonology.ts        |  35 ++
 frontend/src/utils/glossValidation.ts         |  19 +
 41 files changed, 2942 insertions(+), 93 deletions(-)
 create mode 100644 .cursor/skills/signbank-prisma-migrate/SKILL.md
 create mode 100644 backend/prisma/migrations/20250619130000_compound_signs/migration.sql
 create mode 100644 backend/prisma/migrations/20250619140000_compound_part_inline_video/migration.sql
 create mode 100644 backend/prisma/seed/compound-bessons-1d.ts
 create mode 100644 backend/src/gloss-data/dto/update-compound.dto.ts
 create mode 100644 backend/src/glosses/compound-include.ts
 create mode 100644 backend/src/glosses/compound-phonology.ts
 create mode 100644 docs/fitxas-import-tasks.md
 create mode 100644 frontend/src/components/GlossDetail/components/CompoundComponent.vue
 create mode 100644 frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
 create mode 100644 frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
 create mode 100644 frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue
 create mode 100644 frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
 create mode 100644 frontend/src/utils/compoundEditor.ts
 create mode 100644 frontend/src/utils/compoundPhonology.ts
 create mode 100644 frontend/src/utils/defaultPhonology.ts

diff --git a/.cursor/skills/signbank-data-model/SKILL.md b/.cursor/skills/signbank-data-model/SKILL.md
index e87638f..4282125 100644
--- a/.cursor/skills/signbank-data-model/SKILL.md
+++ b/.cursor/skills/signbank-data-model/SKILL.md
@@ -81,7 +81,9 @@ Frontend phonology filters and Typesense facets mirror these enum string values.
 
 ## Migration rules
 
-1. Edit `schema.prisma`, then `npx prisma migrate dev --name <name>` (development).
+**Use `signbank-prisma-migrate` skill** — always generate migrations with `prisma migrate dev`; never hand-write `migration.sql`.
+
+1. Edit `schema.prisma`, then `npx prisma migrate dev --name <name>` (via Docker exec in dev).
 2. Containers apply with `prisma migrate deploy` on startup — never edit applied migration SQL retroactively.
 3. Seed (`backend/prisma/seed.ts`) is dev/test only; production bootstraps admin via `AppService.onApplicationBootstrap`.
 
diff --git a/.cursor/skills/signbank-dev-environment/SKILL.md b/.cursor/skills/signbank-dev-environment/SKILL.md
index 8109de1..f4d2890 100644
--- a/.cursor/skills/signbank-dev-environment/SKILL.md
+++ b/.cursor/skills/signbank-dev-environment/SKILL.md
@@ -62,13 +62,15 @@ Source of truth: `.env.example`. Key vars:
 
 ## Common workflows
 
-**Schema change:**
+**Schema change:** follow `signbank-prisma-migrate` skill — edit `schema.prisma`, then:
+
 ```bash
-# Dev: create migration inside backend container or locally with DATABASE_URL set
-npx prisma migrate dev --name describe_change
-make migrate   # deploy in running stack
+docker compose -f docker-compose-local.yaml exec backend npx prisma migrate dev --name describe_change
+docker compose -f docker-compose-local.yaml exec backend npx prisma migrate status
 ```
 
+Deploy only (migrations already committed): `make migrate` or the `migrate deploy` exec above.
+
 **Backend debug:** Node inspector on `9229` when using local compose.
 
 **Full reset:**
diff --git a/.cursor/skills/signbank-prisma-migrate/SKILL.md b/.cursor/skills/signbank-prisma-migrate/SKILL.md
new file mode 100644
index 0000000..dc4fd4f
--- /dev/null
+++ b/.cursor/skills/signbank-prisma-migrate/SKILL.md
@@ -0,0 +1,103 @@
+---
+name: signbank-prisma-migrate
+description: SignBank database schema changes via Prisma migrate dev (generated SQL, never hand-written). Use when editing backend/prisma/schema.prisma, adding tables/columns/enums, creating migrations, or when the user asks to update the database structure.
+---
+
+# SignBank Prisma Migrations
+
+Schema: `backend/prisma/schema.prisma`. Migrations: `backend/prisma/migrations/`.
+
+## Golden rule
+
+**Never hand-write migration SQL** when changing the database structure. Always let Prisma generate it from `schema.prisma`.
+
+| Do | Don't |
+|----|-------|
+| Edit `schema.prisma`, then run `prisma migrate dev` | Create or edit `migrations/*/migration.sql` by hand |
+| Commit the generated migration folder + updated schema | Patch applied migrations retroactively |
+| Run `prisma generate` after schema changes | Skip client regeneration |
+
+## Workflow
+
+### 1. Edit the schema
+
+Change `backend/prisma/schema.prisma` only. See `signbank-data-model` for entity conventions.
+
+### 2. Generate and apply the migration (Docker)
+
+Stack must be running (`docker compose -f docker-compose-local.yaml ps`).
+
+```bash
+docker compose -f docker-compose-local.yaml exec backend npx prisma migrate dev --name describe_change
+```
+
+Use a short **snake_case** name: `compound_signs`, `optional_lexical_category`, `add_category_model`.
+
+Prisma will:
+- Diff schema vs database
+- Create `backend/prisma/migrations/<timestamp>_describe_change/migration.sql`
+- Apply the migration to the dev database
+- Run `prisma generate`
+
+### 3. Verify
+
+```bash
+docker compose -f docker-compose-local.yaml exec backend npx prisma migrate status
+```
+
+Expect: `Database schema is up to date!`
+
+If seed data depends on new models, update `backend/prisma/seed.ts` (or `backend/prisma/seed/`) and run:
+
+```bash
+docker compose -f docker-compose-local.yaml exec backend npx prisma db seed
+```
+
+### 4. Deploy-only (CI / already-generated migrations)
+
+When migration files already exist and you only need to apply them:
+
+```bash
+docker compose -f docker-compose-local.yaml exec backend npx prisma migrate deploy
+```
+
+Backend containers also run `migrate deploy` on startup in deployed environments.
+
+## Review SQL before applying (rare)
+
+Only when you must inspect SQL without applying:
+
+```bash
+docker compose -f docker-compose-local.yaml exec backend npx prisma migrate dev --name describe_change --create-only
+```
+
+Review the generated file, then apply with `migrate dev` (no `--create-only`) or `migrate deploy`.
+
+## Windows without `make`
+
+Use `docker compose -f docker-compose-local.yaml exec backend …` instead of `make migrate` / `make seed`.
+
+## Host-side alternative
+
+If `DATABASE_URL` in `.env` points at `localhost:5432` (postgres exposed), you can run from `backend/`:
+
+```bash
+npx prisma migrate dev --name describe_change
+```
+
+Prefer the **Docker exec** path so `DATABASE_URL` matches the running stack.
+
+## Checklist
+
+```
+- [ ] schema.prisma updated
+- [ ] prisma migrate dev --name … (generated SQL, not hand-written)
+- [ ] prisma migrate status shows up to date
+- [ ] seed updated if needed and re-run
+- [ ] backend code uses new Prisma types (generate ran)
+```
+
+## Related skills
+
+- `signbank-data-model` — entities, enums, relationships
+- `signbank-dev-environment` — Docker stack, compose files, troubleshooting
diff --git a/backend/prisma/migrations/20250619130000_compound_signs/migration.sql b/backend/prisma/migrations/20250619130000_compound_signs/migration.sql
new file mode 100644
index 0000000..1cee6a2
--- /dev/null
+++ b/backend/prisma/migrations/20250619130000_compound_signs/migration.sql
@@ -0,0 +1,36 @@
+-- AlterTable
+ALTER TABLE "GlossData" ADD COLUMN "externalId" TEXT;
+ALTER TABLE "GlossData" ADD COLUMN "isCompound" BOOLEAN NOT NULL DEFAULT false;
+ALTER TABLE "GlossData" ADD COLUMN "iconicity" TEXT;
+
+-- CreateTable
+CREATE TABLE "CompoundPart" (
+    "id" TEXT NOT NULL,
+    "glossDataId" TEXT NOT NULL,
+    "position" INTEGER NOT NULL,
+    "gloss" TEXT NOT NULL,
+    "compExternalId" TEXT,
+    "linkedGlossId" TEXT,
+    "redundant" BOOLEAN NOT NULL DEFAULT false,
+    "inlinePhonologyId" TEXT,
+
+    CONSTRAINT "CompoundPart_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "GlossData_externalId_key" ON "GlossData"("externalId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "CompoundPart_inlinePhonologyId_key" ON "CompoundPart"("inlinePhonologyId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "CompoundPart_glossDataId_position_key" ON "CompoundPart"("glossDataId", "position");
+
+-- AddForeignKey
+ALTER TABLE "CompoundPart" ADD CONSTRAINT "CompoundPart_glossDataId_fkey" FOREIGN KEY ("glossDataId") REFERENCES "GlossData"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CompoundPart" ADD CONSTRAINT "CompoundPart_linkedGlossId_fkey" FOREIGN KEY ("linkedGlossId") REFERENCES "GlossData"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CompoundPart" ADD CONSTRAINT "CompoundPart_inlinePhonologyId_fkey" FOREIGN KEY ("inlinePhonologyId") REFERENCES "VideoData"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/backend/prisma/migrations/20250619140000_compound_part_inline_video/migration.sql b/backend/prisma/migrations/20250619140000_compound_part_inline_video/migration.sql
new file mode 100644
index 0000000..e7f5812
--- /dev/null
+++ b/backend/prisma/migrations/20250619140000_compound_part_inline_video/migration.sql
@@ -0,0 +1,11 @@
+-- AlterTable
+ALTER TABLE "SignVideo" ALTER COLUMN "glossDataId" DROP NOT NULL;
+
+-- AlterTable
+ALTER TABLE "CompoundPart" ADD COLUMN "inlineSignVideoId" TEXT;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "CompoundPart_inlineSignVideoId_key" ON "CompoundPart"("inlineSignVideoId");
+
+-- AddForeignKey
+ALTER TABLE "CompoundPart" ADD CONSTRAINT "CompoundPart_inlineSignVideoId_fkey" FOREIGN KEY ("inlineSignVideoId") REFERENCES "SignVideo"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
index 46177fc..53a96b3 100644
--- a/backend/prisma/schema.prisma
+++ b/backend/prisma/schema.prisma
@@ -559,6 +559,9 @@ model DictionaryEntry {
 model GlossData {
     id                   String             @id @default(uuid())
     gloss                String
+    externalId           String?            @unique
+    isCompound           Boolean            @default(false)
+    iconicity            String?
     createdAt            DateTime           @default(now())
     updatedAt            DateTime           @updatedAt
     editComment          String?
@@ -571,12 +574,32 @@ model GlossData {
     definitions          Definition[]
     examples             Example[]
     glossTranslations    GlossTranslation[]
+    compoundParts        CompoundPart[]
+    usedInCompounds      CompoundPart[]     @relation("CompoundPartLinkedGloss")
     relationsAsSource    RelatedGloss[]     @relation("RelationSource")
     relationsAsTarget    RelatedGloss[]     @relation("RelationTarget")
     minimalPairsAsSource MinimalPair[]      @relation("MinimalPairSource")
     minimalPairsAsTarget MinimalPair[]      @relation("MinimalPairTarget")
 }
 
+model CompoundPart {
+    id                String     @id @default(uuid())
+    glossDataId       String
+    glossData         GlossData  @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+    position          Int
+    gloss             String
+    compExternalId    String?
+    linkedGlossId     String?
+    linkedGloss       GlossData? @relation("CompoundPartLinkedGloss", fields: [linkedGlossId], references: [id])
+    redundant         Boolean    @default(false)
+    inlinePhonologyId String?    @unique
+    inlinePhonology   VideoData? @relation("CompoundPartInlinePhonology", fields: [inlinePhonologyId], references: [id], onDelete: Cascade)
+    inlineSignVideoId String?    @unique
+    inlineSignVideo   SignVideo? @relation("CompoundPartInlineSignVideo", fields: [inlineSignVideoId], references: [id], onDelete: SetNull)
+
+    @@unique([glossDataId, position])
+}
+
 model RelatedGloss {
     id            String       @id @default(uuid())
     relationType  RelationType
@@ -634,14 +657,15 @@ model DefinitionTranslation {
 }
 
 model SignVideo {
-    id          String    @id @default(uuid())
-    title       String
-    videos      Video[]
-    priority    Int       @default(0)
-    videoData   VideoData @relation(fields: [videoDataId], references: [id], onDelete: Cascade)
-    videoDataId String
-    glossData   GlossData @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
-    glossDataId String
+    id                 String        @id @default(uuid())
+    title              String
+    videos             Video[]
+    priority           Int           @default(0)
+    videoData          VideoData     @relation(fields: [videoDataId], references: [id], onDelete: Cascade)
+    videoDataId        String
+    glossData          GlossData?    @relation(fields: [glossDataId], references: [id], onDelete: Cascade)
+    glossDataId        String?
+    compoundPartInline CompoundPart? @relation("CompoundPartInlineSignVideo")
 }
 
 model VideoData {
@@ -663,6 +687,7 @@ model VideoData {
     inicialization               String
     repeatedMovement             Boolean                      @default(false)
     signVideo                    SignVideo[]
+    compoundPart                 CompoundPart?                @relation("CompoundPartInlinePhonology")
     id                           String                       @id @default(uuid())
 }
 
diff --git a/backend/prisma/seed.ts b/backend/prisma/seed.ts
index d7c22c5..115660f 100644
--- a/backend/prisma/seed.ts
+++ b/backend/prisma/seed.ts
@@ -1,5 +1,6 @@
 import { PrismaClient, Role, Language, LexicalCategory, Handedness, GlossStatus, ConfigurationChange, RelationBetweenArticulators, Location, MovementType, MovementRelatedOrientation, OrientationChange, ContactType, OrientationRelatedToLocation, HandConfiguration, RelationType, MovementDirection } from '@prisma/client';
 import * as argon2 from 'argon2';
+import { seedCompoundBessonsExample } from './seed/compound-bessons-1d';
 
 const prisma = new PrismaClient();
 
@@ -12,6 +13,7 @@ async function main() {
     prisma.definition.deleteMany(),
     prisma.video.deleteMany(),
     prisma.minimalPair.deleteMany(),
+    prisma.compoundPart.deleteMany(),
     prisma.signVideo.deleteMany(),
     prisma.dictionaryEntry.deleteMany(),
     prisma.relatedGloss.deleteMany(),
@@ -951,6 +953,8 @@ async function main() {
     }),
   ]);
 
+  await seedCompoundBessonsExample(prisma);
+
   console.log('Seed data created successfully');
 }
 
diff --git a/backend/prisma/seed/compound-bessons-1d.ts b/backend/prisma/seed/compound-bessons-1d.ts
new file mode 100644
index 0000000..7c7f680
--- /dev/null
+++ b/backend/prisma/seed/compound-bessons-1d.ts
@@ -0,0 +1,395 @@
+import {
+  PrismaClient,
+  Language,
+  LexicalCategory,
+  GlossStatus,
+  Handedness,
+  HandConfiguration,
+  ConfigurationChange,
+  RelationBetweenArticulators,
+  Location,
+  MovementRelatedOrientation,
+  OrientationRelatedToLocation,
+  OrientationChange,
+  ContactType,
+  MovementType,
+  MovementDirection,
+  RelationType,
+} from '@prisma/client';
+
+/** Simple one-handed phonology for SEGON inline morpheme and BESSONS-T_antiga. */
+function buildBessonsComponentPhonology() {
+  return {
+    handedness: Handedness.ONE,
+    location: Location.NEUTRAL_SPACE,
+    orientationChange: OrientationChange.FLEXION,
+    configurationChanges: ConfigurationChange.EMPTY,
+    movementRelatedOrientation: MovementRelatedOrientation.EMPTY,
+    orientationRelatedToLocation: OrientationRelatedToLocation.EMPTY,
+    contactType: ContactType.EMPTY,
+    movementType: MovementType.EMPTY,
+    movementDirection: MovementDirection.EMPTY,
+    vocalization: 'none',
+    nonManualComponent: 'none',
+    inicialization: 'none',
+    repeatedMovement: false,
+  };
+}
+
+/** Two-handed asymmetric phonology for GERMÀ (see synonym GERMÀ+Conf 2 in bessons-1d.json). */
+function buildGermaPhonology() {
+  return {
+    handedness: Handedness.TWO_A,
+    dominantConfiguration: HandConfiguration.CONF_2,
+    nonDominantConfiguration: HandConfiguration.CONF_1,
+    dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
+    nonDominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT,
+    configurationChanges: ConfigurationChange.OPENING,
+    location: Location.NEUTRAL_SPACE,
+    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
+    orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
+    orientationChange: OrientationChange.FLEXION,
+    contactType: ContactType.CONTINUOUS,
+    movementType: MovementType.ARC,
+    movementDirection: MovementDirection.FORWARDS,
+    vocalization: 'none',
+    nonManualComponent: 'none',
+    inicialization: 'none',
+    repeatedMovement: true,
+  };
+}
+
+/** Phonology for the full BESSONS-1d compound sign (distinct from component phonology). */
+function buildBessonsCompoundPhonology() {
+  return {
+    handedness: Handedness.TWO_S,
+    dominantConfiguration: HandConfiguration.CONF_2,
+    nonDominantConfiguration: HandConfiguration.CONF_2,
+    dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
+    nonDominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
+    configurationChanges: ConfigurationChange.OPENING_AND_SPREADING,
+    location: Location.NEUTRAL_SPACE,
+    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
+    orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
+    orientationChange: OrientationChange.FLEXION,
+    contactType: ContactType.CONTINUOUS,
+    movementType: MovementType.ARC,
+    movementDirection: MovementDirection.FORWARDS,
+    vocalization: 'none',
+    nonManualComponent: 'none',
+    inicialization: 'none',
+    repeatedMovement: true,
+  };
+}
+
+/** One-handed phonology for TERCER inline morpheme in nested compound example. */
+function buildTercerInlinePhonology() {
+  return {
+    handedness: Handedness.ONE,
+    dominantConfiguration: HandConfiguration.CONF_3,
+    configurationChanges: ConfigurationChange.CLOSING,
+    location: Location.CHEST,
+    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
+    orientationRelatedToLocation: OrientationRelatedToLocation.EMPTY,
+    orientationChange: OrientationChange.EXTENSION,
+    contactType: ContactType.FINAL,
+    movementType: MovementType.STRAIGHT,
+    movementDirection: MovementDirection.DOWNWARDS,
+    vocalization: 'none',
+    nonManualComponent: 'none',
+    inicialization: 'none',
+    repeatedMovement: false,
+  };
+}
+
+/** Phonology for the full BESSONS-TRES nested compound sign. */
+function buildBessonsTresCompoundPhonology() {
+  return {
+    handedness: Handedness.TWO_S,
+    dominantConfiguration: HandConfiguration.CONF_3,
+    nonDominantConfiguration: HandConfiguration.CONF_3,
+    dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
+    nonDominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
+    configurationChanges: ConfigurationChange.OPENING_AND_SPREADING,
+    location: Location.NEUTRAL_SPACE,
+    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
+    orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
+    orientationChange: OrientationChange.FLEXION,
+    contactType: ContactType.CONTINUOUS,
+    movementType: MovementType.CIRCLE,
+    movementDirection: MovementDirection.FORWARDS,
+    vocalization: 'none',
+    nonManualComponent: 'none',
+    inicialization: 'none',
+    repeatedMovement: true,
+  };
+}
+
+/** Inline morpheme video — not a published gloss; only shown on the parent compound. */
+async function attachInlinePartVideo(
+  prisma: PrismaClient,
+  compoundPartId: string,
+  title: string,
+  videoDataId: string,
+  videoUrl: string,
+) {
+  const signVideo = await prisma.signVideo.create({
+    data: {
+      title,
+      priority: 1,
+      videoDataId,
+      videos: {
+        create: [{ url: videoUrl, angle: 'front', priority: 1 }],
+      },
+    },
+  });
+
+  await prisma.compoundPart.update({
+    where: { id: compoundPartId },
+    data: { inlineSignVideoId: signVideo.id },
+  });
+}
+
+/**
+ * Seeds BESSONS-1d compound example from Examples/bessons-1d.json:
+ * GERMÀ (linked component) + SEGON (inline morpheme) → BESSONS-1d
+ */
+export async function seedCompoundBessonsExample(prisma: PrismaClient) {
+  const germaGlossData = await prisma.glossData.create({
+    data: {
+      gloss: 'GERMÀ',
+      externalId: '0165_dona_germa',
+      definitions: {
+        create: [
+          {
+            definition: 'Germà o germana',
+            lexicalCategory: LexicalCategory.NOUN,
+            priority: 1,
+          },
+        ],
+      },
+      glossVideos: {
+        create: {
+          title: 'GERMÀ',
+          priority: 1,
+          videoData: {
+            create: buildGermaPhonology(),
+          },
+          videos: {
+            create: [
+              { url: 'videos/LSC_-_Cap.mp4', angle: 'front', priority: 1 },
+            ],
+          },
+        },
+      },
+    },
+  });
+
+  await prisma.dictionaryEntry.create({
+    data: {
+      status: GlossStatus.PUBLISHED,
+      currentVersion: 1,
+      glossDataId: germaGlossData.id,
+    },
+  });
+
+  const bessonsVariantGlossData = await prisma.glossData.create({
+    data: {
+      gloss: 'BESSONS-T_antiga',
+      definitions: {
+        create: [
+          {
+            definition: 'Variant antiga del signe de bessons',
+            lexicalCategory: LexicalCategory.ADJECTIVE,
+            priority: 1,
+          },
+        ],
+      },
+      glossVideos: {
+        create: {
+          title: 'BESSONS-T_antiga',
+          priority: 1,
+          videoData: {
+            create: buildBessonsComponentPhonology(),
+          },
+          videos: {
+            create: [
+              { url: 'videos/LSC_-_Cames.mp4', angle: 'front', priority: 1 },
+            ],
+          },
+        },
+      },
+    },
+  });
+
+  await prisma.dictionaryEntry.create({
+    data: {
+      status: GlossStatus.PUBLISHED,
+      currentVersion: 1,
+      glossDataId: bessonsVariantGlossData.id,
+    },
+  });
+
+  const segonInlinePhonology = await prisma.videoData.create({
+    data: buildBessonsComponentPhonology(),
+  });
+
+  const bessonsGlossData = await prisma.glossData.create({
+    data: {
+      gloss: 'BESSONS-1d',
+      externalId: '1420_02_bessons-1d',
+      isCompound: true,
+      iconicity: 'SÍ (2 germans)',
+      editComment: 'Semantic category (pending Category model): Família',
+      glossTranslations: {
+        create: [
+          { translation: 'TWINS', language: Language.ENGLISH },
+          { translation: 'GEMELOS', language: Language.SPANISH },
+        ],
+      },
+      definitions: {
+        create: [
+          {
+            definition: 'Nat d’un mateix part, amb un altre o altres',
+            lexicalCategory: LexicalCategory.ADJECTIVE,
+            priority: 1,
+          },
+        ],
+      },
+      compoundParts: {
+        create: [
+          {
+            position: 1,
+            gloss: 'GERMÀ',
+            compExternalId: '0165_dona_germa',
+            redundant: true,
+            linkedGlossId: germaGlossData.id,
+          },
+          {
+            position: 2,
+            gloss: 'SEGON',
+            redundant: false,
+            inlinePhonologyId: segonInlinePhonology.id,
+          },
+        ],
+      },
+      glossVideos: {
+        create: {
+          title: 'BESSONS-1d',
+          priority: 1,
+          videoData: {
+            create: buildBessonsCompoundPhonology(),
+          },
+          videos: {
+            create: [
+              { url: 'videos/LSC_-_Camell.mp4', angle: 'front', priority: 1 },
+            ],
+          },
+        },
+      },
+    },
+  });
+
+  await prisma.dictionaryEntry.create({
+    data: {
+      status: GlossStatus.PUBLISHED,
+      currentVersion: 1,
+      glossDataId: bessonsGlossData.id,
+    },
+  });
+
+  const segonPart = await prisma.compoundPart.findFirstOrThrow({
+    where: { glossDataId: bessonsGlossData.id, gloss: 'SEGON' },
+  });
+  await attachInlinePartVideo(
+    prisma,
+    segonPart.id,
+    'SEGON',
+    segonInlinePhonology.id,
+    'videos/LSC_-_Capa.mp4',
+  );
+
+  await prisma.relatedGloss.create({
+    data: {
+      relationType: RelationType.VARIANT,
+      sourceGlossId: bessonsGlossData.id,
+      targetGlossId: bessonsVariantGlossData.id,
+    },
+  });
+
+  const tercerInlinePhonology = await prisma.videoData.create({
+    data: buildTercerInlinePhonology(),
+  });
+
+  const bessonsTresGlossData = await prisma.glossData.create({
+    data: {
+      gloss: 'BESSONS-TRES',
+      externalId: '1420_03_bessons-tres',
+      isCompound: true,
+      editComment: 'Nested compound demo: BESSONS-1d (level 1) + TERCER (inline)',
+      definitions: {
+        create: [
+          {
+            definition: 'Tres persones nades del mateix part',
+            lexicalCategory: LexicalCategory.ADJECTIVE,
+            priority: 1,
+          },
+        ],
+      },
+      compoundParts: {
+        create: [
+          {
+            position: 1,
+            gloss: 'BESSONS-1d',
+            compExternalId: '1420_02_bessons-1d',
+            redundant: true,
+            linkedGlossId: bessonsGlossData.id,
+          },
+          {
+            position: 2,
+            gloss: 'TERCER',
+            redundant: false,
+            inlinePhonologyId: tercerInlinePhonology.id,
+          },
+        ],
+      },
+      glossVideos: {
+        create: {
+          title: 'BESSONS-TRES',
+          priority: 1,
+          videoData: {
+            create: buildBessonsTresCompoundPhonology(),
+          },
+          videos: {
+            create: [
+              { url: 'videos/LSC_-_Car.mp4', angle: 'front', priority: 1 },
+            ],
+          },
+        },
+      },
+    },
+  });
+
+  await prisma.dictionaryEntry.create({
+    data: {
+      status: GlossStatus.PUBLISHED,
+      currentVersion: 1,
+      glossDataId: bessonsTresGlossData.id,
+    },
+  });
+
+  const tercerPart = await prisma.compoundPart.findFirstOrThrow({
+    where: { glossDataId: bessonsTresGlossData.id, gloss: 'TERCER' },
+  });
+  await attachInlinePartVideo(
+    prisma,
+    tercerPart.id,
+    'TERCER',
+    tercerInlinePhonology.id,
+    'videos/LSC_-_Cames.mp4',
+  );
+
+  console.log(
+    'Compound seed: BESSONS-1d (GERMÀ + SEGON), BESSONS-TRES (BESSONS-1d + TERCER), GERMÀ, BESSONS-T_antiga',
+  );
+}
diff --git a/backend/src/gloss-data/dto/update-compound.dto.ts b/backend/src/gloss-data/dto/update-compound.dto.ts
new file mode 100644
index 0000000..88c9b9a
--- /dev/null
+++ b/backend/src/gloss-data/dto/update-compound.dto.ts
@@ -0,0 +1,79 @@
+import {
+  IsArray,
+  IsBoolean,
+  IsNumber,
+  IsOptional,
+  IsString,
+  ValidateNested,
+} from 'class-validator';
+import { Type } from 'class-transformer';
+import { VideoDataDto } from '../../sign-videos/dto/video-data.dto';
+
+class InlineVideoDto {
+  @IsString()
+  @IsOptional()
+  angle?: string;
+
+  @IsString()
+  @IsOptional()
+  url?: string;
+
+  @IsNumber()
+  @IsOptional()
+  priority?: number;
+}
+
+class InlineSignVideoDto {
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => InlineVideoDto)
+  videos: InlineVideoDto[];
+}
+
+export class CompoundPartInputDto {
+  @IsString()
+  @IsOptional()
+  id?: string;
+
+  @IsNumber()
+  position: number;
+
+  @IsString()
+  gloss: string;
+
+  @IsString()
+  @IsOptional()
+  compExternalId?: string;
+
+  @IsBoolean()
+  @IsOptional()
+  redundant?: boolean;
+
+  @IsString()
+  @IsOptional()
+  linkedGlossId?: string | null;
+
+  @ValidateNested()
+  @Type(() => VideoDataDto)
+  @IsOptional()
+  inlinePhonology?: VideoDataDto;
+
+  @ValidateNested()
+  @Type(() => InlineSignVideoDto)
+  @IsOptional()
+  inlineSignVideo?: InlineSignVideoDto | null;
+}
+
+export class UpdateCompoundDto {
+  @IsBoolean()
+  isCompound: boolean;
+
+  @IsString()
+  @IsOptional()
+  iconicity?: string | null;
+
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => CompoundPartInputDto)
+  parts: CompoundPartInputDto[];
+}
diff --git a/backend/src/gloss-data/gloss-data.controller.ts b/backend/src/gloss-data/gloss-data.controller.ts
index d005263..57eced4 100644
--- a/backend/src/gloss-data/gloss-data.controller.ts
+++ b/backend/src/gloss-data/gloss-data.controller.ts
@@ -1,10 +1,11 @@
-import { Controller, Get, Post, Body, Patch, Param, Delete, UseGuards } from '@nestjs/common';
+import { Controller, Get, Post, Put, Body, Patch, Param, Delete, UseGuards } from '@nestjs/common';
 import { GlossDataService } from './gloss-data.service';
 import { JwtGuard } from '../auth/guard/jwt.guard';
 import { RolesGuard } from '../auth/guard/roles.guard';
 import { Roles } from '../auth/decorator/roles.decorator';
 import { Role, Language } from '@prisma/client';
 import { UpdateDefinitionDto, UpdateDefinitionTranslationDto } from './dto/update-definition.dto';
+import { UpdateCompoundDto } from './dto/update-compound.dto';
 
 @Controller('gloss-data')
 @UseGuards(JwtGuard, RolesGuard)
@@ -251,4 +252,13 @@ export class GlossDataController {
   ) {
     return this.glossDataService.reorderVideos(signVideoId, data.videoIds);
   }
+
+  @Put(':id/compound')
+  @Roles(Role.ADMIN)
+  async updateCompound(
+    @Param('id') id: string,
+    @Body() data: UpdateCompoundDto,
+  ) {
+    return this.glossDataService.updateCompound(id, data);
+  }
 }
diff --git a/backend/src/gloss-data/gloss-data.service.ts b/backend/src/gloss-data/gloss-data.service.ts
index 8519e36..4c226cb 100644
--- a/backend/src/gloss-data/gloss-data.service.ts
+++ b/backend/src/gloss-data/gloss-data.service.ts
@@ -2,11 +2,15 @@ import { Injectable, NotFoundException, BadRequestException, ConflictException }
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { PrismaService } from '../prisma/prisma.service';
 import { UpdateDefinitionDto, UpdateDefinitionTranslationDto } from './dto/update-definition.dto';
-import { GlossStatus, Language, LexicalCategory } from '@prisma/client';
+import { GlossStatus, Handedness, Language, LexicalCategory, Prisma } from '@prisma/client';
 import { GLOSS_SEARCH_SYNC_EVENT } from '../typesense/types/gloss-index.type';
+import { compoundPartsInclude } from '../glosses/compound-include';
+import { CompoundPartInputDto, UpdateCompoundDto } from './dto/update-compound.dto';
+import { VideoDataDto } from '../sign-videos/dto/video-data.dto';
 
 const glossDataInclude = {
   dictionaryEntry: true,
+  compoundParts: compoundPartsInclude,
   glossVideos: {
     include: {
       videos: true,
@@ -718,4 +722,258 @@ export class GlossDataService {
     this.notifySearchIndex(signVideo.glossDataId);
     return this.getGlossData(signVideo.glossDataId);
   }
+
+  private buildVideoDataCreateInput(videoData: VideoDataDto): Prisma.VideoDataCreateInput {
+    return {
+      handedness: videoData.handedness || Handedness.ONE,
+      dominantConfiguration: videoData.dominantConfiguration ?? null,
+      nonDominantConfiguration: videoData.nonDominantConfiguration ?? null,
+      dominantRelationBetweenArticulators: videoData.dominantRelationBetweenArticulators ?? null,
+      nonDominantRelationBetweenArticulators: videoData.nonDominantRelationBetweenArticulators ?? null,
+      configurationChanges: videoData.configurationChanges || 'EMPTY',
+      location: videoData.location || 'EMPTY',
+      movementRelatedOrientation: videoData.movementRelatedOrientation || 'EMPTY',
+      orientationRelatedToLocation: videoData.orientationRelatedToLocation || 'EMPTY',
+      orientationChange: videoData.orientationChange || 'EMPTY',
+      contactType: videoData.contactType || 'EMPTY',
+      movementType: videoData.movementType || 'EMPTY',
+      movementDirection: videoData.movementDirection || 'EMPTY',
+      vocalization: videoData.vocalization || 'none',
+      nonManualComponent: videoData.nonManualComponent || 'none',
+      inicialization: videoData.inicialization || 'none',
+      repeatedMovement: videoData.repeatedMovement ?? false,
+    };
+  }
+
+  private async deleteCompoundPartById(partId: string) {
+    const part = await this.prisma.compoundPart.findUnique({
+      where: { id: partId },
+      include: { inlineSignVideo: true },
+    });
+    if (!part) return;
+
+    if (part.inlineSignVideoId) {
+      await this.prisma.video.deleteMany({ where: { signVideoId: part.inlineSignVideoId } });
+      await this.prisma.signVideo.delete({ where: { id: part.inlineSignVideoId } });
+    }
+
+    const phonologyId = part.inlinePhonologyId;
+    await this.prisma.compoundPart.delete({ where: { id: partId } });
+
+    if (phonologyId) {
+      await this.prisma.videoData.delete({ where: { id: phonologyId } }).catch(() => undefined);
+    }
+  }
+
+  private async upsertInlineSignVideo(
+    partId: string,
+    videoDataId: string,
+    gloss: string,
+    inlineSignVideo: CompoundPartInputDto['inlineSignVideo'],
+    existingSignVideoId?: string | null,
+  ) {
+    const videos = (inlineSignVideo?.videos ?? []).filter((video) => video.url?.trim());
+    if (!videos.length) {
+      if (existingSignVideoId) {
+        await this.prisma.video.deleteMany({ where: { signVideoId: existingSignVideoId } });
+        await this.prisma.signVideo.delete({ where: { id: existingSignVideoId } });
+        await this.prisma.compoundPart.update({
+          where: { id: partId },
+          data: { inlineSignVideoId: null },
+        });
+      }
+      return;
+    }
+
+    if (existingSignVideoId) {
+      await this.prisma.video.deleteMany({ where: { signVideoId: existingSignVideoId } });
+      await this.prisma.signVideo.update({
+        where: { id: existingSignVideoId },
+        data: {
+          title: gloss,
+          videoDataId,
+          videos: {
+            create: videos.map((video, index) => ({
+              angle: video.angle || 'front',
+              url: video.url!,
+              priority: video.priority ?? index + 1,
+            })),
+          },
+        },
+      });
+      return;
+    }
+
+    const signVideo = await this.prisma.signVideo.create({
+      data: {
+        title: gloss,
+        priority: 1,
+        videoDataId,
+        videos: {
+          create: videos.map((video, index) => ({
+            angle: video.angle || 'front',
+            url: video.url!,
+            priority: video.priority ?? index + 1,
+          })),
+        },
+      },
+    });
+
+    await this.prisma.compoundPart.update({
+      where: { id: partId },
+      data: { inlineSignVideoId: signVideo.id },
+    });
+  }
+
+  private async upsertCompoundPart(glossDataId: string, partDto: CompoundPartInputDto) {
+    const isLinked = Boolean(partDto.linkedGlossId);
+
+    if (isLinked) {
+      if (partDto.id) {
+        const existing = await this.prisma.compoundPart.findUnique({
+          where: { id: partDto.id },
+          include: { inlineSignVideo: true },
+        });
+        if (existing?.inlineSignVideoId || existing?.inlinePhonologyId) {
+          await this.deleteCompoundPartById(partDto.id);
+          return this.prisma.compoundPart.create({
+            data: {
+              glossDataId,
+              position: partDto.position,
+              gloss: partDto.gloss,
+              compExternalId: partDto.compExternalId ?? null,
+              redundant: partDto.redundant ?? false,
+              linkedGlossId: partDto.linkedGlossId,
+            },
+          });
+        }
+        return this.prisma.compoundPart.update({
+          where: { id: partDto.id },
+          data: {
+            position: partDto.position,
+            gloss: partDto.gloss,
+            compExternalId: partDto.compExternalId ?? null,
+            redundant: partDto.redundant ?? false,
+            linkedGlossId: partDto.linkedGlossId,
+            inlinePhonologyId: null,
+            inlineSignVideoId: null,
+          },
+        });
+      }
+
+      return this.prisma.compoundPart.create({
+        data: {
+          glossDataId,
+          position: partDto.position,
+          gloss: partDto.gloss,
+          compExternalId: partDto.compExternalId ?? null,
+          redundant: partDto.redundant ?? false,
+          linkedGlossId: partDto.linkedGlossId,
+        },
+      });
+    }
+
+    if (!partDto.inlinePhonology) {
+      throw new BadRequestException(`Inline compound part "${partDto.gloss}" requires phonology`);
+    }
+
+    let partId = partDto.id;
+    let phonologyId: string | undefined;
+    let existingSignVideoId: string | null | undefined;
+
+    if (partId) {
+      const existing = await this.prisma.compoundPart.findUnique({
+        where: { id: partId },
+      });
+      phonologyId = existing?.inlinePhonologyId ?? undefined;
+      existingSignVideoId = existing?.inlineSignVideoId;
+    }
+
+    if (phonologyId) {
+      await this.prisma.videoData.update({
+        where: { id: phonologyId },
+        data: this.buildVideoDataCreateInput(partDto.inlinePhonology),
+      });
+    } else {
+      const created = await this.prisma.videoData.create({
+        data: this.buildVideoDataCreateInput(partDto.inlinePhonology),
+      });
+      phonologyId = created.id;
+    }
+
+    if (partId) {
+      await this.prisma.compoundPart.update({
+        where: { id: partId },
+        data: {
+          position: partDto.position,
+          gloss: partDto.gloss,
+          compExternalId: partDto.compExternalId ?? null,
+          redundant: partDto.redundant ?? false,
+          linkedGlossId: null,
+          inlinePhonologyId: phonologyId,
+        },
+      });
+    } else {
+      const createdPart = await this.prisma.compoundPart.create({
+        data: {
+          glossDataId,
+          position: partDto.position,
+          gloss: partDto.gloss,
+          compExternalId: partDto.compExternalId ?? null,
+          redundant: partDto.redundant ?? false,
+          inlinePhonologyId: phonologyId,
+        },
+      });
+      partId = createdPart.id;
+      existingSignVideoId = null;
+    }
+
+    await this.upsertInlineSignVideo(
+      partId,
+      phonologyId,
+      partDto.gloss,
+      partDto.inlineSignVideo,
+      existingSignVideoId,
+    );
+  }
+
+  async updateCompound(glossDataId: string, dto: UpdateCompoundDto) {
+    const gloss = await this.prisma.glossData.findUnique({ where: { id: glossDataId } });
+    if (!gloss) {
+      throw new NotFoundException(`GlossData with ID ${glossDataId} not found`);
+    }
+
+    await this.prisma.glossData.update({
+      where: { id: glossDataId },
+      data: {
+        isCompound: dto.isCompound,
+        iconicity: dto.iconicity ?? null,
+      },
+    });
+
+    const existingParts = await this.prisma.compoundPart.findMany({ where: { glossDataId } });
+    const incomingIds = new Set(dto.parts.map((part) => part.id).filter(Boolean));
+
+    if (!dto.isCompound) {
+      for (const part of existingParts) {
+        await this.deleteCompoundPartById(part.id);
+      }
+      this.notifySearchIndex(glossDataId);
+      return this.getGlossData(glossDataId);
+    }
+
+    for (const part of existingParts) {
+      if (!incomingIds.has(part.id)) {
+        await this.deleteCompoundPartById(part.id);
+      }
+    }
+
+    const sortedParts = [...dto.parts].sort((a, b) => a.position - b.position);
+    for (const partDto of sortedParts) {
+      await this.upsertCompoundPart(glossDataId, partDto);
+    }
+
+    this.notifySearchIndex(glossDataId);
+    return this.getGlossData(glossDataId);
+  }
 }
diff --git a/backend/src/glosses/compound-include.ts b/backend/src/glosses/compound-include.ts
new file mode 100644
index 0000000..42c2560
--- /dev/null
+++ b/backend/src/glosses/compound-include.ts
@@ -0,0 +1,43 @@
+/** Nested compound parts for gloss detail (max ~2 levels per domain rules). */

+const glossVideosInclude = {

+  orderBy: { priority: 'asc' as const },

+  include: {

+    videoData: true,

+    videos: { orderBy: { priority: 'asc' as const } },

+  },

+};

+

+const inlineSignVideoInclude = {

+  include: {

+    videos: { orderBy: { priority: 'asc' as const } },

+    videoData: true,

+  },

+};

+

+/** Linked gloss at the innermost compound level (e.g. GERMÀ inside BESSONS-1d). */

+const nestedLinkedGlossInclude = {

+  include: {

+    glossVideos: glossVideosInclude,

+  },

+};

+

+export const compoundPartsInclude = {

+  orderBy: { position: 'asc' as const },

+  include: {

+    linkedGloss: {

+      include: {

+        glossVideos: glossVideosInclude,

+        compoundParts: {

+          orderBy: { position: 'asc' as const },

+          include: {

+            linkedGloss: nestedLinkedGlossInclude,

+            inlinePhonology: true,

+            inlineSignVideo: inlineSignVideoInclude,

+          },

+        },

+      },

+    },

+    inlinePhonology: true,

+    inlineSignVideo: inlineSignVideoInclude,

+  },

+};

diff --git a/backend/src/glosses/compound-phonology.ts b/backend/src/glosses/compound-phonology.ts
new file mode 100644
index 0000000..67bb5ed
--- /dev/null
+++ b/backend/src/glosses/compound-phonology.ts
@@ -0,0 +1,108 @@
+import { VideoData } from '@prisma/client';
+
+const MAX_COMPOUND_DEPTH = 3;
+
+export type GlossVideoForSearch = {
+  priority: number;
+  videos: { url: string; priority: number }[];
+  videoData: VideoData;
+};
+
+export type CompoundPartForSearch = {
+  position: number;
+  gloss: string;
+  inlinePhonology: VideoData | null;
+  inlineSignVideo?: GlossVideoForSearch | null;
+  linkedGloss: CompoundGlossForSearch | null;
+};
+
+export type CompoundGlossForSearch = {
+  isCompound: boolean;
+  glossVideos: GlossVideoForSearch[];
+  compoundParts?: CompoundPartForSearch[];
+};
+
+function primarySignVideoPhonology(gloss: CompoundGlossForSearch): VideoData | null {
+  const videos = [...(gloss.glossVideos ?? [])].sort((a, b) => a.priority - b.priority);
+  return videos[0]?.videoData ?? null;
+}
+
+function primarySignVideoUrl(gloss: CompoundGlossForSearch): string {
+  const videos = [...(gloss.glossVideos ?? [])].sort((a, b) => a.priority - b.priority);
+  const signVideo = videos[0];
+  if (!signVideo) return '';
+  const file = [...signVideo.videos].sort((a, b) => a.priority - b.priority)[0];
+  return file?.url ?? '';
+}
+
+function inlinePartVideoUrl(part: CompoundPartForSearch): string {
+  if (!part.inlineSignVideo) return '';
+  const file = [...part.inlineSignVideo.videos].sort((a, b) => a.priority - b.priority)[0];
+  return file?.url ?? '';
+}
+
+function resolvePartPhonology(
+  part: CompoundPartForSearch,
+  depth: number,
+): VideoData | null {
+  if (part.inlinePhonology) {
+    return part.inlinePhonology;
+  }
+  const linked = part.linkedGloss;
+  if (!linked) {
+    return null;
+  }
+  if (linked.isCompound && (linked.compoundParts?.length ?? 0) > 0) {
+    if (depth >= MAX_COMPOUND_DEPTH) {
+      return null;
+    }
+    return resolveCompoundSearchPhonology(linked, depth + 1);
+  }
+  return primarySignVideoPhonology(linked);
+}
+
+/** Phonology for search facets — own sign video first, then component phonology. */
+export function resolveCompoundSearchPhonology(
+  gloss: CompoundGlossForSearch,
+  depth = 0,
+): VideoData | null {
+  if (depth === 0) {
+    const own = primarySignVideoPhonology(gloss);
+    if (own) {
+      return own;
+    }
+  }
+
+  const parts = [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);
+  for (const part of parts) {
+    const phonology = resolvePartPhonology(part, depth);
+    if (phonology) {
+      return phonology;
+    }
+  }
+  return null;
+}
+
+/** Video URL for search thumbnails — own sign video first, then component videos. */
+export function resolveCompoundSearchVideoUrl(gloss: CompoundGlossForSearch): string {
+  const own = primarySignVideoUrl(gloss);
+  if (own) {
+    return own;
+  }
+
+  const parts = [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);
+  for (const part of parts) {
+    const inlineUrl = inlinePartVideoUrl(part);
+    if (inlineUrl) return inlineUrl;
+
+    if (part.linkedGloss) {
+      const url = primarySignVideoUrl(part.linkedGloss);
+      if (url) return url;
+      if (part.linkedGloss.isCompound) {
+        const nested = resolveCompoundSearchVideoUrl(part.linkedGloss);
+        if (nested) return nested;
+      }
+    }
+  }
+  return '';
+}
diff --git a/backend/src/glosses/glosses.service.ts b/backend/src/glosses/glosses.service.ts
index 445a55d..ceb783b 100644
--- a/backend/src/glosses/glosses.service.ts
+++ b/backend/src/glosses/glosses.service.ts
@@ -1,6 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
 import { GlossStatus } from '@prisma/client'
+import { compoundPartsInclude } from './compound-include';
 
 @Injectable()
 export class GlossesService {
@@ -22,6 +23,7 @@ export class GlossesService {
           },
         },
         glossTranslations: true,
+        compoundParts: compoundPartsInclude,
         glossVideos: {
           include: {
             videos: true,
diff --git a/backend/src/sign-videos/sign-videos.service.ts b/backend/src/sign-videos/sign-videos.service.ts
index 9a2060e..dd1a9c1 100644
--- a/backend/src/sign-videos/sign-videos.service.ts
+++ b/backend/src/sign-videos/sign-videos.service.ts
@@ -143,14 +143,26 @@ export class SignVideosService {
       });
 
       const glossDataId = signVideo.glossDataId;
-      
+
       // Delete the sign video
       await this.prisma.signVideo.delete({
         where: { id }
       });
 
-      this.notifySearchIndex(glossDataId);
-      return this.glossDataService.getGlossData(glossDataId);
+      if (glossDataId) {
+        this.notifySearchIndex(glossDataId);
+        return this.glossDataService.getGlossData(glossDataId);
+      }
+
+      const compoundPart = await this.prisma.compoundPart.findFirst({
+        where: { inlineSignVideoId: id },
+      });
+      if (compoundPart) {
+        this.notifySearchIndex(compoundPart.glossDataId);
+        return this.glossDataService.getGlossData(compoundPart.glossDataId);
+      }
+
+      throw new NotFoundException(`Sign video with ID "${id}" not found`);
     } catch (error) {
       throw new NotFoundException(`SignVideo with ID ${id} not found or could not be deleted`);
     }
diff --git a/backend/src/typesense/types/gloss-index.type.ts b/backend/src/typesense/types/gloss-index.type.ts
index ed74afb..f5e65a7 100644
--- a/backend/src/typesense/types/gloss-index.type.ts
+++ b/backend/src/typesense/types/gloss-index.type.ts
@@ -20,6 +20,7 @@ export interface GlossIndex {
   gloss: string;
   url: string;
   signVideoTitle: string;
+  isCompound?: boolean;
   lexicalCategory: LexicalCategory | string;
   lexicalCategories: (LexicalCategory | string)[];
   description: string;
diff --git a/backend/src/typesense/typesense.config.ts b/backend/src/typesense/typesense.config.ts
index 72296a0..089358f 100644
--- a/backend/src/typesense/typesense.config.ts
+++ b/backend/src/typesense/typesense.config.ts
@@ -10,6 +10,7 @@ export const videosSchema: CollectionCreateSchema = {
     { name: 'gloss', type: 'string', facet: true, sort: true },
     { name: 'url', type: 'string' },
     { name: 'signVideoTitle', type: 'string', facet: true, sort: true },
+    { name: 'isCompound', type: 'bool', facet: true, optional: true },
     { name: 'lexicalCategory', type: 'string', facet: true },
     { name: 'lexicalCategories', type: 'string[]', facet: true, optional: true },
     { name: 'description', type: 'string', facet: true },
diff --git a/backend/src/typesense/typesense.service.ts b/backend/src/typesense/typesense.service.ts
index fe3eff9..c87e904 100644
--- a/backend/src/typesense/typesense.service.ts
+++ b/backend/src/typesense/typesense.service.ts
@@ -8,6 +8,11 @@ import {
   Handedness,
   Prisma,
 } from '@prisma/client';
+import { compoundPartsInclude } from '../glosses/compound-include';
+import {
+  resolveCompoundSearchPhonology,
+  resolveCompoundSearchVideoUrl,
+} from '../glosses/compound-phonology';
 
 const glossIndexInclude = {
   definitions: {
@@ -17,6 +22,7 @@ const glossIndexInclude = {
     orderBy: { priority: 'asc' as const },
   },
   glossTranslations: true,
+  compoundParts: compoundPartsInclude,
   glossVideos: {
     include: {
       videos: { orderBy: { priority: 'asc' as const } },
@@ -126,20 +132,8 @@ export class TypesenseService implements OnModuleInit {
   }
 
   buildGlossDocument(glossData: GlossDataForIndex): GlossIndex | null {
-    if (!glossData.glossVideos.length) {
-      return null;
-    }
-
-    const primarySignVideo = glossData.glossVideos[0];
-    const primaryVideo = primarySignVideo.videos[0];
     const primaryDefinition = glossData.definitions[0];
-
-    let description = '';
-    if (primaryDefinition) {
-      description = primaryDefinition.definition;
-    }
-
-    const videoData = primarySignVideo.videoData;
+    const description = primaryDefinition?.definition ?? '';
     const lexicalCategories = [
       ...new Set(
         glossData.definitions
@@ -148,12 +142,53 @@ export class TypesenseService implements OnModuleInit {
       ),
     ];
 
+    if (glossData.isCompound && (glossData.compoundParts?.length ?? 0) > 0) {
+      const videoData = resolveCompoundSearchPhonology(glossData);
+      return {
+        id: glossData.id,
+        glossId: glossData.id,
+        gloss: glossData.gloss,
+        url: resolveCompoundSearchVideoUrl(glossData),
+        signVideoTitle: glossData.gloss,
+        isCompound: true,
+        lexicalCategory: primaryDefinition?.lexicalCategory ?? lexicalCategories[0] ?? '',
+        lexicalCategories,
+        description,
+        handedness: videoData?.handedness ?? Handedness.ONE,
+        dominantConfiguration: videoData?.dominantConfiguration ?? '',
+        nonDominantConfiguration: videoData?.nonDominantConfiguration ?? '',
+        dominantRelationBetweenArticulators: videoData?.dominantRelationBetweenArticulators ?? '',
+        nonDominantRelationBetweenArticulators: videoData?.nonDominantRelationBetweenArticulators ?? '',
+        configurationChanges: videoData?.configurationChanges ?? '',
+        location: videoData?.location ?? '',
+        movementRelatedOrientation: videoData?.movementRelatedOrientation ?? '',
+        orientationRelatedToLocation: videoData?.orientationRelatedToLocation ?? '',
+        orientationChange: videoData?.orientationChange ?? '',
+        contactType: videoData?.contactType ?? '',
+        movementType: videoData?.movementType ?? '',
+        movementDirection: videoData?.movementDirection ?? '',
+        vocalization: videoData?.vocalization ?? '',
+        nonManualComponent: videoData?.nonManualComponent ?? '',
+        inicialization: videoData?.inicialization ?? '',
+        repeatedMovement: videoData?.repeatedMovement ?? false,
+      };
+    }
+
+    if (!glossData.glossVideos.length) {
+      return null;
+    }
+
+    const primarySignVideo = glossData.glossVideos[0];
+    const primaryVideo = primarySignVideo.videos[0];
+    const videoData = primarySignVideo.videoData;
+
     return {
       id: glossData.id,
       glossId: glossData.id,
       gloss: glossData.gloss,
       url: primaryVideo?.url ?? '',
       signVideoTitle: primarySignVideo.title,
+      isCompound: false,
       lexicalCategory: primaryDefinition?.lexicalCategory ?? lexicalCategories[0] ?? '',
       lexicalCategories,
       description,
diff --git a/docs/fitxas-import-plan.md b/docs/fitxas-import-plan.md
index 821a87c..5888710 100644
--- a/docs/fitxas-import-plan.md
+++ b/docs/fitxas-import-plan.md
@@ -180,24 +180,27 @@ See [`fitxas-import-requirements.md` §5](fitxas-import-requirements.md#5-implem
 
 ### Phase 1 — Schema migration
 
-- Traceability: `externalId`, `sourceDocPath`
-- Compounds: `isCompound`, `CompoundPart[]`
+**Done (compounds only):** `isCompound`, `CompoundPart[]`, `externalId`, `iconicity` on `GlossData`; dev seed `backend/prisma/seed/compound-bessons-1d.ts` (`BESSONS-1d`). Read API: `compoundParts` on `GET /glosses/:id`.
+
+**Remaining Phase 1:**
+
+- Traceability: `sourceDocPath` ( `externalId` done)
 - Semantic categories: `Category` model + many-to-many with `GlossData`
-- Gloss metadata: `iconicity`, `valency`, `KeySignGroup[]` (key signs)
+- Gloss metadata: `valency`, `KeySignGroup[]` (key signs) — `iconicity` column exists
 - Morphology: `SimultaneousMorphology[]`, `AbbreviatedMorphology[]`, `namedEntity`
 - Definitions: make `lexicalCategory` optional on `Definition` (`LexicalCategory?`)
-- Metadata storage: corpus forms, categories, iconicity, valency, signes claus, named entity, simultaneous morphology
-- Per-hand phonology + `Handedness` enum on `VideoData`
 - Hand configuration catalog (`HandConfigurationEntry`) — migrate from closed `HandConfiguration` enum (§3.4)
 - Align frontend `RelationType` in `frontend/src/types/models.ts` with backend (add `HOMONYM`, `VARIANT`)
 
+**Deferred (import + UI):** compound resolver in `import-fitxas`; compound & morphology table in gloss detail/editor; Typesense compound phonology assembly.
+
 ### Phase 2 — Dry-run importer
 
 **Deliverables:**
 
 - TypeScript interface for schema v2 (single-entry and bundle layouts)
 - `readFitxasDir()` — load and validate JSON files
-- Mappers: definitions, translations, lexical category, phonology (per-hand), relations, compounds
+- Mappers: definitions, translations, lexical category, phonology (per-hand), relations — **compounds deferred** to dedicated import slice
 - `importFitxa()` — Prisma create with nested writes
 - `--dry-run` output: per-file summary + warnings
 - Idempotent upsert by `externalId`
diff --git a/docs/fitxas-import-requirements.md b/docs/fitxas-import-requirements.md
index f84252f..dca599a 100644
--- a/docs/fitxas-import-requirements.md
+++ b/docs/fitxas-import-requirements.md
@@ -270,7 +270,9 @@ On gloss detail (read-only): show category chips/tags.
 
 ### 2.5 Compound signs (domain model)
 
-Compounds are a **v1 database and UI requirement**. SignBank must model them explicitly; the current schema has no compound support.
+> **Implementation status (2026-06-19):** Prisma model (`isCompound`, `CompoundPart`, `inlinePhonology`) and dev seed (`BESSONS-1d` = GERMÀ + SEGON in `backend/prisma/seed/compound-bessons-1d.ts`) are in place. Import pipeline, gloss editor, compound phonology UI, and Typesense assembly are **deferred**.
+
+Compounds are a **v1 database and UI requirement**. SignBank must model them explicitly; the schema now includes compound support.
 
 #### Rules
 
@@ -858,10 +860,10 @@ The create page may stay minimal (name only) or gain an early categories/metadat
 
 | Phase | Scope |
 |-------|-------|
-| **1 — Schema** | Migration: compounds, metadata, per-hand phonology, handedness, traceability; **hand configuration catalog** (§3.4) |
-| **2 — Dry-run importer** | Schema v2 `Examples/`; no DB writes; gap report |
-| **3 — Full import** | DB writes, relation pass, optional video pipeline |
-| **4 — UI** | Gloss detail + **edit/create page rework** (§3.6): phonology table, compounds, categories, metadata |
+| **1 — Schema** | **Compounds done** (`isCompound`, `CompoundPart`, seed). Remaining: metadata, categories, per-hand catalog, traceability `sourceDocPath`; **hand configuration catalog** (§3.4) |
+| **2 — Dry-run importer** | Schema v2 `Examples/`; no DB writes; gap report — compound mapper deferred |
+| **3 — Full import** | DB writes, relation pass, optional video pipeline — includes compound resolver when scheduled |
+| **4 — UI** | Gloss detail + **edit/create page rework** (§3.6): phonology table, **compounds (deferred)**, categories, metadata |
 | **5 — Production** | Full dataset dry-run → staging import → spot-check → Typesense sync → production with backup |
 | **6 — Admin import UI** | Admin-only page: multi-file JSON upload, parse, dry-run preview, import — **complex; needs active prompting** (§3.5) |
 
@@ -909,6 +911,7 @@ See [`fitxas-import-plan.md`](fitxas-import-plan.md) for architecture, CLI flags
 | Resource | Path |
 |----------|------|
 | Implementation plan | [`fitxas-import-plan.md`](fitxas-import-plan.md) |
+| **Task checklist** | [`fitxas-import-tasks.md`](fitxas-import-tasks.md) |
 | Meeting agenda (raw notes) | [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md) |
 | ENUM mapping workflow | [`fitxas-enum-mappings.md`](fitxas-enum-mappings.md) |
 | ENUM reference | [`fitxas-import-enums-reference.md`](fitxas-import-enums-reference.md) |
diff --git a/docs/fitxas-import-tasks.md b/docs/fitxas-import-tasks.md
new file mode 100644
index 0000000..00d8c08
--- /dev/null
+++ b/docs/fitxas-import-tasks.md
@@ -0,0 +1,94 @@
+# SignBank — Fitxas import task list
+
+Short checklist of work items from planning sessions (June 2026). Full detail in [`fitxas-import-requirements.md`](fitxas-import-requirements.md).
+
+---
+
+## Documentation
+
+| Task | Description |
+|------|-------------|
+| Requirements doc | Consolidate schema v2 JSON, meeting decisions, and SignBank changes in one reference doc. |
+| Import plan sync | Slim `fitxas-import-plan.md` to point at requirements; remove outdated v1 field tables. |
+| Meeting agenda link | Point `fitxas-import-meeting-agenda.md` to the consolidated requirements outcome. |
+
+---
+
+## Database & schema
+
+| Task | Status | Description |
+|------|--------|-------------|
+| Compound signs (schema) | **Done** | `isCompound`, `CompoundPart[]`, `externalId`, `iconicity` on `GlossData`; dev seed in `backend/prisma/seed/compound-bessons-1d.ts` (`BESSONS-1d` = GERMÀ + SEGON). |
+| No compound phonology | **Done** (schema) | Compound glosses have no top-level `SignVideo`/`VideoData`; phonology on linked gloss or `CompoundPart.inlinePhonology`. |
+| Compound import resolver | Open | Map fitxa `compound.*` in `import-fitxas`; resolve `comp_id` → `linkedGlossId`; nested compound warning. |
+| Optional lexical category | Open | Make `Definition.lexicalCategory` optional; parse `Verb-` / `Nom-` prefix from each definition string. |
+| Skip top-level `lexical_category` | Open | Do not import or show fitxa root `lexical_category` (e.g. `"Nom o verb"` on MENJAR). |
+| Semantic categories | Open | `Category` model + many-to-many with `GlossData`; unique name, find-or-create on import. |
+| Iconicity (full metadata) | Partial | Column on `GlossData` exists; import + gloss detail display still open. |
+| Valency | Open | Store on `GlossData` as `valency` (fitxa `valencia` — verb transitivity, e.g. "Verb transitiu"). |
+| Key signs | `KeySignGroup[]` from `signes_claus` — ordered gloss lists + optional comment. |
+| Simultaneous morphology | `SimultaneousMorphology[]` from `morfologia_simultania`. |
+| Abbreviated morphology | `AbbreviatedMorphology[]` from `morfologia_abreujada` (meaning still to confirm with Lali). |
+| Named entity | `namedEntity` on `GlossData` from `entitat_amb_nom`. |
+| Per-hand phonology | Dominant and non-dominant configuration + articulator relations on `VideoData`. |
+| Handedness | New `Handedness` field from `nombre_mans` (`1`, `2a`, `2n`, `2s`, `x`) — distinct from `Hand` enum. |
+| Hand configuration catalog | Replace closed `HandConfiguration` enum with extensible DB catalog + aliases for fitxa labels. |
+| Traceability | Partial | `externalId` on `GlossData` exists; `sourceDocPath` and import wiring still open. |
+
+---
+
+## Import pipeline
+
+| Task | Status | Description |
+|------|--------|-------------|
+| Schema v2 support | Open | Accept single-entry JSON files and multi-entry bundles (`bessons.json`). |
+| Skip `synonyms[]` | Open | Do not import fitxa `synonyms`; relations only from `related_signs.*` → `RelatedGloss`. |
+| Skip top-level fields | Open | Ignore `synonyms`, top-level `lexical_category`, `occurrences`, `relacio_signes_forasters`. |
+| Two-pass import | Open | Pass 1: glosses + metadata; pass 2: resolve `related_signs` and `minimal_pairs` by gloss name. |
+| Enum resolver v2 | Open | Map per-hand phonology fields; integrate configuration catalog when available. |
+| Dry-run importer | Open | CLI/API report: stored vs skipped vs unmapped warnings before DB writes. |
+| Compound import | Open | Map `compound.components[]`; inline phonology; no top-level `VideoData` when `isCompound`. |
+
+---
+
+## UI — gloss detail & editor
+
+| Task | Status | Description |
+|------|--------|-------------|
+| Two-hand phonology table | Row labels on the left; **main hand** and **non-dominant hand** columns side by side; single-hand hides second column. |
+| Compound & morphology table | Open | One section: sequential compound chain + columnar phonology, simultaneous morphology, abbreviated morphology, named entity. API read includes `compoundParts` on `GET /glosses/:id` only. |
+| Key signs, iconicity, valency | Show beside definitions (not inside the compound table). |
+| Semantic categories | Searchable multi-select in editor; pick existing or create new; chips on detail view. |
+| Optional lexical category | Show category per definition when set; hide when null; no gloss-level lexical category field. |
+| Related glosses only | Use existing `RelatedGlosses` UI for all relation types; no separate synonyms field. |
+| Edit/create page rework | Extend `MoreContentComponent` stepper and related components for all new fields; compounds skip top-level phonology validation. |
+
+---
+
+## UI — admin (deferred, complex)
+
+| Task | Description |
+|------|-------------|
+| Admin fitxa import page | ADMIN-only route: upload multiple JSON files, dry-run preview, commit import, per-file error report. Needs dedicated implementation session with step-by-step prompting. |
+
+---
+
+## Still to decide
+
+| Task | Description |
+|------|-------------|
+| `morfologia_abreujada` meaning | Confirm with Lali; store and display regardless. |
+| Publication workflow | Direct publish vs draft review vs hybrid on import. |
+| Video pipeline | Google Drive download vs pre-exported local files. |
+| Configuration catalog migration | Exact schema and admin UX for adding new hand configurations. |
+| Search filter by category | Typesense facet for semantic categories (after import). |
+
+---
+
+## Related docs
+
+| Doc | Purpose |
+|-----|---------|
+| [`fitxas-import-requirements.md`](fitxas-import-requirements.md) | Full requirements |
+| [`fitxas-import-plan.md`](fitxas-import-plan.md) | Implementation phases & architecture |
+| [`fitxas-import-meeting-agenda.md`](fitxas-import-meeting-agenda.md) | Raw meeting notes |
diff --git a/frontend/src/components/GlossDetail/components/CompoundComponent.vue b/frontend/src/components/GlossDetail/components/CompoundComponent.vue
new file mode 100644
index 0000000..021013e
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/CompoundComponent.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="compound-component">
+    <div class="row items-center q-mb-md">
+      <q-badge
+        color="primary"
+        :label="translate('compound')"
+      />
+    </div>
+
+    <div class="text-subtitle2 text-weight-medium q-mb-sm">
+      {{ translate('compoundChain') }}
+    </div>
+    <div class="compound-component__chain q-mb-lg">
+      <template
+        v-for="(part, index) in parts"
+        :key="part.id ?? `${part.position}-${part.gloss}`"
+      >
+        <q-chip
+          dense
+          :color="part.linkedGlossId ? 'blue-grey-2' : 'teal-2'"
+          text-color="dark"
+        >
+          <router-link
+            v-if="part.linkedGloss?.id"
+            :to="`/gloss/${part.linkedGloss.id}`"
+            class="compound-component__link"
+          >
+            {{ part.gloss }}
+          </router-link>
+          <span v-else>{{ part.gloss }}</span>
+        </q-chip>
+        <q-icon
+          v-if="index < parts.length - 1"
+          name="add"
+          size="18px"
+          class="text-grey-6"
+        />
+      </template>
+      <q-icon
+        name="arrow_forward"
+        size="18px"
+        class="text-grey-6 q-mx-xs"
+      />
+      <strong>{{ glossData.gloss }}</strong>
+    </div>
+
+    <div class="text-subtitle2 text-weight-medium q-mb-sm">
+      {{ translate('componentVideos') }}
+    </div>
+    <div class="compound-component__videos row q-col-gutter-md q-mb-lg">
+      <div
+        v-for="(entry, index) in partVideos"
+        :key="`${entry.position}-${entry.label}-${index}`"
+        class="col-12 col-md-6"
+      >
+        <CompoundPartVideoCard :entry="entry" />
+      </div>
+    </div>
+
+    <div class="text-subtitle2 text-weight-medium q-mb-sm">
+      {{ translate('compoundParts') }}
+    </div>
+
+    <q-list
+      bordered
+      separator
+      class="rounded-borders q-mb-lg"
+    >
+      <q-item
+        v-for="part in parts"
+        :key="`detail-${part.id ?? part.position}`"
+      >
+        <q-item-section avatar>
+          <q-avatar
+            color="primary"
+            text-color="white"
+            size="32px"
+          >
+            {{ part.position }}
+          </q-avatar>
+        </q-item-section>
+        <q-item-section>
+          <q-item-label class="text-weight-medium">
+            {{ part.gloss }}
+          </q-item-label>
+          <q-item-label caption>
+            <span v-if="part.linkedGlossId">
+              {{ translate('linkedGloss') }}
+              <template v-if="part.linkedGloss?.isCompound">
+                ({{ translate('nestedCompound') }})
+              </template>
+            </span>
+            <span v-else>{{ translate('inlineMorpheme') }}</span>
+            <span v-if="part.redundant"> · {{ translate('redundantMorpheme') }}</span>
+          </q-item-label>
+        </q-item-section>
+        <q-item-section side>
+          <q-btn
+            v-if="part.linkedGloss?.id"
+            flat
+            dense
+            no-caps
+            color="primary"
+            :label="translate('viewGloss')"
+            :to="`/gloss/${part.linkedGloss.id}`"
+          />
+        </q-item-section>
+      </q-item>
+    </q-list>
+
+    <q-btn
+      unelevated
+      color="primary"
+      icon="table_chart"
+      :label="translate('viewCompoundPhonology')"
+      :disable="!hasPhonologyColumns"
+      @click="showPhonology = true"
+    />
+
+    <CompoundPhonologyDialog
+      v-model="showPhonology"
+      :gloss-data="glossData"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { GlossData } from 'src/types/models';
+import translate from 'src/utils/translate';
+import {
+  flattenCompoundPhonologyColumns,
+  resolveCompoundPartVideos,
+  sortedCompoundParts,
+} from 'src/utils/compoundPhonology';
+import CompoundPhonologyDialog from './CompoundPhonologyDialog.vue';
+import CompoundPartVideoCard from './CompoundPartVideoCard.vue';
+
+const { glossData } = defineProps<{
+  glossData: GlossData;
+}>();
+
+const showPhonology = defineModel<boolean>('showPhonology', { default: false });
+
+const parts = computed(() => sortedCompoundParts(glossData));
+
+const partVideos = computed(() => resolveCompoundPartVideos(glossData));
+
+const hasPhonologyColumns = computed(() =>
+  flattenCompoundPhonologyColumns(glossData).length > 0,
+);
+</script>
+
+<style scoped>
+.compound-component__chain {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 6px;
+}
+
+.compound-component__link {
+  color: inherit;
+  text-decoration: none;
+}
+
+.compound-component__link:hover {
+  text-decoration: underline;
+}
+
+.compound-component__videos {
+  width: 100%;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue b/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
new file mode 100644
index 0000000..d9fe5fc
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
@@ -0,0 +1,446 @@
+<template>
+  <div class="compound-editor">
+    <div class="row items-center q-mb-md q-gutter-md">
+      <q-toggle
+        v-model="isCompound"
+        :label="translate('isCompoundSign')"
+        color="primary"
+      />
+      <q-input
+        v-if="isCompound"
+        v-model="iconicity"
+        :label="translate('iconicity')"
+        outlined
+        dense
+        class="col-grow"
+        style="max-width: 360px"
+      />
+    </div>
+
+    <template v-if="isCompound">
+      <div class="row items-center justify-between q-mb-sm">
+        <div class="text-subtitle1 text-weight-medium">
+          {{ translate('compoundParts') }}
+        </div>
+        <q-btn
+          flat
+          no-caps
+          color="primary"
+          icon="add"
+          :label="translate('addCompoundPart')"
+          @click="addPart"
+        />
+      </div>
+
+      <q-banner
+        v-if="!parts.length"
+        dense
+        rounded
+        class="bg-grey-2 text-grey-8 q-mb-md"
+      >
+        {{ translate('noCompoundPartsYet') }}
+      </q-banner>
+
+      <q-list
+        bordered
+        separator
+        class="rounded-borders q-mb-md"
+      >
+        <q-expansion-item
+          v-for="(part, index) in parts"
+          :key="part.id || `new-${index}`"
+          expand-separator
+          :label="partLabel(part, index)"
+          :caption="partCaption(part)"
+          header-class="text-weight-medium"
+        >
+          <q-card flat>
+            <q-card-section class="q-gutter-md">
+              <div class="row q-col-gutter-md">
+                <div class="col-12 col-md-4">
+                  <q-input
+                    v-model="part.gloss"
+                    :label="translate('compoundPartGloss')"
+                    outlined
+                    dense
+                  />
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-select
+                    v-model="part.partKind"
+                    :options="partKindOptions"
+                    :label="translate('compoundPartType')"
+                    outlined
+                    dense
+                    emit-value
+                    map-options
+                    @update:model-value="onPartKindChange(part)"
+                  />
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-input
+                    v-model="part.compExternalId"
+                    :label="translate('compExternalId')"
+                    outlined
+                    dense
+                    clearable
+                  />
+                </div>
+              </div>
+
+              <q-toggle
+                v-model="part.redundant"
+                :label="translate('redundantMorpheme')"
+                dense
+              />
+
+              <template v-if="part.partKind === 'linked'">
+                <div class="row items-center q-gutter-sm">
+                  <q-chip
+                    v-if="part.linkedGloss?.gloss"
+                    color="blue-grey-2"
+                    text-color="dark"
+                  >
+                    {{ part.linkedGloss.gloss }}
+                  </q-chip>
+                  <span
+                    v-else
+                    class="text-grey-7 text-body2"
+                  >
+                    {{ translate('noLinkedGlossSelected') }}
+                  </span>
+                  <q-btn
+                    flat
+                    no-caps
+                    color="primary"
+                    icon="search"
+                    :label="translate('selectLinkedGloss')"
+                    @click="openGlossSearch(index)"
+                  />
+                  <q-btn
+                    v-if="part.linkedGlossId"
+                    flat
+                    no-caps
+                    color="negative"
+                    icon="link_off"
+                    :label="translate('clearLinkedGloss')"
+                    @click="clearLinkedGloss(part)"
+                  />
+                </div>
+              </template>
+
+              <template v-else>
+                <div class="text-subtitle2 text-weight-medium">
+                  {{ translate('inlineMorphemePhonology') }}
+                </div>
+                <SignFonologyComponent
+                  v-if="part.inlinePhonology"
+                  :video-data="part.inlinePhonology"
+                  :edit-mode="true"
+                  @update:video-data="(value) => updateInlinePhonology(part, value)"
+                />
+
+                <div class="text-subtitle2 text-weight-medium q-mt-md">
+                  {{ translate('inlineMorphemeVideo') }}
+                </div>
+                <q-card
+                  v-if="part.inlineSignVideo"
+                  flat
+                  bordered
+                >
+                  <GlossVideoComponent
+                    :sign-video="part.inlineSignVideo"
+                    :edit-mode="true"
+                    compact
+                    @update:sign-video="(value) => updateInlineSignVideo(part, value)"
+                  />
+                </q-card>
+              </template>
+
+              <div class="row justify-end q-gutter-sm">
+                <q-btn
+                  v-if="index > 0"
+                  flat
+                  dense
+                  icon="keyboard_arrow_up"
+                  @click="movePart(index, -1)"
+                />
+                <q-btn
+                  v-if="index < parts.length - 1"
+                  flat
+                  dense
+                  icon="keyboard_arrow_down"
+                  @click="movePart(index, 1)"
+                />
+                <q-btn
+                  flat
+                  dense
+                  color="negative"
+                  icon="delete"
+                  :label="translate('removeCompoundPart')"
+                  @click="removePart(index)"
+                />
+              </div>
+            </q-card-section>
+          </q-card>
+        </q-expansion-item>
+      </q-list>
+
+      <q-btn
+        unelevated
+        color="primary"
+        icon="table_chart"
+        :label="translate('viewCompoundPhonology')"
+        :disable="!hasPhonologyPreview"
+        class="q-mb-md"
+        @click="showPhonologyPreview = true"
+      />
+    </template>
+
+    <GlossSearch
+      v-model="showGlossSearch"
+      :title="translate('selectLinkedGloss')"
+      @select="handleLinkedGlossSelect"
+    />
+
+    <CompoundPhonologyDialog
+      v-model="showPhonologyPreview"
+      :gloss-data="previewGlossData"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+import type { GlossData, PhonologyData, SignVideo } from 'src/types/models';
+import type { SearchResult } from 'src/services/search.service';
+import translate from 'src/utils/translate';
+import api from 'src/services/api';
+import { useQuasar } from 'quasar';
+import GlossSearch from './GlossSearch.vue';
+import SignFonologyComponent from './SignFonologyComponent.vue';
+import GlossVideoComponent from './GlossVideoComponent.vue';
+import CompoundPhonologyDialog from './CompoundPhonologyDialog.vue';
+import { flattenCompoundPhonologyColumns } from 'src/utils/compoundPhonology';
+import {
+  buildCompoundUpdatePayload,
+  createEmptyEditablePart,
+  editablePartsFromGloss,
+  type EditableCompoundPart,
+} from 'src/utils/compoundEditor';
+import { createDefaultPhonology } from 'src/utils/defaultPhonology';
+
+const props = defineProps<{
+  glossData: GlossData;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:glossData', glossData: GlossData): void;
+}>();
+
+const $q = useQuasar();
+
+const isCompound = ref(Boolean(props.glossData.isCompound));
+const iconicity = ref(props.glossData.iconicity ?? '');
+const parts = ref<EditableCompoundPart[]>(editablePartsFromGloss(props.glossData));
+const showGlossSearch = ref(false);
+const glossSearchPartIndex = ref<number | null>(null);
+const showPhonologyPreview = ref(false);
+
+const partKindOptions = [
+  { label: translate('partTypeLinked'), value: 'linked' },
+  { label: translate('partTypeInline'), value: 'inline' },
+];
+
+watch(() => props.glossData, (gloss) => {
+  isCompound.value = Boolean(gloss.isCompound);
+  iconicity.value = gloss.iconicity ?? '';
+  parts.value = editablePartsFromGloss(gloss);
+}, { deep: true });
+
+const previewGlossData = computed<GlossData>(() => ({
+  ...props.glossData,
+  isCompound: isCompound.value,
+  iconicity: iconicity.value || null,
+  compoundParts: parts.value.map((part, index) => ({
+    id: part.id,
+    position: index + 1,
+    gloss: part.gloss,
+    compExternalId: part.compExternalId ?? null,
+    linkedGlossId: part.partKind === 'linked' ? part.linkedGlossId ?? null : null,
+    redundant: part.redundant ?? false,
+    linkedGloss: part.linkedGloss ?? null,
+    inlinePhonology: part.partKind === 'inline' ? part.inlinePhonology ?? null : null,
+    inlineSignVideo: part.partKind === 'inline' ? part.inlineSignVideo ?? null : null,
+  })),
+}));
+
+const hasPhonologyPreview = computed(() =>
+  flattenCompoundPhonologyColumns(previewGlossData.value).length > 0,
+);
+
+function partLabel(part: EditableCompoundPart, index: number) {
+  const name = part.gloss?.trim() || translate('compoundPartGloss');
+  return `${index + 1}. ${name}`;
+}
+
+function partCaption(part: EditableCompoundPart) {
+  return part.partKind === 'linked'
+    ? translate('partTypeLinked')
+    : translate('partTypeInline');
+}
+
+function addPart() {
+  parts.value.push(createEmptyEditablePart(parts.value.length + 1));
+}
+
+function removePart(index: number) {
+  parts.value.splice(index, 1);
+  parts.value.forEach((part, idx) => {
+    part.position = idx + 1;
+  });
+}
+
+function movePart(index: number, delta: number) {
+  const target = index + delta;
+  if (target < 0 || target >= parts.value.length) return;
+  const copy = [...parts.value];
+  const [item] = copy.splice(index, 1);
+  copy.splice(target, 0, item);
+  copy.forEach((part, idx) => {
+    part.position = idx + 1;
+  });
+  parts.value = copy;
+}
+
+function onPartKindChange(part: EditableCompoundPart) {
+  if (part.partKind === 'linked') {
+    part.inlinePhonology = null;
+    part.inlineSignVideo = null;
+    return;
+  }
+  part.linkedGlossId = null;
+  part.linkedGloss = null;
+  part.inlinePhonology = createDefaultPhonology();
+  const phonology = part.inlinePhonology;
+  part.inlineSignVideo = {
+    id: '',
+    title: part.gloss,
+    priority: 1,
+    videoDataId: phonology.id || '',
+    videos: [{
+      id: crypto.randomUUID(),
+      angle: 'front',
+      url: '',
+      priority: 1,
+    }],
+    minimalPairs: [],
+    videoData: phonology,
+  };
+}
+
+function openGlossSearch(index: number) {
+  glossSearchPartIndex.value = index;
+  showGlossSearch.value = true;
+}
+
+function handleLinkedGlossSelect(result: SearchResult) {
+  const index = glossSearchPartIndex.value;
+  if (index == null) return;
+  const part = parts.value[index];
+  if (!part) return;
+  part.linkedGlossId = result.glossId;
+  part.linkedGloss = {
+    id: result.glossId,
+    gloss: result.gloss,
+  } as GlossData;
+  if (!part.gloss?.trim()) {
+    part.gloss = result.gloss;
+  }
+}
+
+function clearLinkedGloss(part: EditableCompoundPart) {
+  part.linkedGlossId = null;
+  part.linkedGloss = null;
+}
+
+function updateInlinePhonology(part: EditableCompoundPart, value: PhonologyData) {
+  part.inlinePhonology = value;
+  if (part.inlineSignVideo) {
+    part.inlineSignVideo.videoData = value;
+    part.inlineSignVideo.videoDataId = value.id || part.inlineSignVideo.videoDataId;
+  }
+}
+
+function updateInlineSignVideo(part: EditableCompoundPart, value: SignVideo) {
+  part.inlineSignVideo = value;
+}
+
+function getStepValidationErrors(): string[] {
+  if (!isCompound.value) return [];
+
+  const errors: string[] = [];
+  if (!parts.value.length) {
+    errors.push(translate('validation.compoundPartsRequired'));
+    return errors;
+  }
+
+  parts.value.forEach((part, index) => {
+    const label = part.gloss?.trim() || `#${index + 1}`;
+    if (!part.gloss?.trim()) {
+      errors.push(translate('validation.compoundPartGlossRequired', { part: label }));
+    }
+    if (part.partKind === 'linked' && !part.linkedGlossId) {
+      errors.push(translate('validation.compoundPartLinkedRequired', { part: label }));
+    }
+    if (part.partKind === 'inline' && !part.inlinePhonology) {
+      errors.push(translate('validation.compoundPartPhonologyRequired', { part: label }));
+    }
+  });
+
+  return errors;
+}
+
+async function saveAll(silent = false): Promise<boolean> {
+  if (!props.glossData.id) return false;
+
+  const errors = getStepValidationErrors();
+  if (isCompound.value && errors.length > 0) {
+    if (!silent) {
+      $q.notify({ type: 'negative', message: errors[0] });
+    }
+    return false;
+  }
+
+  try {
+    const payload = buildCompoundUpdatePayload(
+      {
+        ...props.glossData,
+        isCompound: isCompound.value,
+        iconicity: iconicity.value || null,
+      },
+      isCompound.value ? parts.value : [],
+    );
+    const response = await api.compound.update(props.glossData.id, payload);
+    emit('update:glossData', response.data);
+    if (!silent) {
+      $q.notify({ type: 'positive', message: translate('compoundSavedSuccessfully') });
+    }
+    return true;
+  } catch (error) {
+    console.error('Error saving compound:', error);
+    if (!silent) {
+      $q.notify({ type: 'negative', message: translate('errors.failedToSaveCompound') });
+    }
+    return false;
+  }
+}
+
+defineExpose({ saveAll, getStepValidationErrors });
+</script>
+
+<style scoped>
+.compound-editor {
+  width: 100%;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue b/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
new file mode 100644
index 0000000..fd346cc
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
@@ -0,0 +1,73 @@
+<template>
+  <q-card
+    flat
+    bordered
+    class="compound-part-video"
+  >
+    <q-card-section class="q-pb-sm">
+      <div class="row items-center q-gutter-xs">
+        <q-avatar
+          color="primary"
+          text-color="white"
+          size="28px"
+        >
+          {{ entry.position }}
+        </q-avatar>
+        <span class="text-subtitle2 text-weight-medium">{{ entry.label }}</span>
+      </div>
+    </q-card-section>
+
+    <q-card-section
+      v-if="entry.signVideo"
+      class="q-pt-none"
+    >
+      <GlossVideoComponent
+        :sign-video="entry.signVideo"
+        :edit-mode="false"
+        compact
+      />
+    </q-card-section>
+
+    <q-card-section
+      v-else
+      class="q-pt-none"
+    >
+      <div class="compound-part-video__empty text-body2 text-grey-7">
+        {{
+          entry.isInlineMorpheme
+            ? translate('inlineMorphemeNoVideo')
+            : translate('noComponentVideo')
+        }}
+      </div>
+    </q-card-section>
+  </q-card>
+</template>
+
+<script setup lang="ts">
+import type { CompoundPartVideoEntry } from 'src/utils/compoundPhonology';
+import GlossVideoComponent from './GlossVideoComponent.vue';
+import translate from 'src/utils/translate';
+
+defineProps<{
+  entry: CompoundPartVideoEntry;
+}>();
+</script>
+
+<style scoped>
+.compound-part-video {
+  border-radius: var(--sb-card-radius, 12px);
+  overflow: hidden;
+  height: 100%;
+}
+
+.compound-part-video__empty {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 120px;
+  padding: 12px;
+  text-align: center;
+  background: #f5f5f5;
+  border-radius: 8px;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue b/frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue
new file mode 100644
index 0000000..faa60b3
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue
@@ -0,0 +1,90 @@
+<template>
+  <q-dialog
+    :model-value="modelValue"
+    maximized
+    @update:model-value="$emit('update:modelValue', $event)"
+  >
+    <q-card class="column">
+      <q-card-section class="row items-center q-pb-none">
+        <div class="text-h6">
+          {{ translate('compoundPhonology') }}
+        </div>
+        <q-space />
+        <q-btn
+          v-close-popup
+          flat
+          round
+          dense
+          icon="close"
+        />
+      </q-card-section>
+
+      <q-card-section class="text-body2 text-grey-8 q-pt-sm">
+        {{ chainLabel }}
+      </q-card-section>
+
+      <q-card-section
+        v-if="depthWarning"
+        class="q-pt-none"
+      >
+        <q-banner
+          dense
+          rounded
+          class="bg-warning text-dark"
+        >
+          {{ depthWarning }}
+        </q-banner>
+      </q-card-section>
+
+      <q-card-section
+        v-if="!phonologyColumns.length"
+        class="col"
+      >
+        <div class="text-grey-7">
+          {{ translate('noCompoundPhonology') }}
+        </div>
+      </q-card-section>
+
+      <q-card-section
+        v-else
+        class="col q-pt-none"
+      >
+        <CompoundPhonologyTable :columns="phonologyColumns" />
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { GlossData } from 'src/types/models';
+import translate from 'src/utils/translate';
+import {
+  buildCompoundChainLabel,
+  flattenCompoundPhonologyColumns,
+} from 'src/utils/compoundPhonology';
+import CompoundPhonologyTable from './CompoundPhonologyTable.vue';
+
+const props = defineProps<{
+  modelValue: boolean;
+  glossData: GlossData;
+}>();
+
+defineEmits<{
+  (e: 'update:modelValue', value: boolean): void;
+}>();
+
+const phonologyResult = computed(() => {
+  const warnings: string[] = [];
+  const columns = flattenCompoundPhonologyColumns(props.glossData, '', 0, warnings);
+  return { columns, warnings };
+});
+
+const phonologyColumns = computed(() => phonologyResult.value.columns);
+
+const chainLabel = computed(() => buildCompoundChainLabel(props.glossData));
+
+const depthWarning = computed(() =>
+  phonologyResult.value.warnings.length ? phonologyResult.value.warnings.join(' ') : null,
+);
+</script>
diff --git a/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue b/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
new file mode 100644
index 0000000..68fba88
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
@@ -0,0 +1,278 @@
+<template>
+  <div class="compound-phonology-table">
+    <div class="compound-phonology-table__scroll">
+      <q-markup-table
+        flat
+        bordered
+        dense
+        wrap-cells
+        class="compound-phonology-table__grid"
+      >
+        <thead>
+          <tr>
+            <th class="text-left compound-phonology-table__label-header" />
+            <th
+              v-for="(group, groupIndex) in columnGroups"
+              :key="group.key"
+              :colspan="group.slots.length"
+              class="text-center compound-phonology-table__component-header"
+              :class="{ 'compound-phonology-table__group-separator': groupIndex > 0 }"
+            >
+              {{ group.label }}
+            </th>
+          </tr>
+          <tr>
+            <th class="text-left compound-phonology-table__label-header" />
+            <th
+              v-for="slot in flatSlots"
+              :key="slot.key"
+              class="text-center compound-phonology-table__hand-header"
+              :class="{ 'compound-phonology-table__group-separator': slot.separatorBefore }"
+            >
+              {{ slot.handLabel }}
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td class="text-weight-medium">
+              {{ translate('handedness') }}
+            </td>
+            <td
+              v-for="slot in flatSlots"
+              :key="`handedness-${slot.key}`"
+              class="text-center"
+              :class="{ 'compound-phonology-table__group-separator': slot.separatorBefore }"
+            >
+              {{ formatHandedness(slot.phonology.handedness) }}
+            </td>
+          </tr>
+          <tr
+            v-for="row in phonologyRows"
+            :key="row.id"
+          >
+            <td class="text-weight-medium">
+              {{ row.label }}
+            </td>
+            <td
+              v-for="slot in flatSlots"
+              :key="`${row.id}-${slot.key}`"
+              class="text-center"
+              :class="{ 'compound-phonology-table__group-separator': slot.separatorBefore }"
+            >
+              {{ row.getValue(slot) }}
+            </td>
+          </tr>
+        </tbody>
+      </q-markup-table>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import translate from 'src/utils/translate';
+import { usePhonologyOptions, getOptionLabel } from 'src/utils/phonologyOptions';
+import { isMultiHand } from 'src/utils/phonologyHelpers';
+import type { CompoundPhonologyColumn } from 'src/utils/compoundPhonology';
+import type { PhonologyData } from 'src/types/models';
+
+const props = defineProps<{
+  columns: CompoundPhonologyColumn[];
+}>();
+
+const phonologyOptions = usePhonologyOptions();
+
+interface HandSlot {
+  key: string;
+  groupKey: string;
+  handLabel: string;
+  phonology: PhonologyData;
+  hand: 'dominant' | 'nonDominant' | 'single';
+  separatorBefore: boolean;
+}
+
+interface ColumnGroup {
+  key: string;
+  label: string;
+  slots: HandSlot[];
+}
+
+const columnGroups = computed<ColumnGroup[]>(() =>
+  props.columns.map((column, columnIndex) => {
+    const multi = isMultiHand(column.phonology.handedness);
+    const slots: HandSlot[] = multi
+      ? [
+          {
+            key: `${column.key}-main`,
+            groupKey: column.key,
+            handLabel: translate('mainHand'),
+            phonology: column.phonology,
+            hand: 'dominant',
+            separatorBefore: columnIndex > 0,
+          },
+          {
+            key: `${column.key}-non`,
+            groupKey: column.key,
+            handLabel: translate('nonDominantHand'),
+            phonology: column.phonology,
+            hand: 'nonDominant',
+            separatorBefore: false,
+          },
+        ]
+      : [{
+          key: `${column.key}-single`,
+          groupKey: column.key,
+          handLabel: translate('mainHand'),
+          phonology: column.phonology,
+          hand: 'single',
+          separatorBefore: columnIndex > 0,
+        }];
+
+    return {
+      key: column.key,
+      label: column.label,
+      slots,
+    };
+  }),
+);
+
+const flatSlots = computed(() => columnGroups.value.flatMap((g) => g.slots));
+
+type RowGetter = (slot: HandSlot) => string;
+
+const phonologyRows = computed<{ id: string; label: string; getValue: RowGetter }[]>(() => [
+  {
+    id: 'configuration',
+    label: translate('configuration'),
+    getValue: (slot) => formatPerHandEnum(
+      slot,
+      'dominantConfiguration',
+      'nonDominantConfiguration',
+      phonologyOptions.handConfigurationOptions,
+    ),
+  },
+  {
+    id: 'relation',
+    label: translate('relationBetweenArticulators'),
+    getValue: (slot) => formatPerHandEnum(
+      slot,
+      'dominantRelationBetweenArticulators',
+      'nonDominantRelationBetweenArticulators',
+      phonologyOptions.relationBetweenArticulatorsOptions,
+    ),
+  },
+  {
+    id: 'location',
+    label: translate('location'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.location, phonologyOptions.locationOptions),
+  },
+  {
+    id: 'configurationChanges',
+    label: translate('configurationChanges'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.configurationChanges, phonologyOptions.configurationChangeOptions),
+  },
+  {
+    id: 'movementRelatedOrientation',
+    label: translate('movementRelatedOrientation'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.movementRelatedOrientation, phonologyOptions.movementRelatedOrientationOptions),
+  },
+  {
+    id: 'orientationRelatedToLocation',
+    label: translate('orientationRelatedToLocation'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.orientationRelatedToLocation, phonologyOptions.orientationRelatedToLocationOptions),
+  },
+  {
+    id: 'orientationChange',
+    label: translate('orientationChange'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.orientationChange, phonologyOptions.orientationChangeOptions),
+  },
+  {
+    id: 'contactType',
+    label: translate('contactType'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.contactType, phonologyOptions.contactTypeOptions),
+  },
+  {
+    id: 'movementType',
+    label: translate('movementType'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.movementType, phonologyOptions.movementTypeOptions),
+  },
+  {
+    id: 'movementDirection',
+    label: translate('movementDirection'),
+    getValue: (slot) => formatSharedEnum(slot.phonology.movementDirection, phonologyOptions.movementDirectionOptions),
+  },
+]);
+
+function formatHandedness(handedness: string | undefined) {
+  if (!handedness) return translate('notSet');
+  return getOptionLabel(phonologyOptions.handednessOptions, handedness);
+}
+
+function formatSharedEnum(
+  value: string | null | undefined,
+  options: { value: string; label: string }[],
+) {
+  if (!value) return translate('notSet');
+  return getOptionLabel(options, value);
+}
+
+function formatPerHandEnum(
+  slot: HandSlot,
+  dominantField: keyof PhonologyData,
+  nonDominantField: keyof PhonologyData,
+  options: { value: string; label: string }[],
+) {
+  const value = slot.hand === 'nonDominant'
+    ? slot.phonology[nonDominantField]
+    : slot.phonology[dominantField];
+
+  if (value == null || value === '') return translate('notSet');
+  return getOptionLabel(options, String(value));
+}
+</script>
+
+<style scoped>
+.compound-phonology-table {
+  width: 100%;
+}
+
+.compound-phonology-table__scroll {
+  overflow-x: auto;
+  overflow-y: auto;
+  max-height: min(70vh, 640px);
+  -webkit-overflow-scrolling: touch;
+}
+
+.compound-phonology-table__grid {
+  min-width: 100%;
+  table-layout: auto;
+}
+
+.compound-phonology-table__grid :deep(thead th) {
+  position: sticky;
+  top: 0;
+  z-index: 2;
+  background: #fff;
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.12);
+  font-weight: 600;
+  font-size: 0.8rem;
+  white-space: nowrap;
+}
+
+.compound-phonology-table__component-header {
+  border-bottom: none;
+}
+
+.compound-phonology-table__label-header {
+  min-width: 140px;
+}
+
+.compound-phonology-table__hand-header {
+  min-width: 100px;
+}
+
+.compound-phonology-table__group-separator {
+  border-left: 3px solid rgba(0, 0, 0, 0.14);
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
index b71fee4..f4e3f9a 100644
--- a/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossTranslationsComponent.vue
@@ -114,6 +114,15 @@
       class="q-mt-sm"
       @click="addTranslation"
     />
+
+    <div
+      v-if="localGlossData.iconicity && !editMode"
+      class="gloss-translations__iconicity text-body2 text-grey-8"
+      :class="glossTranslations.length ? 'q-mt-md' : ''"
+    >
+      <span class="text-weight-medium">{{ translate('iconicity') }}:</span>
+      {{ localGlossData.iconicity }}
+    </div>
   </q-card-section>
 </template>
 
diff --git a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
index 461a7d2..7315c0a 100644
--- a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
@@ -93,7 +93,7 @@
         class="column justify-center no-wrap items-start full-width q-mt-md"
       >
         <q-btn
-          v-if="signVideo.videos.length > 1"
+          v-if="(signVideo.videos?.length ?? 0) > 1"
           flat
           round
           icon="delete"
@@ -121,6 +121,14 @@ import { getVideoUrl } from 'src/utils/videoUrl';
 import { api } from 'src/services/api';
 import { useQuasar } from 'quasar';
 
+function normalizeSignVideo(signVideo: SignVideo): SignVideo {
+  return {
+    ...signVideo,
+    videos: signVideo.videos ?? [],
+    minimalPairs: signVideo.minimalPairs ?? [],
+  };
+}
+
 const props = defineProps<{
   signVideo: SignVideo;
   editMode: boolean;
@@ -133,13 +141,13 @@ const emit = defineEmits<{
 
 const $q = useQuasar();
 
-const localSignVideo = ref<SignVideo>({ ...props.signVideo });
+const localSignVideo = ref<SignVideo>(normalizeSignVideo(props.signVideo));
 
 watch(() => props.signVideo, (newSignVideo) => {
-  localSignVideo.value = { ...newSignVideo };
+  localSignVideo.value = normalizeSignVideo(newSignVideo);
 }, { deep: true });
 
-const selectedVideo = ref<string>(localSignVideo.value?.videos[0]?.id || '');
+const selectedVideo = ref<string>(localSignVideo.value.videos[0]?.id || '');
 const videoRefs = new Map<string, HTMLVideoElement>();
 
 const sortedVideos = computed(() => {
diff --git a/frontend/src/components/GlossDetail/components/MainContent.vue b/frontend/src/components/GlossDetail/components/MainContent.vue
index fa4ae69..617c8a5 100644
--- a/frontend/src/components/GlossDetail/components/MainContent.vue
+++ b/frontend/src/components/GlossDetail/components/MainContent.vue
@@ -18,11 +18,16 @@
         >
           <SignVideoAside
             :gloss-data="glossData"
+            :is-compound="isCompound"
             @show-all-videos="showAllVideos = true"
+            @show-compound-phonology="openCompoundPhonology"
           />
         </div>
 
-        <div class="gloss-content-column">
+        <div
+          class="gloss-content-column"
+          :class="{ 'gloss-content-column--full': !showSidebar }"
+        >
           <q-tabs
             v-model="selectedTab"
             class="gloss-content-tabs text-primary q-mb-sm"
@@ -38,6 +43,11 @@
               name="definitions"
               :label="translate('definitions')"
             />
+            <q-tab
+              v-if="isCompound"
+              name="compound"
+              :label="translate('compound')"
+            />
             <q-tab
               name="examples"
               :label="translate('examples')"
@@ -64,7 +74,18 @@
                   :allow-edit="false"
                   hide-section-title
                   hide-definition-video
-                  hide-gloss-translations
+                  :hide-gloss-translations="!isCompound"
+                />
+              </q-tab-panel>
+
+              <q-tab-panel
+                v-if="isCompound"
+                name="compound"
+                class="q-pa-none"
+              >
+                <CompoundComponent
+                  v-model:show-phonology="showCompoundPhonology"
+                  :gloss-data="glossData"
                 />
               </q-tab-panel>
 
@@ -108,14 +129,24 @@ import SignVideosBrowseView from './SignVideosBrowseView.vue'
 import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vue'
 import ExamplesComponent from './ExamplesComponent/ExamplesComponent.vue'
 import RelatedGlosses from './RelatedGlosses.vue'
+import CompoundComponent from './CompoundComponent.vue'
 import translate from 'src/utils/translate'
+import { isCompoundGloss } from 'src/utils/compoundPhonology'
 
 const { glossData } = defineProps<{
   glossData: GlossData
 }>()
 
+const isCompound = computed(() => isCompoundGloss(glossData))
+
 const selectedTab = ref('definitions')
 const showAllVideos = ref(false)
+const showCompoundPhonology = ref(false)
+
+function openCompoundPhonology() {
+  selectedTab.value = 'compound'
+  showCompoundPhonology.value = true
+}
 
 const hasSignVideos = computed(() => (glossData.glossVideos?.length ?? 0) > 0)
 
@@ -123,7 +154,12 @@ const hasGlossTranslations = computed(() =>
   (glossData.glossTranslations?.length ?? 0) > 0
 )
 
-const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.value)
+const showSidebar = computed(() => {
+  if (isCompound.value) {
+    return hasSignVideos.value
+  }
+  return hasSignVideos.value || hasGlossTranslations.value
+})
 </script>
 
 <style scoped>
@@ -168,6 +204,10 @@ const showSidebar = computed(() => hasSignVideos.value || hasGlossTranslations.v
   overflow: hidden;
 }
 
+.gloss-content-column--full {
+  width: 100%;
+}
+
 .gloss-content-tabs {
   flex: 0 0 auto;
 }
diff --git a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
index d95472a..84eed6b 100644
--- a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
+++ b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
@@ -10,10 +10,10 @@
       class="creation-stepper"
     >
       <q-step
-        :name="1"
+        name="core"
         :title="translate('stepCore')"
         icon="description"
-        :done="step > 1"
+        :done="step !== 'core'"
       >
         <DefinitionsComponent
           ref="definitionsRef"
@@ -21,6 +21,7 @@
           :edit-mode="editMode"
           :allow-edit="editMode"
           :inline-edit="true"
+          :hide-gloss-translations="Boolean(localGlossData.isCompound)"
           @update:gloss-data="updateGlossData"
         />
 
@@ -31,16 +32,16 @@
             :label="translate('next')"
             icon-right="arrow_forward"
             :loading="stepLoading"
-            @click="goToStep(2)"
+            @click="goToStep('video')"
           />
         </q-stepper-navigation>
       </q-step>
 
       <q-step
-        :name="2"
+        name="video"
         :title="translate('stepVideo')"
         icon="videocam"
-        :done="step > 2"
+        :done="step === 'compound' || step === 'optional'"
       >
         <VideosComponent
           ref="videosRef"
@@ -57,7 +58,7 @@
             :label="translate('back')"
             icon="arrow_back"
             :disable="stepLoading"
-            @click="step = 1"
+            @click="step = 'core'"
           />
           <q-btn
             color="primary"
@@ -65,13 +66,45 @@
             :label="translate('next')"
             icon-right="arrow_forward"
             :loading="stepLoading"
-            @click="goToStep(3)"
+            @click="goToStep('compound')"
           />
         </q-stepper-navigation>
       </q-step>
 
       <q-step
-        :name="3"
+        name="compound"
+        :title="translate('stepCompound')"
+        icon="call_merge"
+        :done="step === 'optional'"
+      >
+        <CompoundEditorComponent
+          ref="compoundRef"
+          :gloss-data="localGlossData"
+          @update:gloss-data="updateGlossData"
+        />
+
+        <q-stepper-navigation class="row justify-between q-mt-md">
+          <q-btn
+            flat
+            color="primary"
+            :label="translate('back')"
+            icon="arrow_back"
+            :disable="stepLoading"
+            @click="step = 'video'"
+          />
+          <q-btn
+            color="primary"
+            unelevated
+            :label="translate('next')"
+            icon-right="arrow_forward"
+            :loading="stepLoading"
+            @click="goToStep('optional')"
+          />
+        </q-stepper-navigation>
+      </q-step>
+
+      <q-step
+        name="optional"
         :title="translate('stepOptional')"
         icon="more_horiz"
         optional
@@ -114,7 +147,7 @@
             :label="translate('back')"
             icon="arrow_back"
             :disable="stepLoading || submitting"
-            @click="step = 2"
+            @click="step = 'compound'"
           />
           <q-btn
             color="primary"
@@ -139,14 +172,18 @@ import ExamplesComponent from './ExamplesComponent/ExamplesComponent.vue';
 import VideosComponent from './VideosComponent.vue';
 import RelatedGlosses from './RelatedGlosses.vue';
 import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vue';
+import CompoundEditorComponent from './CompoundEditorComponent.vue';
 
-const $q = useQuasar()
-const step = ref(1)
-const stepLoading = ref(false)
+type EditorStep = 'core' | 'video' | 'compound' | 'optional';
 
-const definitionsRef = ref<InstanceType<typeof DefinitionsComponent> | null>(null)
-const videosRef = ref<InstanceType<typeof VideosComponent> | null>(null)
-const examplesRef = ref<InstanceType<typeof ExamplesComponent> | null>(null)
+const $q = useQuasar();
+const step = ref<EditorStep>('core');
+const stepLoading = ref(false);
+
+const definitionsRef = ref<InstanceType<typeof DefinitionsComponent> | null>(null);
+const videosRef = ref<InstanceType<typeof VideosComponent> | null>(null);
+const compoundRef = ref<InstanceType<typeof CompoundEditorComponent> | null>(null);
+const examplesRef = ref<InstanceType<typeof ExamplesComponent> | null>(null);
 
 const emit = defineEmits<{
   (e: 'update:glossData', glossData: GlossData): void
@@ -169,14 +206,14 @@ watch(() => glossData, (newGlossData) => {
 
 watch(() => editMode, (isEditing) => {
   if (isEditing) {
-    step.value = 1
+    step.value = 'core';
   }
 });
 
 const updateGlossData = (updated: GlossData) => {
   localGlossData.value = updated;
   emit('update:glossData', updated);
-}
+};
 
 function showValidationErrors(errors: string[]) {
   $q.dialog({
@@ -193,49 +230,62 @@ function showValidationErrors(errors: string[]) {
       flat: true,
       color: 'primary',
     },
-  })
+  });
 }
 
-async function goToStep(targetStep: number) {
-  stepLoading.value = true
+async function goToStep(targetStep: EditorStep) {
+  stepLoading.value = true;
   try {
-    if (targetStep === 2) {
-      const errors = definitionsRef.value?.getStepValidationErrors() ?? []
+    if (targetStep === 'video') {
+      const errors = definitionsRef.value?.getStepValidationErrors() ?? [];
       if (errors.length > 0) {
-        showValidationErrors(errors)
-        return
+        showValidationErrors(errors);
+        return;
       }
-      const saved = await definitionsRef.value?.saveAll(true)
-      if (saved === false) return
+      const saved = await definitionsRef.value?.saveAll(true);
+      if (saved === false) return;
     }
 
-    if (targetStep === 3) {
-      const errors = videosRef.value?.getStepValidationErrors() ?? []
+    if (targetStep === 'compound' || targetStep === 'optional') {
+      const errors = videosRef.value?.getStepValidationErrors() ?? [];
       if (errors.length > 0) {
-        showValidationErrors(errors)
-        return
+        showValidationErrors(errors);
+        return;
       }
-      await videosRef.value?.saveAll(true)
+      await videosRef.value?.saveAll(true);
     }
 
-    step.value = targetStep
+    if (targetStep === 'optional') {
+      const errors = compoundRef.value?.getStepValidationErrors() ?? [];
+      if (errors.length > 0) {
+        showValidationErrors(errors);
+        return;
+      }
+      const saved = await compoundRef.value?.saveAll(true);
+      if (!saved) return;
+    }
+
+    step.value = targetStep;
   } finally {
-    stepLoading.value = false
+    stepLoading.value = false;
   }
 }
 
 async function handleFinish() {
-  stepLoading.value = true
+  stepLoading.value = true;
   try {
-    await examplesRef.value?.saveAll(true)
+    const compoundSaved = await compoundRef.value?.saveAll(true);
+    if (compoundSaved === false) return;
+
+    await examplesRef.value?.saveAll(true);
 
     if (isDraft) {
-      emit('submitRequest')
+      emit('submitRequest');
     } else {
-      emit('finishEdit')
+      emit('finishEdit');
     }
   } finally {
-    stepLoading.value = false
+    stepLoading.value = false;
   }
 }
 </script>
diff --git a/frontend/src/components/GlossDetail/components/SignVideoAside.vue b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
index d195dfa..cc2e880 100644
--- a/frontend/src/components/GlossDetail/components/SignVideoAside.vue
+++ b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
@@ -20,7 +20,7 @@
       class="q-mt-sm full-width"
       :label="detailsButtonLabel"
       icon="videocam"
-      @click="emit('showAllVideos')"
+      @click="onDetailsClick"
     />
 
     <div
@@ -44,14 +44,24 @@ import GlossVideoComponent from './GlossVideoComponent.vue'
 import GlossTranslationsComponent from './GlossTranslationsComponent.vue'
 import translate from 'src/utils/translate'
 
-const { glossData } = defineProps<{
+const { glossData, isCompound = false } = defineProps<{
   glossData: GlossData
+  isCompound?: boolean
 }>()
 
 const emit = defineEmits<{
   (e: 'showAllVideos'): void
+  (e: 'showCompoundPhonology'): void
 }>()
 
+function onDetailsClick() {
+  if (isCompound && !hasMultipleSignVideos.value) {
+    emit('showCompoundPhonology')
+    return
+  }
+  emit('showAllVideos')
+}
+
 const primarySignVideo = computed(() => {
   const videos = glossData.glossVideos || []
   if (!videos.length) return null
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index a3e6db7..0ab3350 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -125,7 +125,11 @@ const translations: TranslateKeys = {
     videoUrlRequiredForAngle: 'L\'URL del vídeo és obligatòria per a l\'angle',
     videoAngleRequiredForVideo: 'L\'angle és obligatori per al vídeo',
     videoUrlRequiredForAngleAndVideo: 'L\'URL del vídeo és obligatòria per a l\'angle i el vídeo',
-    senseTranslationRequired: 'La traducció de l\'accepció és obligatòria'
+    senseTranslationRequired: 'La traducció de l\'accepció és obligatòria',
+    compoundPartsRequired: 'Cal almenys una part del compost',
+    compoundPartGlossRequired: 'El nom de la part és obligatori ({part})',
+    compoundPartLinkedRequired: 'Cal una glossa enllaçada per a la part {part}',
+    compoundPartPhonologyRequired: 'Cal fonologia per a la part en línia {part}',
   },
   senses: 'Accepcions',
   signVideos: 'Vídeos de signes',
@@ -153,6 +157,36 @@ const translations: TranslateKeys = {
   viewGloss: 'Veure glossa',
   requested: 'Sol·licitat',
   relatedGlosses: 'Glosses relacionades',
+  compound: 'Compost',
+  compoundParts: 'Parts del compost',
+  compoundChain: 'Cadena del compost',
+  compoundPhonology: 'Fonologia del compost',
+  viewCompoundPhonology: 'Veure fonologia per component',
+  linkedGloss: 'Glossa enllaçada',
+  inlineMorpheme: 'Morfema en línia',
+  redundantMorpheme: 'Morfema redundant',
+  iconicity: 'Iconicitat',
+  nestedCompound: 'Compost imbricat',
+  noCompoundPhonology: 'No hi ha dades de fonologia per als components del compost.',
+  componentVideos: 'Vídeos dels components',
+  compoundSignVideo: 'Signe compost complet',
+  noComponentVideo: 'No hi ha vídeo per a aquest component.',
+  inlineMorphemeNoVideo: 'Morfema en línia — sense vídeo independent.',
+  isCompoundSign: 'Signe compost',
+  addCompoundPart: 'Afegir part del compost',
+  removeCompoundPart: 'Eliminar part',
+  compoundPartGloss: 'Glossa del morfema',
+  compoundPartType: 'Tipus de part',
+  partTypeLinked: 'Glossa enllaçada',
+  partTypeInline: 'Morfema en línia',
+  selectLinkedGloss: 'Seleccionar glossa enllaçada',
+  clearLinkedGloss: 'Esborrar glossa enllaçada',
+  noLinkedGlossSelected: 'Cap glossa enllaçada seleccionada',
+  compExternalId: 'ID extern del component',
+  inlineMorphemePhonology: 'Fonologia del morfema en línia',
+  inlineMorphemeVideo: 'Vídeo del morfema en línia',
+  noCompoundPartsYet: 'Afegeix almenys una part del compost.',
+  compoundSavedSuccessfully: 'Configuració del compost desada',
   minimalPairs: 'Parells mínims',
   technicalTerms: 'Termes tècnics',
   relations: 'Relacions',
@@ -175,6 +209,7 @@ const translations: TranslateKeys = {
     failedToDeleteTranslation: 'No s\'ha pogut eliminar la traducció',
     failedToLoadGlossRequest: 'No s\'ha pogut carregar la sol·licitud de glossa',
     failedToSaveGloss: 'No s\'ha pogut desar la glossa',
+    failedToSaveCompound: 'No s\'ha pogut desar la configuració del compost',
     failedToSubmitRequest: 'No s\'ha pogut enviar la sol·licitud de glossa',
     failedToDeleteVideo: 'No s\'ha pogut eliminar el vídeo',
     failedToUploadVideo: 'No s\'ha pogut pujar el vídeo',
@@ -425,6 +460,7 @@ const translations: TranslateKeys = {
   signBank: 'SignBank',
   stepCore: 'Definició i traducció',
   stepVideo: 'Vídeo i fonologia',
+  stepCompound: 'Compost',
   stepOptional: 'Informació addicional',
   creationProgress: 'Progrés de la sol·licitud',
   next: 'Següent',
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index 0a4ad82..845e35e 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -134,7 +134,11 @@ const translations: TranslateKeys = {
     videoUrlRequiredForAngle: 'Video URL is required for angle',
     videoAngleRequiredForVideo: 'Video angle is required for video',
     videoUrlRequiredForAngleAndVideo: 'Video URL is required for angle and video',
-    senseTranslationRequired: 'Sense translation is required'
+    senseTranslationRequired: 'Sense translation is required',
+    compoundPartsRequired: 'At least one compound part is required',
+    compoundPartGlossRequired: 'Compound part name is required ({part})',
+    compoundPartLinkedRequired: 'Linked gloss is required for part {part}',
+    compoundPartPhonologyRequired: 'Phonology is required for inline part {part}',
   },
   senses: 'Senses',
   signVideos: 'Sign videos',
@@ -162,6 +166,36 @@ const translations: TranslateKeys = {
   viewGloss: 'View gloss',
   requested: 'Requested',
   relatedGlosses: 'Related glosses',
+  compound: 'Compound',
+  compoundParts: 'Compound parts',
+  compoundChain: 'Compound chain',
+  compoundPhonology: 'Compound phonology',
+  viewCompoundPhonology: 'View phonology by component',
+  linkedGloss: 'Linked gloss',
+  inlineMorpheme: 'Inline morpheme',
+  redundantMorpheme: 'Redundant morpheme',
+  iconicity: 'Iconicity',
+  nestedCompound: 'Nested compound',
+  noCompoundPhonology: 'No phonology data available for the compound components.',
+  componentVideos: 'Component videos',
+  compoundSignVideo: 'Full compound sign',
+  noComponentVideo: 'No video available for this component.',
+  inlineMorphemeNoVideo: 'Inline morpheme — no standalone video.',
+  isCompoundSign: 'Compound sign',
+  addCompoundPart: 'Add compound part',
+  removeCompoundPart: 'Remove part',
+  compoundPartGloss: 'Morpheme gloss',
+  compoundPartType: 'Part type',
+  partTypeLinked: 'Linked gloss',
+  partTypeInline: 'Inline morpheme',
+  selectLinkedGloss: 'Select linked gloss',
+  clearLinkedGloss: 'Clear linked gloss',
+  noLinkedGlossSelected: 'No linked gloss selected',
+  compExternalId: 'External component ID',
+  inlineMorphemePhonology: 'Inline morpheme phonology',
+  inlineMorphemeVideo: 'Inline morpheme video',
+  noCompoundPartsYet: 'Add at least one compound part.',
+  compoundSavedSuccessfully: 'Compound configuration saved',
   minimalPairs: 'Minimal pairs',
   technicalTerms: 'Technical terms',
   relations: 'Relations',
@@ -183,6 +217,7 @@ const translations: TranslateKeys = {
     failedToDeleteTranslation: 'Failed to delete translation',
     failedToLoadGlossRequest: 'Failed to load gloss request',
     failedToSaveGloss: 'Failed to save gloss',
+    failedToSaveCompound: 'Failed to save compound configuration',
     failedToSubmitRequest: 'Failed to submit request',
     failedToDeleteVideo: 'Failed to delete video',
     failedToUploadVideo: 'Failed to upload video',
@@ -342,6 +377,7 @@ const translations: TranslateKeys = {
   create: 'Create',
   stepCore: 'Definition and translation',
   stepVideo: 'Video and phonology',
+  stepCompound: 'Compound',
   stepOptional: 'Additional information',
   creationProgress: 'Progress',
   next: 'Next',
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index ed25f7d..2568573 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -121,7 +121,11 @@ const translations: TranslateKeys = {
     videoUrlRequiredForAngle: 'La URL del vídeo es requerida para el ángulo',
     videoAngleRequiredForVideo: 'El ángulo es requerido para el vídeo',
     videoUrlRequiredForAngleAndVideo: 'La URL del vídeo es requerida para el ángulo y el vídeo',
-    senseTranslationRequired: 'La traducción del sentido es requerida'
+    senseTranslationRequired: 'La traducción del sentido es requerida',
+    compoundPartsRequired: 'Se requiere al menos una parte del compuesto',
+    compoundPartGlossRequired: 'El nombre de la parte es obligatorio ({part})',
+    compoundPartLinkedRequired: 'Se requiere una glosa enlazada para la parte {part}',
+    compoundPartPhonologyRequired: 'Se requiere fonología para la parte en línea {part}',
   },
   senses: 'Sentidos',
   signVideos: 'Vídeos de signos',
@@ -148,6 +152,36 @@ const translations: TranslateKeys = {
   viewGloss: 'Ver glosa',
   requested: 'Solicitado',
   relatedGlosses: 'Glosas relacionadas',
+  compound: 'Compuesto',
+  compoundParts: 'Partes del compuesto',
+  compoundChain: 'Cadena del compuesto',
+  compoundPhonology: 'Fonología del compuesto',
+  viewCompoundPhonology: 'Ver fonología por componente',
+  linkedGloss: 'Glosa enlazada',
+  inlineMorpheme: 'Morfema en línea',
+  redundantMorpheme: 'Morfema redundante',
+  iconicity: 'Iconicidad',
+  nestedCompound: 'Compuesto anidado',
+  noCompoundPhonology: 'No hay datos de fonología para los componentes del compuesto.',
+  componentVideos: 'Vídeos de los componentes',
+  compoundSignVideo: 'Signo compuesto completo',
+  noComponentVideo: 'No hay vídeo para este componente.',
+  inlineMorphemeNoVideo: 'Morfema en línea — sin vídeo independiente.',
+  isCompoundSign: 'Signo compuesto',
+  addCompoundPart: 'Añadir parte del compuesto',
+  removeCompoundPart: 'Eliminar parte',
+  compoundPartGloss: 'Glosa del morfema',
+  compoundPartType: 'Tipo de parte',
+  partTypeLinked: 'Glosa enlazada',
+  partTypeInline: 'Morfema en línea',
+  selectLinkedGloss: 'Seleccionar glosa enlazada',
+  clearLinkedGloss: 'Borrar glosa enlazada',
+  noLinkedGlossSelected: 'Ninguna glosa enlazada seleccionada',
+  compExternalId: 'ID externo del componente',
+  inlineMorphemePhonology: 'Fonología del morfema en línea',
+  inlineMorphemeVideo: 'Vídeo del morfema en línea',
+  noCompoundPartsYet: 'Añade al menos una parte del compuesto.',
+  compoundSavedSuccessfully: 'Configuración del compuesto guardada',
   minimalPairs: 'Pares mínimos',
   technicalTerms: 'Términos técnicos',
   relations: 'Relaciones',
@@ -170,6 +204,7 @@ const translations: TranslateKeys = {
     accessDenied: 'Acceso denegado',
     failedToLoadGlossRequest: 'Error al cargar la solicitud de glosa',
     failedToSaveGloss: 'Error al guardar la glosa',
+    failedToSaveCompound: 'Error al guardar la configuración del compuesto',
     failedToSubmitRequest: 'Error al enviar la solicitud',
     failedToDeleteVideo: 'Error al eliminar el vídeo',
     failedToUploadVideo: 'Error al subir el vídeo',
@@ -357,6 +392,7 @@ const translations: TranslateKeys = {
   signBank: 'SignBank',
   stepCore: 'Definición y traducción',
   stepVideo: 'Vídeo y fonología',
+  stepCompound: 'Compuesto',
   stepOptional: 'Información adicional',
   creationProgress: 'Progreso de la solicitud',
   next: 'Siguiente',
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index 306fef1..2cf1f6d 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -605,6 +605,10 @@ interface TranslateKeys extends PhonologyTranslateKeys {
     videoAngleRequiredForVideo: string;
     videoUrlRequiredForAngleAndVideo: string;
     senseTranslationRequired: string;
+    compoundPartsRequired: string;
+    compoundPartGlossRequired: string;
+    compoundPartLinkedRequired: string;
+    compoundPartPhonologyRequired: string;
   };
   senses: string;
   signVideos: string;
@@ -636,6 +640,37 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   viewGloss: string;
   requested: string;
   relatedGlosses: string;
+  compound: string;
+  compoundParts: string;
+  compoundChain: string;
+  compoundPhonology: string;
+  viewCompoundPhonology: string;
+  linkedGloss: string;
+  inlineMorpheme: string;
+  redundantMorpheme: string;
+  iconicity: string;
+  nestedCompound: string;
+  noCompoundPhonology: string;
+  componentVideos: string;
+  compoundSignVideo: string;
+  noComponentVideo: string;
+  inlineMorphemeNoVideo: string;
+  isCompoundSign: string;
+  addCompoundPart: string;
+  removeCompoundPart: string;
+  compoundPartGloss: string;
+  compoundPartType: string;
+  partTypeLinked: string;
+  partTypeInline: string;
+  selectLinkedGloss: string;
+  clearLinkedGloss: string;
+  noLinkedGlossSelected: string;
+  compExternalId: string;
+  inlineMorphemePhonology: string;
+  inlineMorphemeVideo: string;
+  noCompoundPartsYet: string;
+  compoundSavedSuccessfully: string;
+  stepCompound: string;
   minimalPairs: string;
   technicalTerms: string;
   relations: string;
@@ -658,6 +693,7 @@ interface TranslateKeys extends PhonologyTranslateKeys {
     failedToDeleteTranslation: string;
     failedToLoadGlossRequest: string;
     failedToSaveGloss: string;
+    failedToSaveCompound: string;
     failedToSubmitRequest: string;
     failedToDeleteVideo: string;
     failedToUploadVideo: string;
diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts
index 27b8f84..83a19ee 100644
--- a/frontend/src/services/api.ts
+++ b/frontend/src/services/api.ts
@@ -28,6 +28,10 @@ export const api = {
     unarchiveGloss: (glossDataId: string) =>
       apiClient.patch<GlossData>(`/gloss-data/${glossDataId}/unarchive`),
   },
+  compound: {
+    update: (glossDataId: string, data: Record<string, unknown>) =>
+      apiClient.put<GlossData>(`/gloss-data/${glossDataId}/compound`, data),
+  },
   examples: {
     create: (glossDataId: string, data: { example: string, exampleVideoURL: string }) =>
       apiClient.post<GlossData>(`/examples/gloss/${glossDataId}`, data),
diff --git a/frontend/src/types/models.ts b/frontend/src/types/models.ts
index e23a5ff..2bc1b7b 100644
--- a/frontend/src/types/models.ts
+++ b/frontend/src/types/models.ts
@@ -116,6 +116,7 @@ export interface MinimalPairGlossData {
 export interface RelatedGlossData {
   id?: string;
   gloss: string;
+  isCompound?: boolean;
   createdAt: string;
   updatedAt: string;
   editComment: string | null;
@@ -123,6 +124,19 @@ export interface RelatedGlossData {
   isCreatedFromRequest: boolean;
   isCreatedFromEdit: boolean;
   glossVideos: SignVideo[];
+  compoundParts?: CompoundPart[];
+}
+
+export interface CompoundPart {
+  id?: string;
+  position: number;
+  gloss: string;
+  compExternalId?: string | null;
+  linkedGlossId?: string | null;
+  redundant: boolean;
+  linkedGloss?: GlossData | null;
+  inlinePhonology?: PhonologyData | null;
+  inlineSignVideo?: SignVideo | null;
 }
 
 export interface SignVideo {
@@ -130,7 +144,7 @@ export interface SignVideo {
   title: string;
   priority: number;
   videoDataId: string;
-  glossDataId: string;
+  glossDataId?: string | null;
   videos: Video[];
   minimalPairs: MinimalPair[];
   videoData: PhonologyData;
@@ -140,6 +154,9 @@ export interface SignVideo {
 export interface GlossData {
   id?: string;
   gloss: string;
+  externalId?: string | null;
+  isCompound?: boolean;
+  iconicity?: string | null;
   createdAt: string;
   updatedAt: string;
   editComment: string | null;
@@ -149,6 +166,7 @@ export interface GlossData {
   definitions: Definition[];
   examples: Example[];
   glossTranslations: GlossTranslation[];
+  compoundParts?: CompoundPart[];
   relationsAsSource: RelatedGloss[];
   relationsAsTarget: RelatedGloss[];
   minimalPairsAsSource: MinimalPair[];
diff --git a/frontend/src/utils/compoundEditor.ts b/frontend/src/utils/compoundEditor.ts
new file mode 100644
index 0000000..3183847
--- /dev/null
+++ b/frontend/src/utils/compoundEditor.ts
@@ -0,0 +1,105 @@
+import type { CompoundPart, GlossData, PhonologyData, SignVideo } from 'src/types/models';
+import { createDefaultPhonology } from './defaultPhonology';
+
+export type CompoundPartKind = 'linked' | 'inline';
+
+export interface EditableCompoundPart extends CompoundPart {
+  partKind: CompoundPartKind;
+  isNew?: boolean;
+}
+
+export function partKindFromCompoundPart(part: CompoundPart): CompoundPartKind {
+  return part.linkedGlossId ? 'linked' : 'inline';
+}
+
+export function toEditableCompoundPart(part: CompoundPart): EditableCompoundPart {
+  return {
+    ...part,
+    partKind: partKindFromCompoundPart(part),
+    inlinePhonology: part.inlinePhonology ?? (part.linkedGlossId ? null : createDefaultPhonology()),
+    inlineSignVideo: part.inlineSignVideo
+      ? {
+          ...part.inlineSignVideo,
+          videos: part.inlineSignVideo.videos ?? [],
+          minimalPairs: part.inlineSignVideo.minimalPairs ?? [],
+        }
+      : null,
+  };
+}
+
+export function editablePartsFromGloss(gloss: GlossData): EditableCompoundPart[] {
+  return [...(gloss.compoundParts ?? [])]
+    .sort((a, b) => a.position - b.position)
+    .map(toEditableCompoundPart);
+}
+
+export function createEmptyEditablePart(position: number): EditableCompoundPart {
+  const phonology = createDefaultPhonology();
+  return {
+    position,
+    gloss: '',
+    partKind: 'inline',
+    redundant: false,
+    isNew: true,
+    inlinePhonology: phonology,
+    inlineSignVideo: {
+      id: '',
+      title: '',
+      priority: 1,
+      videoDataId: phonology.id || '',
+      videos: [{
+        id: crypto.randomUUID(),
+        angle: 'front',
+        url: '',
+        priority: 1,
+      }],
+      minimalPairs: [],
+      videoData: phonology,
+    },
+  };
+}
+
+function stripPhonologyForApi(phonology: PhonologyData) {
+  const { id, ...rest } = phonology;
+  void id;
+  return rest;
+}
+
+function stripInlineSignVideoForApi(signVideo: SignVideo | null | undefined) {
+  if (!signVideo) return null;
+  const videos = (signVideo.videos ?? []).filter((video) => video.url?.trim());
+  if (!videos.length) return null;
+  return {
+    videos: videos.map((video, index) => ({
+      angle: video.angle || 'front',
+      url: video.url,
+      priority: video.priority ?? index + 1,
+    })),
+  };
+}
+
+export function buildCompoundUpdatePayload(
+  gloss: GlossData,
+  parts: EditableCompoundPart[],
+) {
+  return {
+    isCompound: Boolean(gloss.isCompound),
+    iconicity: gloss.iconicity ?? null,
+    parts: parts.map((part, index) => ({
+      id: part.id || undefined,
+      position: index + 1,
+      gloss: part.gloss.trim(),
+      compExternalId: part.compExternalId ?? null,
+      redundant: part.redundant ?? false,
+      linkedGlossId: part.partKind === 'linked' ? part.linkedGlossId ?? null : null,
+      inlinePhonology:
+        part.partKind === 'inline' && part.inlinePhonology
+          ? stripPhonologyForApi(part.inlinePhonology)
+          : undefined,
+      inlineSignVideo:
+        part.partKind === 'inline'
+          ? stripInlineSignVideoForApi(part.inlineSignVideo)
+          : null,
+    })),
+  };
+}
diff --git a/frontend/src/utils/compoundPhonology.ts b/frontend/src/utils/compoundPhonology.ts
new file mode 100644
index 0000000..6caf497
--- /dev/null
+++ b/frontend/src/utils/compoundPhonology.ts
@@ -0,0 +1,119 @@
+import type { CompoundPart, GlossData, PhonologyData, SignVideo } from 'src/types/models';

+

+export interface CompoundPhonologyColumn {

+  key: string;

+  label: string;

+  phonology: PhonologyData;

+  depth: number;

+}

+

+export interface CompoundPartVideoEntry {

+  position: number;

+  label: string;

+  signVideo: SignVideo | null;

+  isInlineMorpheme: boolean;

+}

+

+function primarySignVideo(gloss: GlossData): SignVideo | null {

+  const videos = gloss.glossVideos ?? [];

+  if (!videos.length) return null;

+  const sorted = [...videos].sort((a, b) => a.priority - b.priority);

+  return sorted[0] ?? null;

+}

+

+function primaryPhonology(gloss: GlossData): PhonologyData | null {

+  return primarySignVideo(gloss)?.videoData ?? null;

+}

+

+/** One video per direct compound part — linked glosses use their own sign video (no deeper expansion). */

+function resolvePartVideoEntry(part: CompoundPart): CompoundPartVideoEntry {

+  if (!part.linkedGlossId) {

+    return {

+      position: part.position,

+      label: part.gloss,

+      signVideo: part.inlineSignVideo ?? null,

+      isInlineMorpheme: true,

+    };

+  }

+

+  const linked = part.linkedGloss;

+  return {

+    position: part.position,

+    label: part.gloss,

+    signVideo: linked ? primarySignVideo(linked) : null,

+    isInlineMorpheme: false,

+  };

+}

+

+export function primaryCompoundSignVideo(gloss: GlossData): SignVideo | null {

+  return primarySignVideo(gloss);

+}

+

+/** One video slot per direct compound part (next level only). */

+export function resolveCompoundPartVideos(gloss: GlossData): CompoundPartVideoEntry[] {

+  return sortedCompoundParts(gloss).map(resolvePartVideoEntry);

+}

+

+function resolvePartPhonologyColumn(

+  part: CompoundPart,

+  prefix: string,

+  depth: number,

+): CompoundPhonologyColumn | null {

+  const labelPrefix = prefix ? `${prefix} / ` : '';

+

+  if (part.inlinePhonology) {

+    return {

+      key: `${prefix}-${part.position}-inline`,

+      label: `${labelPrefix}${part.gloss}`,

+      phonology: part.inlinePhonology,

+      depth,

+    };

+  }

+

+  const linked = part.linkedGloss;

+  if (!linked) {

+    return null;

+  }

+

+  const phonology = primaryPhonology(linked);

+  if (!phonology) {

+    return null;

+  }

+

+  return {

+    key: `${prefix}-${part.position}-linked-${linked.id ?? part.gloss}`,

+    label: `${labelPrefix}${part.gloss}`,

+    phonology,

+    depth,

+  };

+}

+

+export function flattenCompoundPhonologyColumns(

+  gloss: GlossData,

+  prefix = '',

+  depth = 0,

+  warnings: string[] = [],

+): CompoundPhonologyColumn[] {

+  void warnings;

+  if (!gloss.isCompound || !(gloss.compoundParts?.length)) {

+    return [];

+  }

+

+  return sortedCompoundParts(gloss)

+    .map((part) => resolvePartPhonologyColumn(part, prefix, depth))

+    .filter((column): column is CompoundPhonologyColumn => column !== null);

+}

+

+export function buildCompoundChainLabel(gloss: GlossData): string {

+  const parts = [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);

+  const morphemes = parts.map((p) => p.gloss).join(' + ');

+  return morphemes ? `${morphemes} → ${gloss.gloss}` : gloss.gloss;

+}

+

+export function sortedCompoundParts(gloss: GlossData): CompoundPart[] {

+  return [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);

+}

+

+export function isCompoundGloss(gloss: GlossData): boolean {

+  return Boolean(gloss.isCompound && (gloss.compoundParts?.length ?? 0) > 0);

+}

diff --git a/frontend/src/utils/defaultPhonology.ts b/frontend/src/utils/defaultPhonology.ts
new file mode 100644
index 0000000..5642a47
--- /dev/null
+++ b/frontend/src/utils/defaultPhonology.ts
@@ -0,0 +1,35 @@
+import type { PhonologyData } from 'src/types/models';
+import {
+  Handedness,
+  HandConfiguration,
+  ConfigurationChange,
+  RelationBetweenArticulators,
+  Location,
+  MovementRelatedOrientation,
+  OrientationRelatedToLocation,
+  OrientationChange,
+  ContactType,
+  MovementType,
+  MovementDirection,
+} from 'src/types/enums';
+
+export function createDefaultPhonology(): PhonologyData {
+  return {
+    id: crypto.randomUUID(),
+    handedness: Handedness.ONE,
+    dominantConfiguration: HandConfiguration.CONF_1,
+    configurationChanges: ConfigurationChange.EMPTY,
+    dominantRelationBetweenArticulators: RelationBetweenArticulators.EMPTY,
+    location: Location.NEUTRAL_SPACE,
+    movementRelatedOrientation: MovementRelatedOrientation.EMPTY,
+    orientationRelatedToLocation: OrientationRelatedToLocation.EMPTY,
+    orientationChange: OrientationChange.EMPTY,
+    contactType: ContactType.EMPTY,
+    movementType: MovementType.EMPTY,
+    movementDirection: MovementDirection.EMPTY,
+    repeatedMovement: false,
+    vocalization: 'none',
+    nonManualComponent: 'none',
+    inicialization: 'none',
+  };
+}
diff --git a/frontend/src/utils/glossValidation.ts b/frontend/src/utils/glossValidation.ts
index 6f6d484..602f27a 100644
--- a/frontend/src/utils/glossValidation.ts
+++ b/frontend/src/utils/glossValidation.ts
@@ -29,6 +29,25 @@ export function validateGloss(glossData: GlossData): ValidationError[] {
     });
   }
 
+  if (glossData.isCompound) {
+    if (!glossData.compoundParts?.length) {
+      errors.push({ message: translate('validation.compoundPartsRequired') });
+    } else {
+      glossData.compoundParts.forEach((part, index) => {
+        const label = part.gloss?.trim() || `#${index + 1}`;
+        if (!part.gloss?.trim()) {
+          errors.push({ message: translate('validation.compoundPartGlossRequired', { part: label }) });
+        }
+        if (part.linkedGlossId) {
+          return;
+        }
+        if (!part.inlinePhonology) {
+          errors.push({ message: translate('validation.compoundPartPhonologyRequired', { part: label }) });
+        }
+      });
+    }
+  }
+
   if (glossData.examples?.length) {
     glossData.examples.forEach((example) => {
       errors.push(...validateExample(example));

From 2830cafe0976b0ba54b5c103e6b9b4b2313c58e3 Mon Sep 17 00:00:00 2001
From: Ramon <ramondonadeucaballero@gmail.com>
Date: Fri, 19 Jun 2026 19:12:15 +0200
Subject: [PATCH 11/17] feat: general improvements

- improves on edit UI.
- footbar for next and previous on edit UI
- removed unncessecary things on compound edit
- added phonology config on compound edit
- fix some issues on compound phonology
---
 backend/prisma/seed/compound-bessons-1d.ts    |   4 -
 .../components/CompoundComponent.vue          |   1 -
 .../components/CompoundEditorComponent.vue    | 358 +++++++++++++-----
 .../components/CompoundPartVideoCard.vue      |   3 +-
 .../components/CompoundPhonologyDialog.vue    |   2 +-
 .../components/GlossVideoComponent.vue        |   5 +-
 .../components/MoreContentComponent.vue       | 196 ++++++----
 .../components/SignFonologyComponent.vue      |  13 +-
 .../components/VideosComponent.vue            |  10 +-
 .../src/components/Shared/PhonologyTable.vue  |  53 ++-
 frontend/src/i18n/ca-ES/index.ts              |   3 +
 frontend/src/i18n/en-US/index.ts              |   4 +
 frontend/src/i18n/es-ES/index.ts              |   3 +
 frontend/src/i18n/translateKeys.ts            |   3 +
 frontend/src/types/models.ts                  |   2 +-
 frontend/src/utils/compoundEditor.ts          |  92 +++--
 frontend/src/utils/compoundPhonology.ts       | 245 ++++++------
 17 files changed, 657 insertions(+), 340 deletions(-)

diff --git a/backend/prisma/seed/compound-bessons-1d.ts b/backend/prisma/seed/compound-bessons-1d.ts
index 7c7f680..306c670 100644
--- a/backend/prisma/seed/compound-bessons-1d.ts
+++ b/backend/prisma/seed/compound-bessons-1d.ts
@@ -262,13 +262,11 @@ export async function seedCompoundBessonsExample(prisma: PrismaClient) {
             position: 1,
             gloss: 'GERMÀ',
             compExternalId: '0165_dona_germa',
-            redundant: true,
             linkedGlossId: germaGlossData.id,
           },
           {
             position: 2,
             gloss: 'SEGON',
-            redundant: false,
             inlinePhonologyId: segonInlinePhonology.id,
           },
         ],
@@ -342,13 +340,11 @@ export async function seedCompoundBessonsExample(prisma: PrismaClient) {
             position: 1,
             gloss: 'BESSONS-1d',
             compExternalId: '1420_02_bessons-1d',
-            redundant: true,
             linkedGlossId: bessonsGlossData.id,
           },
           {
             position: 2,
             gloss: 'TERCER',
-            redundant: false,
             inlinePhonologyId: tercerInlinePhonology.id,
           },
         ],
diff --git a/frontend/src/components/GlossDetail/components/CompoundComponent.vue b/frontend/src/components/GlossDetail/components/CompoundComponent.vue
index 021013e..5d56da3 100644
--- a/frontend/src/components/GlossDetail/components/CompoundComponent.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundComponent.vue
@@ -91,7 +91,6 @@
               </template>
             </span>
             <span v-else>{{ translate('inlineMorpheme') }}</span>
-            <span v-if="part.redundant"> · {{ translate('redundantMorpheme') }}</span>
           </q-item-label>
         </q-item-section>
         <q-item-section side>
diff --git a/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue b/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
index d9fe5fc..acf64c8 100644
--- a/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
@@ -22,14 +22,25 @@
         <div class="text-subtitle1 text-weight-medium">
           {{ translate('compoundParts') }}
         </div>
-        <q-btn
-          flat
-          no-caps
-          color="primary"
-          icon="add"
-          :label="translate('addCompoundPart')"
-          @click="addPart"
-        />
+        <div class="row items-center q-gutter-sm">
+          <q-btn
+            v-if="parts.length > 1"
+            flat
+            no-caps
+            color="primary"
+            icon="swap_vert"
+            :label="translate('sortCompoundParts')"
+            @click="openReorderDialog"
+          />
+          <q-btn
+            flat
+            no-caps
+            color="primary"
+            icon="add"
+            :label="translate('addCompoundPart')"
+            @click="addPart"
+          />
+        </div>
       </div>
 
       <q-banner
@@ -50,14 +61,43 @@
           v-for="(part, index) in parts"
           :key="part.id || `new-${index}`"
           expand-separator
-          :label="partLabel(part, index)"
-          :caption="partCaption(part)"
           header-class="text-weight-medium"
         >
+          <template #header>
+            <q-item-section avatar>
+              <q-avatar
+                color="primary"
+                text-color="white"
+                size="32px"
+              >
+                {{ index + 1 }}
+              </q-avatar>
+            </q-item-section>
+            <q-item-section>
+              <q-item-label>{{ partLabel(part) }}</q-item-label>
+              <q-item-label caption>
+                {{ partCaption(part) }}
+              </q-item-label>
+            </q-item-section>
+            <q-item-section side>
+              <q-btn
+                flat
+                round
+                dense
+                color="negative"
+                icon="delete"
+                :aria-label="translate('removeCompoundPart')"
+                @click.stop="confirmRemovePart(index)"
+              >
+                <q-tooltip>{{ translate('removeCompoundPart') }}</q-tooltip>
+              </q-btn>
+            </q-item-section>
+          </template>
+
           <q-card flat>
             <q-card-section class="q-gutter-md">
               <div class="row q-col-gutter-md">
-                <div class="col-12 col-md-4">
+                <div class="col-12 col-md-6">
                   <q-input
                     v-model="part.gloss"
                     :label="translate('compoundPartGloss')"
@@ -65,7 +105,7 @@
                     dense
                   />
                 </div>
-                <div class="col-12 col-md-4">
+                <div class="col-12 col-md-6">
                   <q-select
                     v-model="part.partKind"
                     :options="partKindOptions"
@@ -77,23 +117,8 @@
                     @update:model-value="onPartKindChange(part)"
                   />
                 </div>
-                <div class="col-12 col-md-4">
-                  <q-input
-                    v-model="part.compExternalId"
-                    :label="translate('compExternalId')"
-                    outlined
-                    dense
-                    clearable
-                  />
-                </div>
               </div>
 
-              <q-toggle
-                v-model="part.redundant"
-                :label="translate('redundantMorpheme')"
-                dense
-              />
-
               <template v-if="part.partKind === 'linked'">
                 <div class="row items-center q-gutter-sm">
                   <q-chip
@@ -130,57 +155,41 @@
               </template>
 
               <template v-else>
-                <div class="text-subtitle2 text-weight-medium">
-                  {{ translate('inlineMorphemePhonology') }}
-                </div>
-                <SignFonologyComponent
-                  v-if="part.inlinePhonology"
-                  :video-data="part.inlinePhonology"
-                  :edit-mode="true"
-                  @update:video-data="(value) => updateInlinePhonology(part, value)"
-                />
-
-                <div class="text-subtitle2 text-weight-medium q-mt-md">
-                  {{ translate('inlineMorphemeVideo') }}
+                <div class="inline-morpheme-editor">
+                  <aside class="inline-morpheme-editor__video">
+                    <div class="text-subtitle2 text-weight-medium q-mb-sm">
+                      {{ translate('inlineMorphemeVideo') }}
+                    </div>
+                    <q-card
+                      v-if="part.inlineSignVideo"
+                      flat
+                      bordered
+                    >
+                      <GlossVideoComponent
+                        :sign-video="part.inlineSignVideo"
+                        :edit-mode="true"
+                        :compact="true"
+                        hide-angles
+                        @update:sign-video="(value) => updateInlineSignVideo(part, value)"
+                      />
+                    </q-card>
+                  </aside>
+
+                  <section
+                    v-if="part.inlinePhonology"
+                    class="inline-morpheme-editor__phonology"
+                  >
+                    <SignFonologyComponent
+                      :key="`${part.id || index}-phonology`"
+                      :video-data="part.inlinePhonology"
+                      :edit-mode="true"
+                      :compact="false"
+                      natural-height
+                      @update:video-data="(value) => updateInlinePhonology(part, value)"
+                    />
+                  </section>
                 </div>
-                <q-card
-                  v-if="part.inlineSignVideo"
-                  flat
-                  bordered
-                >
-                  <GlossVideoComponent
-                    :sign-video="part.inlineSignVideo"
-                    :edit-mode="true"
-                    compact
-                    @update:sign-video="(value) => updateInlineSignVideo(part, value)"
-                  />
-                </q-card>
               </template>
-
-              <div class="row justify-end q-gutter-sm">
-                <q-btn
-                  v-if="index > 0"
-                  flat
-                  dense
-                  icon="keyboard_arrow_up"
-                  @click="movePart(index, -1)"
-                />
-                <q-btn
-                  v-if="index < parts.length - 1"
-                  flat
-                  dense
-                  icon="keyboard_arrow_down"
-                  @click="movePart(index, 1)"
-                />
-                <q-btn
-                  flat
-                  dense
-                  color="negative"
-                  icon="delete"
-                  :label="translate('removeCompoundPart')"
-                  @click="removePart(index)"
-                />
-              </div>
             </q-card-section>
           </q-card>
         </q-expansion-item>
@@ -207,6 +216,89 @@
       v-model="showPhonologyPreview"
       :gloss-data="previewGlossData"
     />
+
+    <q-dialog v-model="showReorderDialog">
+      <q-card style="min-width: 420px; max-width: 90vw">
+        <q-card-section>
+          <div class="text-h6">
+            {{ translate('sortCompoundParts') }}
+          </div>
+          <div class="text-body2 text-grey-7 q-mt-xs">
+            {{ translate('sortCompoundPartsHint') }}
+          </div>
+        </q-card-section>
+
+        <q-card-section class="q-pt-none">
+          <q-list
+            bordered
+            separator
+            class="rounded-borders"
+          >
+            <q-item
+              v-for="(part, index) in reorderDraft"
+              :key="part.id || `reorder-${index}`"
+            >
+              <q-item-section avatar>
+                <q-avatar
+                  color="grey-3"
+                  text-color="dark"
+                  size="28px"
+                >
+                  {{ index + 1 }}
+                </q-avatar>
+              </q-item-section>
+              <q-item-section>
+                <q-item-label class="text-weight-medium">
+                  {{ part.gloss?.trim() || translate('compoundPartGloss') }}
+                </q-item-label>
+                <q-item-label caption>
+                  {{ part.partKind === 'linked' ? translate('partTypeLinked') : translate('partTypeInline') }}
+                </q-item-label>
+              </q-item-section>
+              <q-item-section side>
+                <q-btn
+                  flat
+                  round
+                  dense
+                  icon="arrow_upward"
+                  :disable="index === 0"
+                  :aria-label="translate('moveUp')"
+                  @click="movePartInDraft(index, -1)"
+                >
+                  <q-tooltip>{{ translate('moveUp') }}</q-tooltip>
+                </q-btn>
+                <q-btn
+                  flat
+                  round
+                  dense
+                  icon="arrow_downward"
+                  :disable="index === reorderDraft.length - 1"
+                  :aria-label="translate('moveDown')"
+                  @click="movePartInDraft(index, 1)"
+                >
+                  <q-tooltip>{{ translate('moveDown') }}</q-tooltip>
+                </q-btn>
+              </q-item-section>
+            </q-item>
+          </q-list>
+        </q-card-section>
+
+        <q-card-actions align="right">
+          <q-btn
+            v-close-popup
+            flat
+            :label="translate('cancel')"
+            color="primary"
+          />
+          <q-btn
+            unelevated
+            :label="translate('save')"
+            color="primary"
+            @click="applyReorder"
+          />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
   </div>
 </template>
 
@@ -226,9 +318,9 @@ import {
   buildCompoundUpdatePayload,
   createEmptyEditablePart,
   editablePartsFromGloss,
+  initializeInlineMorpheme,
   type EditableCompoundPart,
 } from 'src/utils/compoundEditor';
-import { createDefaultPhonology } from 'src/utils/defaultPhonology';
 
 const props = defineProps<{
   glossData: GlossData;
@@ -246,6 +338,8 @@ const parts = ref<EditableCompoundPart[]>(editablePartsFromGloss(props.glossData
 const showGlossSearch = ref(false);
 const glossSearchPartIndex = ref<number | null>(null);
 const showPhonologyPreview = ref(false);
+const showReorderDialog = ref(false);
+const reorderDraft = ref<EditableCompoundPart[]>([]);
 
 const partKindOptions = [
   { label: translate('partTypeLinked'), value: 'linked' },
@@ -268,7 +362,6 @@ const previewGlossData = computed<GlossData>(() => ({
     gloss: part.gloss,
     compExternalId: part.compExternalId ?? null,
     linkedGlossId: part.partKind === 'linked' ? part.linkedGlossId ?? null : null,
-    redundant: part.redundant ?? false,
     linkedGloss: part.linkedGloss ?? null,
     inlinePhonology: part.partKind === 'inline' ? part.inlinePhonology ?? null : null,
     inlineSignVideo: part.partKind === 'inline' ? part.inlineSignVideo ?? null : null,
@@ -279,9 +372,8 @@ const hasPhonologyPreview = computed(() =>
   flattenCompoundPhonologyColumns(previewGlossData.value).length > 0,
 );
 
-function partLabel(part: EditableCompoundPart, index: number) {
-  const name = part.gloss?.trim() || translate('compoundPartGloss');
-  return `${index + 1}. ${name}`;
+function partLabel(part: EditableCompoundPart) {
+  return part.gloss?.trim() || translate('compoundPartGloss');
 }
 
 function partCaption(part: EditableCompoundPart) {
@@ -301,16 +393,48 @@ function removePart(index: number) {
   });
 }
 
-function movePart(index: number, delta: number) {
+function confirmRemovePart(index: number) {
+  const part = parts.value[index];
+  const label = part?.gloss?.trim() || translate('compoundPartGloss');
+
+  $q.dialog({
+    title: translate('confirmDelete'),
+    message: translate('confirmDeleteCompoundPartMessage', { part: label }),
+    cancel: {
+      label: translate('cancel'),
+      flat: true,
+      color: 'primary',
+    },
+    ok: {
+      label: translate('removeCompoundPart'),
+      flat: true,
+      color: 'negative',
+    },
+  }).onOk(() => {
+    removePart(index);
+  });
+}
+
+function openReorderDialog() {
+  reorderDraft.value = parts.value.map((part) => ({ ...part }));
+  showReorderDialog.value = true;
+}
+
+function movePartInDraft(index: number, delta: number) {
   const target = index + delta;
-  if (target < 0 || target >= parts.value.length) return;
-  const copy = [...parts.value];
+  if (target < 0 || target >= reorderDraft.value.length) return;
+  const copy = [...reorderDraft.value];
   const [item] = copy.splice(index, 1);
   copy.splice(target, 0, item);
-  copy.forEach((part, idx) => {
+  reorderDraft.value = copy;
+}
+
+function applyReorder() {
+  reorderDraft.value.forEach((part, idx) => {
     part.position = idx + 1;
   });
-  parts.value = copy;
+  parts.value = reorderDraft.value;
+  showReorderDialog.value = false;
 }
 
 function onPartKindChange(part: EditableCompoundPart) {
@@ -321,22 +445,9 @@ function onPartKindChange(part: EditableCompoundPart) {
   }
   part.linkedGlossId = null;
   part.linkedGloss = null;
-  part.inlinePhonology = createDefaultPhonology();
-  const phonology = part.inlinePhonology;
-  part.inlineSignVideo = {
-    id: '',
-    title: part.gloss,
-    priority: 1,
-    videoDataId: phonology.id || '',
-    videos: [{
-      id: crypto.randomUUID(),
-      angle: 'front',
-      url: '',
-      priority: 1,
-    }],
-    minimalPairs: [],
-    videoData: phonology,
-  };
+  const inline = initializeInlineMorpheme(part.gloss, part.inlineSignVideo);
+  part.inlinePhonology = inline.inlinePhonology;
+  part.inlineSignVideo = inline.inlineSignVideo;
 }
 
 function openGlossSearch(index: number) {
@@ -374,6 +485,9 @@ function updateInlinePhonology(part: EditableCompoundPart, value: PhonologyData)
 
 function updateInlineSignVideo(part: EditableCompoundPart, value: SignVideo) {
   part.inlineSignVideo = value;
+  if (value.videoData) {
+    part.inlinePhonology = { ...value.videoData };
+  }
 }
 
 function getStepValidationErrors(): string[] {
@@ -443,4 +557,44 @@ defineExpose({ saveAll, getStepValidationErrors });
 .compound-editor {
   width: 100%;
 }
+
+.inline-morpheme-editor {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  gap: 16px;
+}
+
+.inline-morpheme-editor__video {
+  flex: 0 0 34%;
+  max-width: 380px;
+  min-width: 0;
+}
+
+.inline-morpheme-editor__phonology {
+  flex: 1 1 auto;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: var(--sb-card-radius, 12px);
+  padding: 16px 20px;
+  background: #fff;
+}
+
+.inline-morpheme-editor__phonology :deep(.sign-phonology) {
+  margin-top: 0;
+}
+
+@media (max-width: 1023px) {
+  .inline-morpheme-editor {
+    flex-direction: column;
+  }
+
+  .inline-morpheme-editor__video {
+    flex: 0 0 auto;
+    max-width: none;
+    width: 100%;
+  }
+}
 </style>
diff --git a/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue b/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
index fd346cc..636bbf8 100644
--- a/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
@@ -24,7 +24,8 @@
       <GlossVideoComponent
         :sign-video="entry.signVideo"
         :edit-mode="false"
-        compact
+        :compact="true"
+        :hide-angles="entry.isInlineMorpheme"
       />
     </q-card-section>
 
diff --git a/frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue b/frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue
index faa60b3..2511e36 100644
--- a/frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundPhonologyDialog.vue
@@ -76,7 +76,7 @@ defineEmits<{
 
 const phonologyResult = computed(() => {
   const warnings: string[] = [];
-  const columns = flattenCompoundPhonologyColumns(props.glossData, '', 0, warnings);
+  const columns = flattenCompoundPhonologyColumns(props.glossData, 0, warnings);
   return { columns, warnings };
 });
 
diff --git a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
index 7315c0a..d2f4cdf 100644
--- a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
@@ -31,7 +31,7 @@
     </div>
 
     <div
-      v-if="editMode || sortedVideos.length > 1"
+      v-if="!hideAngles && (editMode || sortedVideos.length > 1)"
       class="column col justify-start items-start q-mt-sm"
     >
       <div class="row justify-between items-center full-width">
@@ -133,6 +133,8 @@ const props = defineProps<{
   signVideo: SignVideo;
   editMode: boolean;
   compact?: boolean;
+  /** Single front video only — no angle picker (inline compound morphemes). */
+  hideAngles?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -145,6 +147,7 @@ const localSignVideo = ref<SignVideo>(normalizeSignVideo(props.signVideo));
 
 watch(() => props.signVideo, (newSignVideo) => {
   localSignVideo.value = normalizeSignVideo(newSignVideo);
+  selectedVideo.value = localSignVideo.value.videos[0]?.id || '';
 }, { deep: true });
 
 const selectedVideo = ref<string>(localSignVideo.value.videos[0]?.id || '');
diff --git a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
index 84eed6b..5efe9d3 100644
--- a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
+++ b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
@@ -1,7 +1,9 @@
 <template>
-  <div>
+  <div
+    v-if="editMode"
+    class="creation-stepper-shell"
+  >
     <q-stepper
-      v-if="editMode"
       v-model="step"
       color="primary"
       animated
@@ -24,17 +26,6 @@
           :hide-gloss-translations="Boolean(localGlossData.isCompound)"
           @update:gloss-data="updateGlossData"
         />
-
-        <q-stepper-navigation class="row justify-end q-mt-md">
-          <q-btn
-            color="primary"
-            unelevated
-            :label="translate('next')"
-            icon-right="arrow_forward"
-            :loading="stepLoading"
-            @click="goToStep('video')"
-          />
-        </q-stepper-navigation>
       </q-step>
 
       <q-step
@@ -50,25 +41,6 @@
           :inline-edit="true"
           @update:gloss-data="updateGlossData"
         />
-
-        <q-stepper-navigation class="row justify-between q-mt-md">
-          <q-btn
-            flat
-            color="primary"
-            :label="translate('back')"
-            icon="arrow_back"
-            :disable="stepLoading"
-            @click="step = 'core'"
-          />
-          <q-btn
-            color="primary"
-            unelevated
-            :label="translate('next')"
-            icon-right="arrow_forward"
-            :loading="stepLoading"
-            @click="goToStep('compound')"
-          />
-        </q-stepper-navigation>
       </q-step>
 
       <q-step
@@ -82,25 +54,6 @@
           :gloss-data="localGlossData"
           @update:gloss-data="updateGlossData"
         />
-
-        <q-stepper-navigation class="row justify-between q-mt-md">
-          <q-btn
-            flat
-            color="primary"
-            :label="translate('back')"
-            icon="arrow_back"
-            :disable="stepLoading"
-            @click="step = 'video'"
-          />
-          <q-btn
-            color="primary"
-            unelevated
-            :label="translate('next')"
-            icon-right="arrow_forward"
-            :loading="stepLoading"
-            @click="goToStep('optional')"
-          />
-        </q-stepper-navigation>
       </q-step>
 
       <q-step
@@ -139,27 +92,46 @@
             @update:gloss-data="updateGlossData"
           />
         </q-expansion-item>
-
-        <q-stepper-navigation class="row justify-between q-mt-md">
-          <q-btn
-            flat
-            color="primary"
-            :label="translate('back')"
-            icon="arrow_back"
-            :disable="stepLoading || submitting"
-            @click="step = 'compound'"
-          />
-          <q-btn
-            color="primary"
-            unelevated
-            :icon="isDraft ? 'send' : 'check'"
-            :label="isDraft ? translate('sendRequest') : translate('save')"
-            :loading="stepLoading || submitting"
-            @click="handleFinish"
-          />
-        </q-stepper-navigation>
       </q-step>
     </q-stepper>
+
+    <Teleport to="body">
+      <footer class="creation-stepper-footer">
+        <div class="creation-stepper-footer__inner">
+          <div class="creation-stepper-footer__side creation-stepper-footer__side--start">
+            <q-btn
+              v-if="step !== 'core'"
+              flat
+              color="primary"
+              :label="translate('back')"
+              icon="arrow_back"
+              :disable="stepLoading || submitting"
+              @click="goBack"
+            />
+          </div>
+          <div class="creation-stepper-footer__side creation-stepper-footer__side--end">
+            <q-btn
+              v-if="step !== 'optional'"
+              color="primary"
+              unelevated
+              :label="translate('next')"
+              icon-right="arrow_forward"
+              :loading="stepLoading"
+              @click="goNext"
+            />
+            <q-btn
+              v-else
+              color="primary"
+              unelevated
+              :icon="isDraft ? 'send' : 'check'"
+              :label="isDraft ? translate('sendRequest') : translate('save')"
+              :loading="stepLoading || submitting"
+              @click="handleFinish"
+            />
+          </div>
+        </div>
+      </footer>
+    </Teleport>
   </div>
 </template>
 
@@ -233,6 +205,27 @@ function showValidationErrors(errors: string[]) {
   });
 }
 
+const previousStep: Record<EditorStep, EditorStep | null> = {
+  core: null,
+  video: 'core',
+  compound: 'video',
+  optional: 'compound',
+};
+
+const nextStep: Record<EditorStep, EditorStep | null> = {
+  core: 'video',
+  video: 'compound',
+  compound: 'optional',
+  optional: null,
+};
+
+function goBack() {
+  const target = previousStep[step.value];
+  if (target) {
+    step.value = target;
+  }
+}
+
 async function goToStep(targetStep: EditorStep) {
   stepLoading.value = true;
   try {
@@ -271,6 +264,13 @@ async function goToStep(targetStep: EditorStep) {
   }
 }
 
+async function goNext() {
+  const target = nextStep[step.value];
+  if (target) {
+    await goToStep(target);
+  }
+}
+
 async function handleFinish() {
   stepLoading.value = true;
   try {
@@ -291,8 +291,64 @@ async function handleFinish() {
 </script>
 
 <style scoped>
+.creation-stepper-shell {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  padding-bottom: 72px;
+}
+
 .creation-stepper {
   border-radius: var(--sb-card-radius, 12px);
   background: white;
+  flex: 1 1 auto;
+}
+</style>
+
+<style>
+.creation-stepper-footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 2000;
+  display: flex;
+  justify-content: center;
+  padding: 0 16px;
+  pointer-events: none;
+}
+
+.creation-stepper-footer__inner {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+  width: 100%;
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 12px 16px;
+  box-sizing: border-box;
+  pointer-events: auto;
+  background: #fff;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-bottom: none;
+  border-radius: var(--sb-card-radius, 12px) var(--sb-card-radius, 12px) 0 0;
+  box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.08);
+}
+
+.creation-stepper-footer__side {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+}
+
+.creation-stepper-footer__side--start {
+  justify-content: flex-start;
+  flex: 1 1 0;
+}
+
+.creation-stepper-footer__side--end {
+  justify-content: flex-end;
+  flex: 1 1 0;
 }
 </style>
diff --git a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
index 0134aef..a07a5d0 100644
--- a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
+++ b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="sign-phonology">
+  <div
+    class="sign-phonology"
+    :class="{ 'sign-phonology--natural-height': naturalHeight }"
+  >
     <div class="text-subtitle2 text-weight-medium sign-phonology__title">
       {{ translate('signFonology') }}
     </div>
@@ -7,6 +10,7 @@
       :phonology-data="videoData"
       :is-editable="editMode"
       :compact="compact ?? false"
+      :natural-height="naturalHeight ?? false"
       @update:phonology-data="$emit('update:video-data', $event)"
     />
   </div>
@@ -21,6 +25,7 @@ defineProps<{
   videoData: PhonologyData;
   editMode: boolean;
   compact?: boolean;
+  naturalHeight?: boolean;
 }>();
 
 defineEmits<{
@@ -41,4 +46,10 @@ defineEmits<{
   flex: 0 0 auto;
   margin-bottom: 8px;
 }
+
+.sign-phonology--natural-height {
+  min-height: auto;
+  flex: 0 0 auto;
+  height: auto;
+}
 </style>
diff --git a/frontend/src/components/GlossDetail/components/VideosComponent.vue b/frontend/src/components/GlossDetail/components/VideosComponent.vue
index 6a5abe3..51ee02d 100644
--- a/frontend/src/components/GlossDetail/components/VideosComponent.vue
+++ b/frontend/src/components/GlossDetail/components/VideosComponent.vue
@@ -118,6 +118,7 @@
           :video-data="selectedVideo.videoData"
           :edit-mode="true"
           :compact="false"
+          natural-height
           @update:video-data="updateSelectedVideoData"
         />
       </section>
@@ -615,8 +616,7 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
 .videos-editor {
   display: flex;
   gap: 20px;
-  min-height: 420px;
-  align-items: stretch;
+  align-items: flex-start;
 }
 
 .videos-editor__videos {
@@ -680,16 +680,14 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
 }
 
 .videos-editor__phonology {
-  flex: 1 1 0;
+  flex: 1 1 auto;
   min-width: 0;
-  min-height: 0;
   display: flex;
   flex-direction: column;
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: var(--sb-card-radius, 12px);
   padding: 16px 20px;
   background: #fff;
-  overflow: hidden;
 }
 
 .videos-editor__phonology-toolbar {
@@ -697,8 +695,6 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
 }
 
 .videos-editor__phonology :deep(.sign-phonology) {
-  flex: 1 1 0;
-  min-height: 0;
   margin-top: 0;
 }
 
diff --git a/frontend/src/components/Shared/PhonologyTable.vue b/frontend/src/components/Shared/PhonologyTable.vue
index 56bb07a..0882fea 100644
--- a/frontend/src/components/Shared/PhonologyTable.vue
+++ b/frontend/src/components/Shared/PhonologyTable.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="phonology-table">
+  <div
+    class="phonology-table"
+    :class="{ 'phonology-table--natural-height': naturalHeight }"
+  >
     <div class="phonology-table__handedness q-mb-md">
       <div class="text-caption text-grey-7 q-mb-xs">
         {{ translate('handedness') }}
@@ -16,19 +19,32 @@
         </span>
         <span v-else>{{ translate('notSet') }}</span>
       </div>
-      <q-btn-toggle
+      <q-select
         v-else
         v-model="localData.handedness"
         :options="phonologyOptions.handednessOptions"
-        spread
-        no-caps
-        unelevated
-        toggle-color="primary"
-        color="grey-3"
-        text-color="grey-8"
-        class="full-width"
+        outlined
+        dense
+        emit-value
+        map-options
+        options-dense
+        class="full-width phonology-table__handedness-select"
         @update:model-value="emitUpdate"
-      />
+      >
+        <template #option="scope">
+          <q-item v-bind="scope.itemProps">
+            <q-item-section>
+              <q-item-label>{{ scope.opt.label }}</q-item-label>
+              <q-item-label
+                v-if="scope.opt.description"
+                caption
+              >
+                {{ scope.opt.description }}
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+        </template>
+      </q-select>
     </div>
 
     <div class="phonology-table__scroll">
@@ -191,6 +207,7 @@ const props = defineProps<{
   phonologyData: PhonologyData;
   isEditable?: boolean;
   compact?: boolean;
+  naturalHeight?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -332,6 +349,22 @@ function emitUpdate() {
   flex: 0 0 auto;
 }
 
+.phonology-table__handedness-select {
+  max-width: 420px;
+}
+
+.phonology-table--natural-height {
+  min-height: auto;
+  flex: 0 0 auto;
+  height: auto;
+}
+
+.phonology-table--natural-height .phonology-table__scroll {
+  flex: 0 0 auto;
+  min-height: auto;
+  overflow: visible;
+}
+
 .phonology-table__scroll {
   flex: 1 1 0;
   min-height: 0;
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index 0ab3350..793916b 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -175,6 +175,9 @@ const translations: TranslateKeys = {
   isCompoundSign: 'Signe compost',
   addCompoundPart: 'Afegir part del compost',
   removeCompoundPart: 'Eliminar part',
+  sortCompoundParts: 'Reordenar parts',
+  sortCompoundPartsHint: 'Useu les fletxes per canviar l\'ordre dels components del compost.',
+  confirmDeleteCompoundPartMessage: 'Segur que voleu eliminar la part «{part}»?',
   compoundPartGloss: 'Glossa del morfema',
   compoundPartType: 'Tipus de part',
   partTypeLinked: 'Glossa enllaçada',
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index 845e35e..74bda65 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -106,6 +106,7 @@ const translations: TranslateKeys = {
   senseTitle: 'Sense',
   required: 'Required',
   cancel: 'Cancel',
+  confirmDelete: 'Confirm deletion',
   save: 'Save',
   addDefinition: 'Add definition',
   addGlossTranslation: 'Add gloss translation',
@@ -184,6 +185,9 @@ const translations: TranslateKeys = {
   isCompoundSign: 'Compound sign',
   addCompoundPart: 'Add compound part',
   removeCompoundPart: 'Remove part',
+  sortCompoundParts: 'Reorder parts',
+  sortCompoundPartsHint: 'Use the arrows to change the order of compound parts.',
+  confirmDeleteCompoundPartMessage: 'Are you sure you want to remove the part "{part}"?',
   compoundPartGloss: 'Morpheme gloss',
   compoundPartType: 'Part type',
   partTypeLinked: 'Linked gloss',
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 2568573..de443ea 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -170,6 +170,9 @@ const translations: TranslateKeys = {
   isCompoundSign: 'Signo compuesto',
   addCompoundPart: 'Añadir parte del compuesto',
   removeCompoundPart: 'Eliminar parte',
+  sortCompoundParts: 'Reordenar partes',
+  sortCompoundPartsHint: 'Use las flechas para cambiar el orden de las partes del compuesto.',
+  confirmDeleteCompoundPartMessage: '¿Seguro que desea eliminar la parte «{part}»?',
   compoundPartGloss: 'Glosa del morfema',
   compoundPartType: 'Tipo de parte',
   partTypeLinked: 'Glosa enlazada',
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index 2cf1f6d..bc8d9b2 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -658,6 +658,9 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   isCompoundSign: string;
   addCompoundPart: string;
   removeCompoundPart: string;
+  sortCompoundParts: string;
+  sortCompoundPartsHint: string;
+  confirmDeleteCompoundPartMessage: string;
   compoundPartGloss: string;
   compoundPartType: string;
   partTypeLinked: string;
diff --git a/frontend/src/types/models.ts b/frontend/src/types/models.ts
index 2bc1b7b..d7e7669 100644
--- a/frontend/src/types/models.ts
+++ b/frontend/src/types/models.ts
@@ -133,7 +133,7 @@ export interface CompoundPart {
   gloss: string;
   compExternalId?: string | null;
   linkedGlossId?: string | null;
-  redundant: boolean;
+  redundant?: boolean;
   linkedGloss?: GlossData | null;
   inlinePhonology?: PhonologyData | null;
   inlineSignVideo?: SignVideo | null;
diff --git a/frontend/src/utils/compoundEditor.ts b/frontend/src/utils/compoundEditor.ts
index 3183847..ff0ebfd 100644
--- a/frontend/src/utils/compoundEditor.ts
+++ b/frontend/src/utils/compoundEditor.ts
@@ -12,18 +12,67 @@ export function partKindFromCompoundPart(part: CompoundPart): CompoundPartKind {
   return part.linkedGlossId ? 'linked' : 'inline';
 }
 
-export function toEditableCompoundPart(part: CompoundPart): EditableCompoundPart {
+function clonePhonology(phonology: PhonologyData): PhonologyData {
+  return { ...phonology };
+}
+
+function resolveInlinePhonology(part: CompoundPart): PhonologyData {
+  const source = part.inlinePhonology ?? part.inlineSignVideo?.videoData;
+  if (source) {
+    return clonePhonology(source);
+  }
+  return createDefaultPhonology();
+}
+
+function buildInlineSignVideo(
+  gloss: string,
+  phonology: PhonologyData,
+  existing?: SignVideo | null,
+): SignVideo {
+  if (existing) {
+    return {
+      ...existing,
+      videos: existing.videos ?? [],
+      minimalPairs: existing.minimalPairs ?? [],
+      videoData: phonology,
+      videoDataId: phonology.id || existing.videoDataId || '',
+    };
+  }
+
   return {
-    ...part,
-    partKind: partKindFromCompoundPart(part),
-    inlinePhonology: part.inlinePhonology ?? (part.linkedGlossId ? null : createDefaultPhonology()),
-    inlineSignVideo: part.inlineSignVideo
+    id: '',
+    title: gloss,
+    priority: 1,
+    videoDataId: phonology.id || '',
+    videos: [{
+      id: crypto.randomUUID(),
+      angle: 'front',
+      url: '',
+      priority: 1,
+    }],
+    minimalPairs: [],
+    videoData: phonology,
+  };
+}
+
+export function toEditableCompoundPart(part: CompoundPart): EditableCompoundPart {
+  const partKind = partKindFromCompoundPart(part);
+  const inlinePhonology = partKind === 'inline' ? resolveInlinePhonology(part) : null;
+  const inlineSignVideo = partKind === 'inline' && inlinePhonology
+    ? buildInlineSignVideo(part.gloss, inlinePhonology, part.inlineSignVideo)
+    : part.inlineSignVideo
       ? {
           ...part.inlineSignVideo,
           videos: part.inlineSignVideo.videos ?? [],
           minimalPairs: part.inlineSignVideo.minimalPairs ?? [],
         }
-      : null,
+      : null;
+
+  return {
+    ...part,
+    partKind,
+    inlinePhonology,
+    inlineSignVideo,
   };
 }
 
@@ -39,23 +88,23 @@ export function createEmptyEditablePart(position: number): EditableCompoundPart
     position,
     gloss: '',
     partKind: 'inline',
-    redundant: false,
     isNew: true,
     inlinePhonology: phonology,
-    inlineSignVideo: {
-      id: '',
-      title: '',
-      priority: 1,
-      videoDataId: phonology.id || '',
-      videos: [{
-        id: crypto.randomUUID(),
-        angle: 'front',
-        url: '',
-        priority: 1,
-      }],
-      minimalPairs: [],
-      videoData: phonology,
-    },
+    inlineSignVideo: buildInlineSignVideo('', phonology),
+  };
+}
+
+export function initializeInlineMorpheme(
+  gloss: string,
+  existing?: SignVideo | null,
+): Pick<EditableCompoundPart, 'inlinePhonology' | 'inlineSignVideo'> {
+  const phonology = existing?.videoData
+    ? clonePhonology(existing.videoData)
+    : createDefaultPhonology();
+
+  return {
+    inlinePhonology: phonology,
+    inlineSignVideo: buildInlineSignVideo(gloss, phonology, existing ?? undefined),
   };
 }
 
@@ -90,7 +139,6 @@ export function buildCompoundUpdatePayload(
       position: index + 1,
       gloss: part.gloss.trim(),
       compExternalId: part.compExternalId ?? null,
-      redundant: part.redundant ?? false,
       linkedGlossId: part.partKind === 'linked' ? part.linkedGlossId ?? null : null,
       inlinePhonology:
         part.partKind === 'inline' && part.inlinePhonology
diff --git a/frontend/src/utils/compoundPhonology.ts b/frontend/src/utils/compoundPhonology.ts
index 6caf497..9699b81 100644
--- a/frontend/src/utils/compoundPhonology.ts
+++ b/frontend/src/utils/compoundPhonology.ts
@@ -1,119 +1,126 @@
-import type { CompoundPart, GlossData, PhonologyData, SignVideo } from 'src/types/models';

-

-export interface CompoundPhonologyColumn {

-  key: string;

-  label: string;

-  phonology: PhonologyData;

-  depth: number;

-}

-

-export interface CompoundPartVideoEntry {

-  position: number;

-  label: string;

-  signVideo: SignVideo | null;

-  isInlineMorpheme: boolean;

-}

-

-function primarySignVideo(gloss: GlossData): SignVideo | null {

-  const videos = gloss.glossVideos ?? [];

-  if (!videos.length) return null;

-  const sorted = [...videos].sort((a, b) => a.priority - b.priority);

-  return sorted[0] ?? null;

-}

-

-function primaryPhonology(gloss: GlossData): PhonologyData | null {

-  return primarySignVideo(gloss)?.videoData ?? null;

-}

-

-/** One video per direct compound part — linked glosses use their own sign video (no deeper expansion). */

-function resolvePartVideoEntry(part: CompoundPart): CompoundPartVideoEntry {

-  if (!part.linkedGlossId) {

-    return {

-      position: part.position,

-      label: part.gloss,

-      signVideo: part.inlineSignVideo ?? null,

-      isInlineMorpheme: true,

-    };

-  }

-

-  const linked = part.linkedGloss;

-  return {

-    position: part.position,

-    label: part.gloss,

-    signVideo: linked ? primarySignVideo(linked) : null,

-    isInlineMorpheme: false,

-  };

-}

-

-export function primaryCompoundSignVideo(gloss: GlossData): SignVideo | null {

-  return primarySignVideo(gloss);

-}

-

-/** One video slot per direct compound part (next level only). */

-export function resolveCompoundPartVideos(gloss: GlossData): CompoundPartVideoEntry[] {

-  return sortedCompoundParts(gloss).map(resolvePartVideoEntry);

-}

-

-function resolvePartPhonologyColumn(

-  part: CompoundPart,

-  prefix: string,

-  depth: number,

-): CompoundPhonologyColumn | null {

-  const labelPrefix = prefix ? `${prefix} / ` : '';

-

-  if (part.inlinePhonology) {

-    return {

-      key: `${prefix}-${part.position}-inline`,

-      label: `${labelPrefix}${part.gloss}`,

-      phonology: part.inlinePhonology,

-      depth,

-    };

-  }

-

-  const linked = part.linkedGloss;

-  if (!linked) {

-    return null;

-  }

-

-  const phonology = primaryPhonology(linked);

-  if (!phonology) {

-    return null;

-  }

-

-  return {

-    key: `${prefix}-${part.position}-linked-${linked.id ?? part.gloss}`,

-    label: `${labelPrefix}${part.gloss}`,

-    phonology,

-    depth,

-  };

-}

-

-export function flattenCompoundPhonologyColumns(

-  gloss: GlossData,

-  prefix = '',

-  depth = 0,

-  warnings: string[] = [],

-): CompoundPhonologyColumn[] {

-  void warnings;

-  if (!gloss.isCompound || !(gloss.compoundParts?.length)) {

-    return [];

-  }

-

-  return sortedCompoundParts(gloss)

-    .map((part) => resolvePartPhonologyColumn(part, prefix, depth))

-    .filter((column): column is CompoundPhonologyColumn => column !== null);

-}

-

-export function buildCompoundChainLabel(gloss: GlossData): string {

-  const parts = [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);

-  const morphemes = parts.map((p) => p.gloss).join(' + ');

-  return morphemes ? `${morphemes} → ${gloss.gloss}` : gloss.gloss;

-}

-

-export function sortedCompoundParts(gloss: GlossData): CompoundPart[] {

-  return [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);

-}

-

-export function isCompoundGloss(gloss: GlossData): boolean {

-  return Boolean(gloss.isCompound && (gloss.compoundParts?.length ?? 0) > 0);

-}

+import type { CompoundPart, GlossData, PhonologyData, SignVideo } from 'src/types/models';
+
+export interface CompoundPhonologyColumn {
+  key: string;
+  label: string;
+  phonology: PhonologyData;
+  depth: number;
+}
+
+export interface CompoundPartVideoEntry {
+  position: number;
+  label: string;
+  signVideo: SignVideo | null;
+  isInlineMorpheme: boolean;
+}
+
+const MAX_COMPOUND_DEPTH = 3;
+
+function primarySignVideo(gloss: GlossData): SignVideo | null {
+  const videos = gloss.glossVideos ?? [];
+  if (!videos.length) return null;
+  const sorted = [...videos].sort((a, b) => a.priority - b.priority);
+  return sorted[0] ?? null;
+}
+
+function primaryPhonology(gloss: GlossData): PhonologyData | null {
+  return primarySignVideo(gloss)?.videoData ?? null;
+}
+
+/** One video per direct compound part — linked glosses use their own sign video (no deeper expansion). */
+function resolvePartVideoEntry(part: CompoundPart): CompoundPartVideoEntry {
+  if (!part.linkedGlossId) {
+    return {
+      position: part.position,
+      label: part.gloss,
+      signVideo: part.inlineSignVideo ?? null,
+      isInlineMorpheme: true,
+    };
+  }
+
+  const linked = part.linkedGloss;
+  return {
+    position: part.position,
+    label: part.gloss,
+    signVideo: linked ? primarySignVideo(linked) : null,
+    isInlineMorpheme: false,
+  };
+}
+
+export function primaryCompoundSignVideo(gloss: GlossData): SignVideo | null {
+  return primarySignVideo(gloss);
+}
+
+/** One video slot per direct compound part (next level only). */
+export function resolveCompoundPartVideos(gloss: GlossData): CompoundPartVideoEntry[] {
+  return sortedCompoundParts(gloss).map(resolvePartVideoEntry);
+}
+
+function resolvePartPhonologyColumns(
+  part: CompoundPart,
+  depth: number,
+  warnings: string[],
+): CompoundPhonologyColumn[] {
+  if (part.inlinePhonology) {
+    return [{
+      key: `p${part.position}-inline-${part.gloss}`,
+      label: part.gloss,
+      phonology: part.inlinePhonology,
+      depth,
+    }];
+  }
+
+  const linked = part.linkedGloss;
+  if (!linked) {
+    return [];
+  }
+
+  if (linked.isCompound && (linked.compoundParts?.length ?? 0) > 0) {
+    if (depth >= MAX_COMPOUND_DEPTH) {
+      warnings.push(`${part.gloss}: nested compound depth limit (${MAX_COMPOUND_DEPTH})`);
+      return [];
+    }
+    return flattenCompoundPhonologyColumns(linked, depth + 1, warnings);
+  }
+
+  const phonology = primaryPhonology(linked);
+  if (!phonology) {
+    return [];
+  }
+
+  return [{
+    key: `p${part.position}-linked-${linked.id ?? part.gloss}`,
+    label: part.gloss,
+    phonology,
+    depth,
+  }];
+}
+
+/** Leaf morpheme columns — nested linked compounds are flattened (e.g. BESSONS-TRES → GERMÀ, SEGON, TERCER). */
+export function flattenCompoundPhonologyColumns(
+  gloss: GlossData,
+  depth = 0,
+  warnings: string[] = [],
+): CompoundPhonologyColumn[] {
+  if (!gloss.isCompound || !(gloss.compoundParts?.length)) {
+    return [];
+  }
+
+  return sortedCompoundParts(gloss).flatMap((part) =>
+    resolvePartPhonologyColumns(part, depth, warnings),
+  );
+}
+
+export function buildCompoundChainLabel(gloss: GlossData): string {
+  const parts = [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);
+  const morphemes = parts.map((p) => p.gloss).join(' + ');
+  return morphemes ? `${morphemes} → ${gloss.gloss}` : gloss.gloss;
+}
+
+export function sortedCompoundParts(gloss: GlossData): CompoundPart[] {
+  return [...(gloss.compoundParts ?? [])].sort((a, b) => a.position - b.position);
+}
+
+export function isCompoundGloss(gloss: GlossData): boolean {
+  return Boolean(gloss.isCompound && (gloss.compoundParts?.length ?? 0) > 0);
+}

From 917d949ba5cc166f4e68a26257a1b017de0d86d1 Mon Sep 17 00:00:00 2001
From: Ramon <ramondonadeucaballero@gmail.com>
Date: Fri, 19 Jun 2026 19:28:09 +0200
Subject: [PATCH 12/17] feat: update page theme

---
 frontend/quasar.config.ts                     |  20 +--
 .../components/CompoundEditorComponent.vue    |   2 +-
 .../components/CompoundPartVideoCard.vue      |   2 +-
 .../components/CompoundPhonologyTable.vue     |   2 +-
 .../components/GlossRequestProgress.vue       |   2 +-
 .../components/GlossVideoComponent.vue        |   2 +-
 .../components/MoreContentComponent.vue       |   4 +-
 .../components/SignVideosBrowseView.vue       |   6 +-
 .../components/VideosComponent.vue            |   6 +-
 frontend/src/components/HeaderComponent.vue   |  12 +-
 .../src/components/Shared/EditableModule.vue  |   2 +-
 .../src/components/Shared/PhonologyTable.vue  |   2 +-
 .../components/UserManagement/UsersTable.vue  |   2 +-
 frontend/src/css/app.css                      | 150 +++++++++++++++++-
 frontend/src/layouts/MainLayout.vue           |   2 +-
 frontend/src/pages/ErrorNotFound.vue          |   2 +-
 frontend/src/pages/SearchPage.vue             |   6 +-
 frontend/src/pages/UserManagementPage.vue     |   2 +-
 18 files changed, 185 insertions(+), 41 deletions(-)

diff --git a/frontend/quasar.config.ts b/frontend/quasar.config.ts
index cf86527..a99d649 100644
--- a/frontend/quasar.config.ts
+++ b/frontend/quasar.config.ts
@@ -6,6 +6,8 @@ import { fileURLToPath } from 'node:url';
 
 export default defineConfig(() => {
   return {
+    sassVariables: 'src/css/quasar.variables.scss',
+
     // https://v2.quasar.dev/quasar-cli-vite/prefetch-feature
     // preFetch: true,
 
@@ -128,17 +130,17 @@ export default defineConfig(() => {
     framework: {
       config: {
         brand: {
-          primary: '#c8102f',
-          secondary: '#FFFFFF',
-          accent: '#9C27B0',
+          primary: '#B6463A',
+          secondary: '#EDE4D6',
+          accent: '#9C6B4A',
 
-          dark: '#1d1d1d',
-          'dark-page': '#121212',
+          dark: '#2F2A24',
+          'dark-page': '#1A1714',
 
-          positive: '#21BA45',
-          negative: '#8B0000',
-          info: '#31CCEC',
-          warning: '#F2C037'
+          positive: '#3F7A52',
+          negative: '#B64A4A',
+          info: '#5B7C8C',
+          warning: '#B3832E'
         }
       },
       plugins: ['Notify', 'Dialog'],
diff --git a/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue b/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
index acf64c8..5a12285 100644
--- a/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundEditorComponent.vue
@@ -579,7 +579,7 @@ defineExpose({ saveAll, getStepValidationErrors });
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: var(--sb-card-radius, 12px);
   padding: 16px 20px;
-  background: #fff;
+  background: var(--sb-surface);
 }
 
 .inline-morpheme-editor__phonology :deep(.sign-phonology) {
diff --git a/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue b/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
index 636bbf8..18debbd 100644
--- a/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundPartVideoCard.vue
@@ -68,7 +68,7 @@ defineProps<{
   min-height: 120px;
   padding: 12px;
   text-align: center;
-  background: #f5f5f5;
+  background: var(--sb-surface-muted);
   border-radius: 8px;
 }
 </style>
diff --git a/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue b/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
index 68fba88..d055939 100644
--- a/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
@@ -253,7 +253,7 @@ function formatPerHandEnum(
   position: sticky;
   top: 0;
   z-index: 2;
-  background: #fff;
+  background: var(--sb-surface);
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.12);
   font-weight: 600;
   font-size: 0.8rem;
diff --git a/frontend/src/components/GlossDetail/components/GlossRequestProgress.vue b/frontend/src/components/GlossDetail/components/GlossRequestProgress.vue
index d8bd5fd..e2fcf58 100644
--- a/frontend/src/components/GlossDetail/components/GlossRequestProgress.vue
+++ b/frontend/src/components/GlossDetail/components/GlossRequestProgress.vue
@@ -60,7 +60,7 @@ const items = computed(() => {
 <style scoped>
 .progress-card {
   border-radius: var(--sb-card-radius, 12px);
-  background: #fff;
+  background: var(--sb-surface);
 }
 
 .progress-item {
diff --git a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
index d2f4cdf..7a63bac 100644
--- a/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
+++ b/frontend/src/components/GlossDetail/components/GlossVideoComponent.vue
@@ -363,7 +363,7 @@ const moveVideoRight = async () => {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: rgba(255, 255, 255, 0.96);
+  background: color-mix(in srgb, var(--sb-surface-elevated) 96%, transparent);
 }
 
 .angle-toggle--compact :deep(.q-btn) {
diff --git a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
index 5efe9d3..2b991a5 100644
--- a/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
+++ b/frontend/src/components/GlossDetail/components/MoreContentComponent.vue
@@ -300,7 +300,7 @@ async function handleFinish() {
 
 .creation-stepper {
   border-radius: var(--sb-card-radius, 12px);
-  background: white;
+  background: var(--sb-surface);
   flex: 1 1 auto;
 }
 </style>
@@ -329,7 +329,7 @@ async function handleFinish() {
   padding: 12px 16px;
   box-sizing: border-box;
   pointer-events: auto;
-  background: #fff;
+  background: var(--sb-surface);
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-bottom: none;
   border-radius: var(--sb-card-radius, 12px) var(--sb-card-radius, 12px) 0 0;
diff --git a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
index 5f1ec74..8ffad1b 100644
--- a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
+++ b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
@@ -224,12 +224,12 @@ function selectVideo(videoId: string | undefined) {
 }
 
 .sign-videos-browse__picker-item:hover {
-  border-color: rgba(200, 16, 47, 0.35);
+  border-color: color-mix(in srgb, var(--primary) 35%, transparent);
 }
 
 .sign-videos-browse__picker-item--active {
   border-color: var(--primary);
-  box-shadow: 0 2px 12px rgba(200, 16, 47, 0.12);
+  box-shadow: 0 2px 12px color-mix(in srgb, var(--primary) 12%, transparent);
 }
 
 .sign-videos-browse__picker-label {
@@ -254,7 +254,7 @@ function selectVideo(videoId: string | undefined) {
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: var(--sb-card-radius, 12px);
   padding: 16px 20px;
-  background: #fff;
+  background: var(--sb-surface);
 }
 
 .sign-videos-browse__phonology :deep(.sign-phonology) {
diff --git a/frontend/src/components/GlossDetail/components/VideosComponent.vue b/frontend/src/components/GlossDetail/components/VideosComponent.vue
index 51ee02d..792dbc3 100644
--- a/frontend/src/components/GlossDetail/components/VideosComponent.vue
+++ b/frontend/src/components/GlossDetail/components/VideosComponent.vue
@@ -650,12 +650,12 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
 }
 
 .videos-editor__picker-item:hover {
-  border-color: rgba(200, 16, 47, 0.35);
+  border-color: color-mix(in srgb, var(--primary) 35%, transparent);
 }
 
 .videos-editor__picker-item--active {
   border-color: var(--primary);
-  box-shadow: 0 2px 12px rgba(200, 16, 47, 0.12);
+  box-shadow: 0 2px 12px color-mix(in srgb, var(--primary) 12%, transparent);
 }
 
 .videos-editor__picker-label {
@@ -687,7 +687,7 @@ function validateVideo(video: SignVideo): { isValid: boolean; errors: string[] }
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: var(--sb-card-radius, 12px);
   padding: 16px 20px;
-  background: #fff;
+  background: var(--sb-surface);
 }
 
 .videos-editor__phonology-toolbar {
diff --git a/frontend/src/components/HeaderComponent.vue b/frontend/src/components/HeaderComponent.vue
index 558f46c..bb80882 100644
--- a/frontend/src/components/HeaderComponent.vue
+++ b/frontend/src/components/HeaderComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <q-header
-    class="bg-secondary text-black app-header"
+    class="app-header"
     bordered
   >
     <loginComponent v-model="isLoginDialogOpen" />
@@ -11,7 +11,7 @@
       :width="280"
       bordered
       overlay
-      class="bg-secondary"
+      class="app-drawer"
     >
       <q-list padding>
         <q-item-label
@@ -184,6 +184,12 @@ const isActive = (path: string) => route.path === path || route.path.startsWith(
 </script>
 
 <style scoped>
+.app-header,
+.app-drawer {
+  background-color: var(--sb-surface-muted);
+  color: var(--sb-text-primary);
+}
+
 .app-header {
   min-height: 64px;
   box-shadow: none;
@@ -198,7 +204,7 @@ const isActive = (path: string) => route.path === path || route.path.startsWith(
 }
 
 .nav-item-active {
-  background: rgba(200, 16, 47, 0.08);
+  background: rgba(182, 70, 58, 0.1);
   color: var(--primary);
   font-weight: 500;
 }
diff --git a/frontend/src/components/Shared/EditableModule.vue b/frontend/src/components/Shared/EditableModule.vue
index d50f7f1..8ca1e11 100644
--- a/frontend/src/components/Shared/EditableModule.vue
+++ b/frontend/src/components/Shared/EditableModule.vue
@@ -177,7 +177,7 @@ function confirmDelete() {
 }
 
 .editable-module.inline-mode {
-  background: white;
+  background: var(--sb-surface);
   border: 1px solid rgba(0, 0, 0, 0.08);
   padding: 12px;
   border-radius: var(--sb-card-radius, 12px);
diff --git a/frontend/src/components/Shared/PhonologyTable.vue b/frontend/src/components/Shared/PhonologyTable.vue
index 0882fea..e88490d 100644
--- a/frontend/src/components/Shared/PhonologyTable.vue
+++ b/frontend/src/components/Shared/PhonologyTable.vue
@@ -386,7 +386,7 @@ function emitUpdate() {
   position: sticky;
   top: 0;
   z-index: 2;
-  background: #fff;
+  background: var(--sb-surface);
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.12);
   font-weight: 600;
   font-size: 0.8rem;
diff --git a/frontend/src/components/UserManagement/UsersTable.vue b/frontend/src/components/UserManagement/UsersTable.vue
index 115116c..7497bc1 100644
--- a/frontend/src/components/UserManagement/UsersTable.vue
+++ b/frontend/src/components/UserManagement/UsersTable.vue
@@ -159,7 +159,7 @@ function updateUserRole(userId: string, newRole: Role) {
   .q-table__bottom,
   thead tr:first-child th
     /* bg color is important for th; just specify one */
-    background-color: white
+    background-color: var(--sb-surface)
 
   thead tr th
     position: sticky
diff --git a/frontend/src/css/app.css b/frontend/src/css/app.css
index 975720b..8ec5a64 100644
--- a/frontend/src/css/app.css
+++ b/frontend/src/css/app.css
@@ -1,6 +1,23 @@
-/* app global css */
+/* app global css — warm neutral palette (Option A) */
 :root {
-  --primary: #c8102f;
+  --primary: #B6463A;
+  --primary-hover: #9E3C31;
+
+  /* Strong warm contrast — clearly off-white, easy on the eyes */
+  --sb-bg: #D4C8B8;
+  --sb-surface: #EDE4D6;
+  --sb-surface-elevated: #F5EFE6;
+  --sb-surface-muted: #C4B8A8;
+
+  --sb-text-primary: #2F2A24;
+  --sb-text-secondary: #6B6258;
+
+  --sb-border: #C9BDB0;
+
+  --sb-positive: #3F7A52;
+  --sb-warning: #B3832E;
+  --sb-negative: #B64A4A;
+
   --sb-card-radius: 12px;
   --sb-transition: 0.2s ease;
   --sb-video-max-width: 480px;
@@ -8,6 +25,18 @@
   --sb-video-compact-max-height: 140px;
 }
 
+body.body--light {
+  --q-primary: #B6463A;
+  --q-secondary: #EDE4D6;
+  --q-accent: #9C6B4A;
+  --q-dark: #2F2A24;
+  --q-dark-page: #1A1714;
+  --q-positive: #3F7A52;
+  --q-negative: #B64A4A;
+  --q-info: #5B7C8C;
+  --q-warning: #B3832E;
+}
+
 @media (max-width: 1023px) {
   :root {
     --sb-video-max-width: 360px;
@@ -24,11 +53,118 @@
   }
 }
 
+html,
+body,
+#q-app {
+  background-color: var(--sb-bg) !important;
+  color: var(--sb-text-primary);
+}
+
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.q-layout,
+.q-page-container,
+.q-page,
+.q-drawer__content {
+  background-color: var(--sb-bg) !important;
+  color: var(--sb-text-primary);
+}
+
+.q-header,
+.q-footer {
+  background-color: var(--sb-surface-muted) !important;
+  color: var(--sb-text-primary) !important;
+}
+
+.q-toolbar {
+  background-color: inherit !important;
+  color: inherit !important;
+}
+
+.q-card,
+.q-stepper,
+.q-list--bordered,
+.q-expansion-item__container,
+.q-menu .q-list {
+  background-color: var(--sb-surface) !important;
+  color: var(--sb-text-primary) !important;
+}
+
+.q-card--flat {
+  background-color: var(--sb-surface) !important;
+}
+
+.q-dialog .q-card,
+.q-select__dialog .q-card {
+  background-color: var(--sb-surface-elevated) !important;
+}
+
+.q-field--outlined .q-field__control,
+.q-field--filled .q-field__control {
+  background-color: var(--sb-surface-elevated) !important;
+}
+
+.q-field--outlined .q-field__control:before {
+  border-color: var(--sb-border) !important;
+}
+
+.q-separator {
+  background: var(--sb-border) !important;
+}
+
+.q-item {
+  color: var(--sb-text-primary);
+}
+
+.q-item__label--caption,
+.text-grey-7,
+.text-grey-8 {
+  color: var(--sb-text-secondary) !important;
+}
+
+.q-tab-panels,
+.q-tab-panel {
+  background: transparent !important;
+  color: var(--sb-text-primary);
+}
+
+.q-markup-table,
+.q-markup-table thead th,
+.q-table thead tr,
+.q-table tbody td {
+  background-color: var(--sb-surface) !important;
+  color: var(--sb-text-primary);
+}
+
+.q-banner {
+  background-color: var(--sb-surface-muted) !important;
+  color: var(--sb-text-primary) !important;
+}
+
+/* Remap Quasar grey utilities to warm neutrals */
+.bg-secondary,
+.bg-grey-1 {
+  background-color: var(--sb-surface-elevated) !important;
+}
+
+.bg-grey-2,
+.bg-grey-3 {
+  background-color: var(--sb-surface-muted) !important;
+}
+
+.q-hover\:bg-grey-1:hover,
+.q-item.q-hoverable:hover > .q-focus-helper,
+.q-item--clickable:hover {
+  background-color: rgba(182, 70, 58, 0.06) !important;
+}
+
+.q-btn--outline {
+  color: var(--primary) !important;
+}
+
 /* Consistent focus ring for keyboard navigation */
 :focus-visible {
   outline: 2px solid var(--primary);
@@ -42,16 +178,16 @@ body {
 }
 
 ::-webkit-scrollbar-track {
-  background: #f5f5f5;
+  background: var(--sb-surface-muted);
 }
 
 ::-webkit-scrollbar-thumb {
-  background: #c4c4c4;
+  background: #B5A796;
   border-radius: 4px;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: #999;
+  background: #9A8B7A;
 }
 
 /* Shared card hover effect */
@@ -62,10 +198,10 @@ body {
 
 .sb-card-interactive:hover {
   transform: translateY(-2px);
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 16px rgba(47, 42, 36, 0.12);
 }
 
 .sb-card-interactive:focus-visible {
   transform: translateY(-2px);
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 16px rgba(47, 42, 36, 0.12);
 }
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 52fa7b9..187be82 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -13,6 +13,6 @@ import HeaderComponent from 'components/HeaderComponent.vue';
 
 <style scoped>
 .page-container {
-  background: #fafafa;
+  background: var(--sb-bg);
 }
 </style>
diff --git a/frontend/src/pages/ErrorNotFound.vue b/frontend/src/pages/ErrorNotFound.vue
index 98c5568..8f3aade 100644
--- a/frontend/src/pages/ErrorNotFound.vue
+++ b/frontend/src/pages/ErrorNotFound.vue
@@ -34,6 +34,6 @@ import translate from 'src/utils/translate';
 
 <style scoped>
 .not-found-page {
-  background: #fafafa;
+  background: var(--sb-bg);
 }
 </style>
diff --git a/frontend/src/pages/SearchPage.vue b/frontend/src/pages/SearchPage.vue
index 4d0adb0..4b71ab9 100644
--- a/frontend/src/pages/SearchPage.vue
+++ b/frontend/src/pages/SearchPage.vue
@@ -278,16 +278,16 @@ onMounted(async () => {
 }
 
 .filters-container::-webkit-scrollbar-track {
-  background: #f1f1f1;
+  background: var(--sb-surface-muted);
 }
 
 .filters-container::-webkit-scrollbar-thumb {
-  background: #888;
+  background: #B5A796;
   border-radius: 3px;
 }
 
 .filters-container::-webkit-scrollbar-thumb:hover {
-  background: #555;
+  background: #9A8B7A;
 }
 
 /* Mobile responsive adjustments */
diff --git a/frontend/src/pages/UserManagementPage.vue b/frontend/src/pages/UserManagementPage.vue
index 79916e2..d999494 100644
--- a/frontend/src/pages/UserManagementPage.vue
+++ b/frontend/src/pages/UserManagementPage.vue
@@ -157,7 +157,7 @@ onMounted(() => {
   .q-table__bottom,
   thead tr:first-child th
     /* bg color is important for th; just specify one */
-    background-color: white
+    background-color: var(--sb-surface)
 
   thead tr th
     position: sticky

From 257d3330e060347758744b8fe905d34087ad3e16 Mon Sep 17 00:00:00 2001
From: Ramon <ramondonadeucaballero@gmail.com>
Date: Fri, 19 Jun 2026 19:28:19 +0200
Subject: [PATCH 13/17] feat: update page theme

---
 frontend/src/css/quasar.variables.scss | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 frontend/src/css/quasar.variables.scss

diff --git a/frontend/src/css/quasar.variables.scss b/frontend/src/css/quasar.variables.scss
new file mode 100644
index 0000000..17ee8fb
--- /dev/null
+++ b/frontend/src/css/quasar.variables.scss
@@ -0,0 +1,27 @@
+// Warm neutral palette (Option A) — compiled into Quasar components
+$primary   : #B6463A;
+$secondary : #EDE4D6;
+$accent    : #9C6B4A;
+
+$dark      : #2F2A24;
+$dark-page : #1A1714;
+
+$positive  : #3F7A52;
+$negative  : #B64A4A;
+$info      : #5B7C8C;
+$warning   : #B3832E;
+
+$separator-color      : #B5A796;
+$separator-dark-color : #4A433C;
+
+// Warm grey scale (replaces cool Quasar greys in bg-grey-* utilities)
+$grey-1 : #F5EFE6;
+$grey-2 : #E5DDD2;
+$grey-3 : #D4C8B8;
+$grey-4 : #C4B8A8;
+$grey-5 : #A89888;
+$grey-6 : #8A7B6C;
+$grey-7 : #6B6258;
+$grey-8 : #4A433C;
+$grey-9 : #2F2A24;
+$grey-10: #1A1714;

From 12b3f011fb2e2eaf06f9295b0b48e2e9b3792223 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Mon, 17 Aug 2026 17:08:34 +0200
Subject: [PATCH 14/17] feat: mass import

---
 Examples/0764_01_cervesa.json                 |  26 +-
 Examples/bulk-test/bessons-test.json          |  36 ++
 Examples/bulk-test/casa-test.json             |  31 ++
 Examples/bulk-test/gos-test.json              |  37 ++
 backend/nest-cli.json                         |   8 +-
 backend/scripts/run-bulk-import.js            |  34 ++
 backend/scripts/run-bulk-import.ts            |  34 ++
 backend/src/app.module.ts                     |   2 +
 .../src/bulk-import/bulk-import.controller.ts |  66 +++
 backend/src/bulk-import/bulk-import.module.ts |  12 +
 .../src/bulk-import/bulk-import.service.ts    | 451 ++++++++++++++++++
 backend/src/bulk-import/fitxa-mapper.ts       | 432 +++++++++++++++++
 backend/src/bulk-import/fitxa.types.ts        | 121 +++++
 .../bulk-import/fixtures/bessons-test.json    |  36 ++
 .../src/bulk-import/fixtures/casa-test.json   |  31 ++
 .../src/bulk-import/fixtures/gos-test.json    |  37 ++
 backend/src/import/fitxa-enum-resolver.ts     |  25 +-
 frontend/src/components/HeaderComponent.vue   |  13 +
 frontend/src/components/loginComponent.vue    |  20 +-
 frontend/src/i18n/ca-ES/index.ts              |  23 +
 frontend/src/i18n/en-US/index.ts              |  25 +
 frontend/src/i18n/es-ES/index.ts              |  23 +
 frontend/src/i18n/translateKeys.ts            |  23 +
 frontend/src/pages/BulkImportPage.vue         | 283 +++++++++++
 frontend/src/router/routes.ts                 |   7 +
 frontend/src/services/api.ts                  |  11 +
 26 files changed, 1826 insertions(+), 21 deletions(-)
 create mode 100644 Examples/bulk-test/bessons-test.json
 create mode 100644 Examples/bulk-test/casa-test.json
 create mode 100644 Examples/bulk-test/gos-test.json
 create mode 100644 backend/scripts/run-bulk-import.js
 create mode 100644 backend/scripts/run-bulk-import.ts
 create mode 100644 backend/src/bulk-import/bulk-import.controller.ts
 create mode 100644 backend/src/bulk-import/bulk-import.module.ts
 create mode 100644 backend/src/bulk-import/bulk-import.service.ts
 create mode 100644 backend/src/bulk-import/fitxa-mapper.ts
 create mode 100644 backend/src/bulk-import/fitxa.types.ts
 create mode 100644 backend/src/bulk-import/fixtures/bessons-test.json
 create mode 100644 backend/src/bulk-import/fixtures/casa-test.json
 create mode 100644 backend/src/bulk-import/fixtures/gos-test.json
 create mode 100644 frontend/src/pages/BulkImportPage.vue

diff --git a/Examples/0764_01_cervesa.json b/Examples/0764_01_cervesa.json
index e7b0874..1170146 100644
--- a/Examples/0764_01_cervesa.json
+++ b/Examples/0764_01_cervesa.json
@@ -18,7 +18,7 @@
     "configuracio": "B (B) /O_SSI (O)",
     "configuracio_ma_dominant": "B (B)",
     "configuracio_ma_no_dominant": "O_SSI (O)",
-    "canvi_configuracio": "No",
+    "canvi_configuracio": null,
     "relacio_articuladors": "Damunt / Sota",
     "relacio_articuladors_ma_dominant": "Damunt",
     "relacio_articuladors_ma_no_dominant": "Sota",
@@ -61,13 +61,25 @@
   "valencia": "",
   "signes_claus": [],
   "related_signs": {
-    "HOMÒNIM": [],
-    "SINÒNIM": [],
+    "HOMÒNIM": [
+      "HOMONIM_CERVESA"
+    ],
+    "SINÒNIM": [
+      "SINONIM_CERVESA"
+    ],
     "VARIANT": [],
-    "ANTÒNIM": [],
-    "HIPÒNIM": [],
-    "HIPERÒNIM": [],
-    "VEURE TAMBÉ": []
+    "ANTÒNIM": [
+      "ANTONIM_CERVESA"
+    ],
+    "HIPÒNIM": [
+      "HIPONIM_CERVESA"
+    ],
+    "HIPERÒNIM": [
+      "HIPERONIM_CERVESA"
+    ],
+    "VEURE TAMBÉ": [
+      "VEURE_TAMBE_CERVESA"
+    ]
   },
   "relacio_signes_forasters": {
     "prestec": null,
diff --git a/Examples/bulk-test/bessons-test.json b/Examples/bulk-test/bessons-test.json
new file mode 100644
index 0000000..e9443da
--- /dev/null
+++ b/Examples/bulk-test/bessons-test.json
@@ -0,0 +1,36 @@
+{
+  "id": "test_bessons",
+  "name": "BESSONS-TEST",
+  "tr_en": "TWINS",
+  "tr_es": "GEMELOS",
+  "tr_ca": "BESSONS",
+  "definitions": [
+    "Adj- Nat d’un mateix part, amb un altre o altres"
+  ],
+  "lexical_category": "Adjectiu",
+  "phonology": {
+    "nombre_mans": "1",
+    "configuracio": "2 (beak2_open_spread)",
+    "localitzacio": "Espai neutre",
+    "moviment_repetit": "No"
+  },
+  "minimal_pairs": [],
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": [],
+    "VARIANT": ["BESSONS-T-ANTIGA"],
+    "ANTÒNIM": [],
+    "HIPÒNIM": [],
+    "HIPERÒNIM": [],
+    "VEURE TAMBÉ": []
+  },
+  "notes": "Fitxa de prova de compost: GERMÀ-TEST + SEGON-TEST",
+  "video_url": null,
+  "is_compound": true,
+  "compound_signs": ["GERMÀ-TEST", "SEGON-TEST"],
+  "morfologia_sequencial": {
+    "compost_1": "GERMÀ-TEST",
+    "compost_2": "SEGON-TEST",
+    "compost_3": null
+  }
+}
diff --git a/Examples/bulk-test/casa-test.json b/Examples/bulk-test/casa-test.json
new file mode 100644
index 0000000..fe61461
--- /dev/null
+++ b/Examples/bulk-test/casa-test.json
@@ -0,0 +1,31 @@
+{
+  "id": "test_casa",
+  "name": "CASA-TEST",
+  "tr_en": "HOUSE",
+  "tr_es": "CASA",
+  "tr_ca": "CASA",
+  "definitions": [
+    "Nom – Edifici destinat a habitatge."
+  ],
+  "lexical_category": "Nom",
+  "phonology": {
+    "nombre_mans": "2s",
+    "configuracio": "B (B)",
+    "localitzacio": "Espai neutre",
+    "moviment_repetit": "No"
+  },
+  "minimal_pairs": [],
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": [],
+    "VARIANT": ["CASA-ANTIGA"],
+    "ANTÒNIM": [],
+    "HIPÒNIM": ["PIS-TEST"],
+    "HIPERÒNIM": ["EDIFICI-TEST"],
+    "VEURE TAMBÉ": ["FINESTRA-TEST", "PORTA-TEST"]
+  },
+  "notes": "Fitxa de prova per stubs de relacions",
+  "video_url": null,
+  "is_compound": false,
+  "compound_signs": []
+}
diff --git a/Examples/bulk-test/gos-test.json b/Examples/bulk-test/gos-test.json
new file mode 100644
index 0000000..343370d
--- /dev/null
+++ b/Examples/bulk-test/gos-test.json
@@ -0,0 +1,37 @@
+{
+  "id": "test_gos",
+  "name": "GOS-TEST",
+  "tr_en": "DOG",
+  "tr_es": "PERRO",
+  "tr_ca": "GOS",
+  "definitions": [
+    "Nom – Animal de companyia de l'espècie Canis familiaris."
+  ],
+  "lexical_category": "Nom",
+  "phonology": {
+    "nombre_mans": "1",
+    "configuracio": "Q (Beak)",
+    "localitzacio": "Boca",
+    "canvi_orientacio": "Extensió > Flexió",
+    "moviment_repetit": "Sí"
+  },
+  "minimal_pairs": [
+    {
+      "sign": "GAT-TEST",
+      "description": "Configuració diferent"
+    }
+  ],
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": ["CA-TEST"],
+    "VARIANT": [],
+    "ANTÒNIM": [],
+    "HIPÒNIM": [],
+    "HIPERÒNIM": ["ANIMAL-TEST"],
+    "VEURE TAMBÉ": []
+  },
+  "notes": "Fitxa de prova: sinònim, hiperònim i parell mínim inexistent",
+  "video_url": null,
+  "is_compound": false,
+  "compound_signs": []
+}
diff --git a/backend/nest-cli.json b/backend/nest-cli.json
index f9aa683..5bdedca 100644
--- a/backend/nest-cli.json
+++ b/backend/nest-cli.json
@@ -3,6 +3,12 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true
+    "deleteOutDir": true,
+    "assets": [
+      {
+        "include": "import/*.json",
+        "watchAssets": true
+      }
+    ]
   }
 }
diff --git a/backend/scripts/run-bulk-import.js b/backend/scripts/run-bulk-import.js
new file mode 100644
index 0000000..72ac6e2
--- /dev/null
+++ b/backend/scripts/run-bulk-import.js
@@ -0,0 +1,34 @@
+const { readdirSync, readFileSync } = require('fs');
+const { join } = require('path');
+const { NestFactory } = require('@nestjs/core');
+const { AppModule } = require('../dist/src/app.module');
+const { BulkImportService } = require('../dist/src/bulk-import/bulk-import.service');
+
+async function main() {
+  const dir = process.argv[2] || join(__dirname, '../src/bulk-import/fixtures');
+  const overwriteAll = process.argv[3] === 'true';
+
+  const files = readdirSync(dir)
+    .filter((name) => name.toLowerCase().endsWith('.json'))
+    .map((name) => ({
+      originalname: name,
+      buffer: readFileSync(join(dir, name)),
+    }));
+
+  if (!files.length) {
+    throw new Error(`No JSON files found in ${dir}`);
+  }
+
+  const app = await NestFactory.createApplicationContext(AppModule, {
+    logger: ['error', 'warn'],
+  });
+  const importer = app.get(BulkImportService);
+  const result = await importer.importFiles(files, overwriteAll);
+  console.log(JSON.stringify(result, null, 2));
+  await app.close();
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});
diff --git a/backend/scripts/run-bulk-import.ts b/backend/scripts/run-bulk-import.ts
new file mode 100644
index 0000000..c633939
--- /dev/null
+++ b/backend/scripts/run-bulk-import.ts
@@ -0,0 +1,34 @@
+import { NestFactory } from '@nestjs/core';
+import { readdirSync, readFileSync } from 'fs';
+import { join } from 'path';
+import { AppModule } from '../src/app.module';
+import { BulkImportService } from '../src/bulk-import/bulk-import.service';
+
+async function main() {
+  const dir = process.argv[2] || join(__dirname, '../src/bulk-import/fixtures');
+  const overwriteAll = process.argv[3] === 'true';
+
+  const files = readdirSync(dir)
+    .filter((name) => name.toLowerCase().endsWith('.json'))
+    .map((name) => ({
+      originalname: name,
+      buffer: readFileSync(join(dir, name)),
+    }));
+
+  if (!files.length) {
+    throw new Error(`No JSON files found in ${dir}`);
+  }
+
+  const app = await NestFactory.createApplicationContext(AppModule, {
+    logger: ['error', 'warn'],
+  });
+  const importer = app.get(BulkImportService);
+  const result = await importer.importFiles(files, overwriteAll);
+  console.log(JSON.stringify(result, null, 2));
+  await app.close();
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});
diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts
index e75d1e1..06ebe2e 100644
--- a/backend/src/app.module.ts
+++ b/backend/src/app.module.ts
@@ -17,6 +17,7 @@ import { DefinitionsModule } from './definitions/definitions.module';
 import { ExampleTranslationsModule } from './example-translations/example-translations.module';
 import { UsersModule } from './users/users.module';
 import { BackupModule } from './backup/backup.module';
+import { BulkImportModule } from './bulk-import/bulk-import.module';
 
 @Module({
   imports: [
@@ -36,6 +37,7 @@ import { BackupModule } from './backup/backup.module';
     ExampleTranslationsModule,
     UsersModule,
     BackupModule,
+    BulkImportModule,
   ],
   controllers: [AppController],
   providers: [AppService],
diff --git a/backend/src/bulk-import/bulk-import.controller.ts b/backend/src/bulk-import/bulk-import.controller.ts
new file mode 100644
index 0000000..20a4f96
--- /dev/null
+++ b/backend/src/bulk-import/bulk-import.controller.ts
@@ -0,0 +1,66 @@
+import {
+  BadRequestException,
+  Controller,
+  Post,
+  UploadedFiles,
+  UseGuards,
+  UseInterceptors,
+  Body,
+} from '@nestjs/common';
+import { FilesInterceptor } from '@nestjs/platform-express';
+import { memoryStorage } from 'multer';
+import { JwtGuard } from '../auth/guard/jwt.guard';
+import { RolesGuard } from '../auth/guard/roles.guard';
+import { Roles } from '../auth/decorator/roles.decorator';
+import { Role } from '@prisma/client';
+import { BulkImportService } from './bulk-import.service';
+
+@Controller('bulk-import')
+@UseGuards(JwtGuard, RolesGuard)
+@Roles(Role.ADMIN)
+export class BulkImportController {
+  constructor(private readonly bulkImportService: BulkImportService) {}
+
+  @Post()
+  @UseInterceptors(
+    FilesInterceptor('files', 2000, {
+      storage: memoryStorage(),
+      limits: { fileSize: 5 * 1024 * 1024 },
+    }),
+  )
+  async importFitxas(
+    @UploadedFiles() files: Express.Multer.File[],
+    @Body('overwriteAll') overwriteAll?: string,
+    @Body('overwriteGlosses') overwriteGlosses?: string | string[],
+  ) {
+    if (!files?.length) {
+      throw new BadRequestException('At least one JSON file is required');
+    }
+
+    const jsonFiles = files.filter((file) =>
+      file.originalname.toLowerCase().endsWith('.json'),
+    );
+    if (!jsonFiles.length) {
+      throw new BadRequestException('Upload JSON files only');
+    }
+
+    return this.bulkImportService.importFiles(
+      jsonFiles,
+      overwriteAll === 'true',
+      this.parseOverwriteGlosses(overwriteGlosses),
+    );
+  }
+
+  private parseOverwriteGlosses(value?: string | string[]): string[] {
+    if (!value) return [];
+    const items = Array.isArray(value) ? value : [value];
+    return items.flatMap((item) => {
+      try {
+        const parsed = JSON.parse(item);
+        return Array.isArray(parsed) ? parsed.map(String) : [String(parsed)];
+      } catch {
+        return item.split(',').map((part) => part.trim()).filter(Boolean);
+      }
+    });
+  }
+}
diff --git a/backend/src/bulk-import/bulk-import.module.ts b/backend/src/bulk-import/bulk-import.module.ts
new file mode 100644
index 0000000..f3823c4
--- /dev/null
+++ b/backend/src/bulk-import/bulk-import.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { PrismaModule } from '../prisma/prisma.module';
+import { TypesenseModule } from '../typesense/typesense.module';
+import { BulkImportController } from './bulk-import.controller';
+import { BulkImportService } from './bulk-import.service';
+
+@Module({
+  imports: [PrismaModule, TypesenseModule],
+  controllers: [BulkImportController],
+  providers: [BulkImportService],
+})
+export class BulkImportModule {}
diff --git a/backend/src/bulk-import/bulk-import.service.ts b/backend/src/bulk-import/bulk-import.service.ts
new file mode 100644
index 0000000..7a8e8b9
--- /dev/null
+++ b/backend/src/bulk-import/bulk-import.service.ts
@@ -0,0 +1,451 @@
+import { Injectable, Logger } from '@nestjs/common';
+import {
+  ConfigurationChange,
+  ContactType,
+  GlossStatus,
+  Hand,
+  HandConfiguration,
+  Language,
+  LexicalCategory,
+  Location,
+  MovementDirection,
+  MovementRelatedOrientation,
+  MovementType,
+  OrientationChange,
+  OrientationRelatedToLocation,
+  Prisma,
+  RelationBetweenArticulators,
+  RelationType,
+} from '@prisma/client';
+import { PrismaService } from '../prisma/prisma.service';
+import { TypesenseService } from '../typesense/typesense.service';
+import { mapFitxa } from './fitxa-mapper';
+import type {
+  BulkImportResult,
+  FitxaJson,
+  ImportDuplicate,
+  ImportIssue,
+  MappedFitxa,
+  MappedPhonology,
+} from './fitxa.types';
+
+type UploadedJsonFile = {
+  originalname: string;
+  buffer: Buffer;
+};
+
+type GlossIndexEntry = {
+  id: string;
+  gloss: string;
+  isStub: boolean;
+};
+
+@Injectable()
+export class BulkImportService {
+  private readonly logger = new Logger(BulkImportService.name);
+
+  constructor(
+    private prisma: PrismaService,
+    private typesense: TypesenseService,
+  ) {}
+
+  async importFiles(
+    files: UploadedJsonFile[],
+    overwriteAll: boolean,
+    overwriteGlosses: string[] = [],
+  ): Promise<BulkImportResult> {
+    const result: BulkImportResult = {
+      created: 0,
+      updated: 0,
+      stubsCreated: 0,
+      skipped: 0,
+      relationsCreated: 0,
+      errors: [],
+      duplicates: [],
+    };
+
+    const overwriteKeys = new Set(overwriteGlosses.map((gloss) => this.glossKey(gloss)));
+    const mapped = this.parseFiles(files, result.errors);
+    const index = await this.loadGlossIndex();
+
+    for (const fitxa of mapped) {
+      if (overwriteKeys.size > 0 && !overwriteAll && !overwriteKeys.has(this.glossKey(fitxa.gloss))) {
+        continue;
+      }
+
+      try {
+        await this.importMappedFitxa(fitxa, overwriteAll, overwriteKeys, index, result);
+      } catch (error) {
+        this.logger.error(`Failed to import ${fitxa.gloss}`, error);
+        result.errors.push({
+          gloss: fitxa.gloss,
+          fileName: fitxa.fileName,
+          field: 'import',
+          value: fitxa.gloss,
+          message: error instanceof Error ? error.message : 'Unexpected import error',
+        });
+      }
+    }
+
+    const errorGlosses = new Set(
+      result.errors.map((issue) => this.glossKey(issue.gloss)).filter(Boolean),
+    );
+    result.duplicates = result.duplicates.filter(
+      (duplicate) => !errorGlosses.has(this.glossKey(duplicate.gloss)),
+    );
+
+    try {
+      await this.typesense.syncAllVideos();
+    } catch (error) {
+      result.errors.push({
+        gloss: '',
+        fileName: '',
+        field: 'search',
+        value: '',
+        message: error instanceof Error ? error.message : 'Typesense sync failed after import',
+      });
+    }
+
+    return result;
+  }
+
+  private parseFiles(files: UploadedJsonFile[], errors: ImportIssue[]): MappedFitxa[] {
+    const mapped: MappedFitxa[] = [];
+
+    for (const file of files) {
+      let parsed: unknown;
+      try {
+        parsed = JSON.parse(file.buffer.toString('utf8'));
+      } catch {
+        errors.push({
+          gloss: '',
+          fileName: file.originalname,
+          field: 'file',
+          value: file.originalname,
+          message: 'Invalid JSON file',
+        });
+        continue;
+      }
+
+      const items = Array.isArray(parsed) ? parsed : [parsed];
+      for (const [index, item] of items.entries()) {
+        const fileName = items.length > 1 ? `${file.originalname}[${index}]` : file.originalname;
+        const result = mapFitxa(item as FitxaJson, fileName);
+        if ('error' in result) {
+          errors.push(result.error);
+          continue;
+        }
+        mapped.push(result);
+      }
+    }
+
+    return mapped;
+  }
+
+  private async loadGlossIndex(): Promise<Map<string, GlossIndexEntry>> {
+    const glosses = await this.prisma.glossData.findMany({
+      select: {
+        id: true,
+        gloss: true,
+        definitions: { select: { id: true }, take: 1 },
+        glossVideos: { select: { id: true }, take: 1 },
+      },
+    });
+
+    const index = new Map<string, GlossIndexEntry>();
+    for (const gloss of glosses) {
+      index.set(this.glossKey(gloss.gloss), {
+        id: gloss.id,
+        gloss: gloss.gloss,
+        isStub: gloss.definitions.length === 0 && gloss.glossVideos.length === 0,
+      });
+    }
+    return index;
+  }
+
+  private async importMappedFitxa(
+    fitxa: MappedFitxa,
+    overwriteAll: boolean,
+    overwriteKeys: Set<string>,
+    index: Map<string, GlossIndexEntry>,
+    result: BulkImportResult,
+  ) {
+    if (fitxa.issues.length > 0) {
+      result.errors.push(...fitxa.issues);
+      result.skipped += 1;
+      return;
+    }
+
+    for (const linkedName of fitxa.linkedGlossNames) {
+      const created = await this.ensureGloss(linkedName, index);
+      if (created) {
+        result.stubsCreated += 1;
+      }
+    }
+
+    const key = this.glossKey(fitxa.gloss);
+    const existing = index.get(key);
+    const shouldOverwrite = overwriteAll || overwriteKeys.has(key);
+
+    if (existing && !existing.isStub && !shouldOverwrite) {
+      result.duplicates.push({
+        gloss: fitxa.gloss,
+        fileName: fitxa.fileName,
+        existingGlossId: existing.id,
+        reason: 'Gloss already exists and overwrite is disabled',
+      });
+      result.skipped += 1;
+      return;
+    }
+
+    let glossId: string;
+    if (!existing) {
+      glossId = await this.createGloss(fitxa);
+      index.set(key, { id: glossId, gloss: fitxa.gloss, isStub: false });
+      result.created += 1;
+    } else {
+      await this.replaceGlossContent(existing.id, fitxa);
+      existing.isStub = false;
+      result.updated += 1;
+      glossId = existing.id;
+    }
+
+    await this.ensureLinks(glossId, fitxa, index, result);
+  }
+
+  private async ensureGloss(
+    name: string,
+    index: Map<string, GlossIndexEntry>,
+  ): Promise<boolean> {
+    const key = this.glossKey(name);
+    if (index.has(key)) {
+      return false;
+    }
+
+    const created = await this.prisma.glossData.create({
+      data: {
+        gloss: name,
+        dictionaryEntry: {
+          create: { status: GlossStatus.PUBLISHED },
+        },
+      },
+    });
+
+    index.set(key, { id: created.id, gloss: name, isStub: true });
+    return true;
+  }
+
+  private async createGloss(fitxa: MappedFitxa): Promise<string> {
+    const nested = this.glossNestedCreate(fitxa);
+    const created = await this.prisma.glossData.create({
+      data: {
+        gloss: fitxa.gloss,
+        editComment: fitxa.notes,
+        dictionaryEntry: {
+          create: { status: GlossStatus.PUBLISHED },
+        },
+        glossTranslations: nested.glossTranslations,
+        definitions: nested.definitions,
+        glossVideos: nested.glossVideos,
+      },
+    });
+    return created.id;
+  }
+
+  private async replaceGlossContent(glossDataId: string, fitxa: MappedFitxa) {
+    await this.prisma.$transaction(async (tx) => {
+      await this.clearGlossContent(tx, glossDataId);
+      const nested = this.glossNestedCreate(fitxa);
+      await tx.glossData.update({
+        where: { id: glossDataId },
+        data: {
+          gloss: fitxa.gloss,
+          editComment: fitxa.notes,
+          glossTranslations: nested.glossTranslations,
+          definitions: nested.definitions,
+          glossVideos: nested.glossVideos,
+        },
+      });
+
+      const entry = await tx.dictionaryEntry.findUnique({
+        where: { glossDataId },
+      });
+      if (!entry) {
+        await tx.dictionaryEntry.create({
+          data: { glossDataId, status: GlossStatus.PUBLISHED },
+        });
+      } else if (entry.status !== GlossStatus.PUBLISHED) {
+        await tx.dictionaryEntry.update({
+          where: { id: entry.id },
+          data: { status: GlossStatus.PUBLISHED },
+        });
+      }
+    });
+  }
+
+  private async clearGlossContent(tx: Prisma.TransactionClient, glossDataId: string) {
+    const signVideos = await tx.signVideo.findMany({
+      where: { glossDataId },
+      select: { id: true, videoDataId: true },
+    });
+
+    if (signVideos.length > 0) {
+      await tx.video.deleteMany({
+        where: { signVideoId: { in: signVideos.map((video) => video.id) } },
+      });
+      await tx.signVideo.deleteMany({ where: { glossDataId } });
+      await tx.videoData.deleteMany({
+        where: { id: { in: signVideos.map((video) => video.videoDataId) } },
+      });
+    }
+
+    await tx.definition.deleteMany({ where: { glossDataId } });
+    await tx.example.deleteMany({ where: { glossDataId } });
+    await tx.glossTranslation.deleteMany({ where: { glossDataId } });
+    await tx.relatedGloss.deleteMany({ where: { sourceGlossId: glossDataId } });
+    await tx.minimalPair.deleteMany({ where: { sourceGlossId: glossDataId } });
+  }
+
+  private glossNestedCreate(fitxa: MappedFitxa) {
+    return {
+      glossTranslations: {
+        create: fitxa.translations.map((translation) => ({
+          translation: translation.translation,
+          language: translation.language as Language,
+        })),
+      },
+      definitions: {
+        create: fitxa.definitions.map((definition, index) => ({
+          title: definition.title,
+          definition: definition.definition,
+          lexicalCategory: definition.lexicalCategory as LexicalCategory,
+          priority: index + 1,
+          definitionTranslations: {
+            create: [{ translation: definition.definition, language: Language.CATALAN }],
+          },
+        })),
+      },
+      glossVideos: fitxa.phonology
+        ? {
+            create: [this.signVideoCreate(fitxa.gloss, fitxa.phonology, fitxa.videoUrl)],
+          }
+        : undefined,
+    };
+  }
+
+  private signVideoCreate(gloss: string, phonology: MappedPhonology, videoUrl: string | null) {
+    return {
+      title: gloss,
+      priority: 0,
+      videoData: {
+        create: {
+          hands: phonology.hands as Hand,
+          configuration: phonology.configuration as HandConfiguration,
+          configurationChanges: phonology.configurationChanges as ConfigurationChange,
+          relationBetweenArticulators:
+            phonology.relationBetweenArticulators as RelationBetweenArticulators,
+          location: phonology.location as Location,
+          movementRelatedOrientation:
+            phonology.movementRelatedOrientation as MovementRelatedOrientation,
+          orientationRelatedToLocation:
+            phonology.orientationRelatedToLocation as OrientationRelatedToLocation,
+          orientationChange: phonology.orientationChange as OrientationChange,
+          contactType: phonology.contactType as ContactType,
+          movementType: phonology.movementType as MovementType,
+          movementDirection: phonology.movementDirection as MovementDirection,
+          vocalization: phonology.vocalization,
+          nonManualComponent: phonology.nonManualComponent,
+          inicialization: phonology.inicialization,
+          repeatedMovement: phonology.repeatedMovement,
+        },
+      },
+      videos: videoUrl
+        ? {
+            create: [{ url: videoUrl, angle: 'front', priority: 0 }],
+          }
+        : undefined,
+    };
+  }
+
+  private async ensureLinks(
+    sourceId: string,
+    fitxa: MappedFitxa,
+    index: Map<string, GlossIndexEntry>,
+    result: BulkImportResult,
+  ) {
+    for (const relation of fitxa.relations) {
+      const created = await this.ensureGloss(relation.targetGloss, index);
+      if (created) {
+        result.stubsCreated += 1;
+      }
+
+      const target = index.get(this.glossKey(relation.targetGloss));
+      if (!target || target.id === sourceId) continue;
+
+      try {
+        await this.prisma.relatedGloss.upsert({
+          where: {
+            sourceGlossId_targetGlossId: {
+              sourceGlossId: sourceId,
+              targetGlossId: target.id,
+            },
+          },
+          update: { relationType: relation.type as RelationType },
+          create: {
+            sourceGlossId: sourceId,
+            targetGlossId: target.id,
+            relationType: relation.type as RelationType,
+          },
+        });
+        result.relationsCreated += 1;
+      } catch (error) {
+        result.errors.push({
+          gloss: fitxa.gloss,
+          fileName: fitxa.fileName,
+          field: 'related_signs',
+          value: relation.targetGloss,
+          message: error instanceof Error ? error.message : 'Failed to create relation',
+        });
+      }
+    }
+
+    for (const pair of fitxa.minimalPairs) {
+      const created = await this.ensureGloss(pair.targetGloss, index);
+      if (created) {
+        result.stubsCreated += 1;
+      }
+
+      const target = index.get(this.glossKey(pair.targetGloss));
+      if (!target || target.id === sourceId) continue;
+
+      try {
+        await this.prisma.minimalPair.upsert({
+          where: {
+            sourceGlossId_targetGlossId: {
+              sourceGlossId: sourceId,
+              targetGlossId: target.id,
+            },
+          },
+          update: { distinction: pair.distinction },
+          create: {
+            sourceGlossId: sourceId,
+            targetGlossId: target.id,
+            distinction: pair.distinction,
+          },
+        });
+      } catch (error) {
+        result.errors.push({
+          gloss: fitxa.gloss,
+          fileName: fitxa.fileName,
+          field: 'minimal_pairs',
+          value: pair.targetGloss,
+          message: error instanceof Error ? error.message : 'Failed to create minimal pair',
+        });
+      }
+    }
+  }
+
+  private glossKey(name: string): string {
+    return name.trim().normalize('NFC').toUpperCase();
+  }
+}
diff --git a/backend/src/bulk-import/fitxa-mapper.ts b/backend/src/bulk-import/fitxa-mapper.ts
new file mode 100644
index 0000000..350209f
--- /dev/null
+++ b/backend/src/bulk-import/fitxa-mapper.ts
@@ -0,0 +1,432 @@
+import { Hand } from '@prisma/client';
+import {
+  resolveFitxaEnum,
+  type FitxaMappingField,
+} from '../import/fitxa-enum-resolver';
+import type {
+  FitxaJson,
+  FitxaPhonology,
+  ImportIssue,
+  MappedFitxa,
+  MappedPhonology,
+} from './fitxa.types';
+
+const PHONOLOGY_FIELDS: Array<{
+  jsonKey: keyof FitxaPhonology;
+  mappingField: FitxaMappingField;
+  videoDataKey: keyof MappedPhonology;
+}> = [
+  { jsonKey: 'configuracio', mappingField: 'configuration', videoDataKey: 'configuration' },
+  { jsonKey: 'canvi_configuracio', mappingField: 'configurationChanges', videoDataKey: 'configurationChanges' },
+  { jsonKey: 'relacio_articuladors', mappingField: 'relationBetweenArticulators', videoDataKey: 'relationBetweenArticulators' },
+  { jsonKey: 'localitzacio', mappingField: 'location', videoDataKey: 'location' },
+  { jsonKey: 'orientacio_moviment', mappingField: 'movementRelatedOrientation', videoDataKey: 'movementRelatedOrientation' },
+  { jsonKey: 'orientacio_localitzacio', mappingField: 'orientationRelatedToLocation', videoDataKey: 'orientationRelatedToLocation' },
+  { jsonKey: 'canvi_orientacio', mappingField: 'orientationChange', videoDataKey: 'orientationChange' },
+  { jsonKey: 'tipus_contacte', mappingField: 'contactType', videoDataKey: 'contactType' },
+  { jsonKey: 'forma_moviment', mappingField: 'movementType', videoDataKey: 'movementType' },
+  { jsonKey: 'direccio_moviment', mappingField: 'movementDirection', videoDataKey: 'movementDirection' },
+];
+
+const ENUM_FALLBACKS: Record<string, Record<string, string>> = {
+  configuration: {
+    'b (b)': 'CONF_21',
+    'o_ssi (o)': 'CONF_3',
+    'q (beak)': 'CONF_33',
+  },
+  relationBetweenArticulators: {
+    'damunt / sota': 'ABOVE_BELOW',
+    'damunt /sota': 'ABOVE_BELOW',
+  },
+  location: {
+    'ma no-dominant': 'WEAK_HAND',
+    'ma no dominant': 'WEAK_HAND',
+    'espai neutre': 'NEUTRAL_SPACE',
+    'boca': 'MOUTH',
+  },
+  orientationRelatedToLocation: {
+    'ao: palm-down': 'AO_PALM_DOWN',
+    'ao: palmell-avall': 'AO_PALM_DOWN',
+  },
+  movementDirection: {
+    'cap a la localitzacio': 'TOWARDS_LOCATION',
+  },
+  orientationChange: {
+    'extensio > flexio': 'EXTENSION_TO_FLEXION',
+    'flexio > extensio': 'FLEXION_TO_EXTENSION',
+  },
+};
+
+const RELATION_KEY_FALLBACK: Record<string, string> = {
+  sinonim: 'SYNONYM',
+  antonim: 'ANTONYM',
+  homonim: 'HOMONYM',
+  variant: 'VARIANT',
+  hiperonim: 'HYPERNYM',
+  hiponim: 'HYPONYM',
+  'veure tambe': 'ASSOCIATED_CONCEPT',
+};
+
+const LEXICAL_PREFIX: Array<{ prefix: RegExp; category: string }> = [
+  { prefix: /^adj(?:ectiu)?\s*[-–—]/i, category: 'ADJECTIVE' },
+  { prefix: /^verb\s*[-–—]/i, category: 'VERB' },
+  { prefix: /^nom\s*[-–—]/i, category: 'NOUN' },
+  { prefix: /^adverbi\s*[-–—]/i, category: 'ADVERB' },
+];
+
+function normalize(input: string): string {
+  return input
+    .trim()
+    .normalize('NFD')
+    .replace(/\p{M}/gu, '')
+    .toLowerCase()
+    .replace(/\s+/g, ' ');
+}
+
+function splitCandidates(raw: string): string[] {
+  const trimmed = raw.trim();
+  const parts = trimmed
+    .split(/\s*\/\s*/)
+    .map((part) => part.trim())
+    .filter(Boolean);
+  return [trimmed, ...parts.filter((part) => part !== trimmed)];
+}
+
+function resolveEnumValue(
+  field: FitxaMappingField,
+  raw: string | null | undefined,
+  gloss: string,
+  fileName: string,
+  jsonField: string,
+  issues: ImportIssue[],
+  emptyValue: string,
+): string {
+  if (raw == null || String(raw).trim() === '') {
+    return emptyValue;
+  }
+
+  const original = String(raw).trim();
+  for (const candidate of splitCandidates(original)) {
+    const resolved = resolveFitxaEnum(field, candidate);
+    if (resolved.value) {
+      return String(resolved.value);
+    }
+
+    const fallback = ENUM_FALLBACKS[String(field)]?.[normalize(candidate)];
+    if (fallback) {
+      return fallback;
+    }
+  }
+
+  issues.push({
+    gloss,
+    fileName,
+    field: jsonField,
+    value: original,
+    message: `Invalid enum value for ${jsonField}`,
+  });
+  return emptyValue;
+}
+
+function mapHands(
+  raw: string | null | undefined,
+  gloss: string,
+  fileName: string,
+  issues: ImportIssue[],
+): Hand {
+  if (raw == null || String(raw).trim() === '') {
+    return Hand.RIGHT;
+  }
+
+  const value = String(raw).trim().replace(/^\d+n\s+comp:\s*/i, '');
+  const code = normalize(value);
+
+  if (code === '1') return Hand.RIGHT;
+  if (code === '2a' || code === '2n' || code === '2s' || code === '2') {
+    return Hand.BOTH;
+  }
+  if (code === 'x') return Hand.BOTH;
+
+  issues.push({
+    gloss,
+    fileName,
+    field: 'phonology.nombre_mans',
+    value: String(raw),
+    message: 'Invalid handedness code; stored as RIGHT',
+  });
+  return Hand.RIGHT;
+}
+
+function mapLexicalCategory(
+  raw: string | null | undefined,
+  gloss: string,
+  fileName: string,
+  issues: ImportIssue[],
+  fallback = 'NOUN',
+): string {
+  if (raw == null || String(raw).trim() === '') {
+    return fallback;
+  }
+
+  const resolved = resolveFitxaEnum('lexicalCategory', raw);
+  if (resolved.value) {
+    return String(resolved.value);
+  }
+
+  const normalized = normalize(String(raw));
+  if (normalized === 'nom o verb') return 'NOUN_OR_VERB';
+  if (normalized === 'adjectiu') return 'ADJECTIVE';
+  if (normalized === 'nom') return 'NOUN';
+  if (normalized === 'verb') return 'VERB';
+  if (normalized === 'preposicio o adjectiu') return 'PARTICLE_OR_ADJECTIVE';
+  if (normalized === 'nom, verb o adverbi') return 'NOUN_VERB_OR_ADVERB';
+
+  issues.push({
+    gloss,
+    fileName,
+    field: 'lexical_category',
+    value: String(raw),
+    message: 'Invalid lexical category; stored as NOUN',
+  });
+  return fallback;
+}
+
+function parseDefinitionLine(
+  line: string,
+  gloss: string,
+  fileName: string,
+  issues: ImportIssue[],
+  defaultCategory: string,
+) {
+  const trimmed = line.trim();
+  let category = defaultCategory;
+  let text = trimmed;
+  let title: string | null = null;
+
+  for (const { prefix, category: mapped } of LEXICAL_PREFIX) {
+    if (prefix.test(trimmed)) {
+      category = mapped;
+      text = trimmed.replace(prefix, '').trim();
+      title = trimmed.split(/[-–—]/)[0].trim();
+      break;
+    }
+  }
+
+  if (!text) {
+    issues.push({
+      gloss,
+      fileName,
+      field: 'definitions',
+      value: line,
+      message: 'Empty definition text after parsing',
+    });
+  }
+
+  return { title, definition: text || trimmed, lexicalCategory: category };
+}
+
+function splitTranslations(raw: string | null | undefined): string[] {
+  if (!raw || !raw.trim()) return [];
+  return raw
+    .split(';')
+    .map((part) => part.trim())
+    .filter(Boolean);
+}
+
+function mapRelationType(
+  key: string,
+  gloss: string,
+  fileName: string,
+  issues: ImportIssue[],
+): string | null {
+  const resolved = resolveFitxaEnum('relationType', key);
+  if (resolved.value) {
+    return String(resolved.value);
+  }
+
+  const fallback = RELATION_KEY_FALLBACK[normalize(key)];
+  if (fallback) {
+    return fallback;
+  }
+
+  issues.push({
+    gloss,
+    fileName,
+    field: `related_signs.${key}`,
+    value: key,
+    message: 'Unknown relation type; relation skipped',
+  });
+  return null;
+}
+
+function collectLinkedNames(fitxa: FitxaJson): string[] {
+  const names = new Set<string>();
+
+  for (const targets of Object.values(fitxa.related_signs || {})) {
+    for (const name of targets || []) {
+      if (name?.trim()) names.add(name.trim());
+    }
+  }
+
+  for (const pair of fitxa.minimal_pairs || []) {
+    if (pair.sign?.trim()) names.add(pair.sign.trim());
+  }
+
+  for (const name of fitxa.compound_signs || []) {
+    if (name?.trim()) names.add(name.trim());
+  }
+
+  const morphology = fitxa.morfologia_sequencial;
+  for (const part of [morphology?.compost_1, morphology?.compost_2, morphology?.compost_3]) {
+    if (part?.trim()) names.add(part.trim());
+  }
+
+  return [...names];
+}
+
+function mapPhonology(
+  phonology: FitxaPhonology | undefined,
+  gloss: string,
+  fileName: string,
+  issues: ImportIssue[],
+): MappedPhonology | null {
+  if (!phonology) {
+    return null;
+  }
+
+  const mapped: MappedPhonology = {
+    hands: mapHands(phonology.nombre_mans, gloss, fileName, issues),
+    configuration: 'EMPTY',
+    configurationChanges: 'EMPTY',
+    relationBetweenArticulators: 'EMPTY',
+    location: 'EMPTY',
+    movementRelatedOrientation: 'EMPTY',
+    orientationRelatedToLocation: 'EMPTY',
+    orientationChange: 'EMPTY',
+    contactType: 'EMPTY',
+    movementType: 'EMPTY',
+    movementDirection: 'EMPTY',
+    vocalization: phonology.vocalitzacio?.trim() || '',
+    nonManualComponent: phonology.component_no_manual?.trim() || '',
+    inicialization: '',
+    repeatedMovement: false,
+  };
+
+  for (const { jsonKey, mappingField, videoDataKey } of PHONOLOGY_FIELDS) {
+    mapped[videoDataKey] = resolveEnumValue(
+      mappingField,
+      phonology[jsonKey],
+      gloss,
+      fileName,
+      `phonology.${String(jsonKey)}`,
+      issues,
+      'EMPTY',
+    ) as never;
+  }
+
+  const dominant = phonology.configuracio_ma_dominant;
+  if (dominant && mapped.configuration === 'EMPTY') {
+    mapped.configuration = resolveEnumValue(
+      'configuration',
+      dominant,
+      gloss,
+      fileName,
+      'phonology.configuracio_ma_dominant',
+      issues,
+      'EMPTY',
+    );
+  }
+
+  const repeated = resolveFitxaEnum('repeatedMovement', phonology.moviment_repetit);
+  if (phonology.moviment_repetit && repeated.value == null) {
+    issues.push({
+      gloss,
+      fileName,
+      field: 'phonology.moviment_repetit',
+      value: String(phonology.moviment_repetit),
+      message: 'Invalid repeated movement value; stored as false',
+    });
+  }
+  mapped.repeatedMovement = Boolean(repeated.value);
+
+  return mapped;
+}
+
+export function mapFitxa(fitxa: FitxaJson, fileName: string): MappedFitxa | { error: ImportIssue } {
+  const gloss = fitxa.name?.trim();
+  if (!gloss) {
+    return {
+      error: {
+        gloss: '',
+        fileName,
+        field: 'name',
+        value: '',
+        message: 'Missing gloss name',
+      },
+    };
+  }
+
+  const issues: ImportIssue[] = [];
+  const defaultCategory = mapLexicalCategory(
+    fitxa.lexical_category,
+    gloss,
+    fileName,
+    issues,
+  );
+
+  const definitionLines = (fitxa.definitions?.length ? fitxa.definitions : fitxa.definition ? [fitxa.definition] : [])
+    .map((line) => line.trim())
+    .filter(Boolean);
+
+  const definitions = definitionLines.map((line) =>
+    parseDefinitionLine(line, gloss, fileName, issues, defaultCategory),
+  );
+
+  const translations: MappedFitxa['translations'] = [];
+  for (const translation of splitTranslations(fitxa.tr_ca)) {
+    translations.push({ language: 'CATALAN', translation });
+  }
+  for (const translation of splitTranslations(fitxa.tr_es)) {
+    translations.push({ language: 'SPANISH', translation });
+  }
+  for (const translation of splitTranslations(fitxa.tr_en)) {
+    translations.push({ language: 'ENGLISH', translation });
+  }
+
+  const relations: MappedFitxa['relations'] = [];
+  for (const [key, targets] of Object.entries(fitxa.related_signs || {})) {
+    const type = mapRelationType(key, gloss, fileName, issues);
+    if (!type) continue;
+    for (const target of targets || []) {
+      if (target?.trim() && target.trim() !== gloss) {
+        relations.push({ type, targetGloss: target.trim() });
+      }
+    }
+  }
+
+  const minimalPairs: MappedFitxa['minimalPairs'] = [];
+  for (const pair of fitxa.minimal_pairs || []) {
+    if (!pair.sign?.trim()) continue;
+    minimalPairs.push({
+      targetGloss: pair.sign.trim(),
+      distinction: pair.description?.trim() || '',
+    });
+  }
+
+  const phonology = mapPhonology(fitxa.phonology, gloss, fileName, issues);
+  const hasVideo = Boolean(fitxa.video_url?.trim());
+
+  return {
+    fileName,
+    gloss,
+    notes: fitxa.notes?.trim() || null,
+    translations,
+    definitions,
+    phonology: phonology || (hasVideo ? mapPhonology({}, gloss, fileName, issues) : null),
+    videoUrl: fitxa.video_url?.trim() || null,
+    relations,
+    minimalPairs,
+    linkedGlossNames: collectLinkedNames(fitxa),
+    issues,
+  };
+}
diff --git a/backend/src/bulk-import/fitxa.types.ts b/backend/src/bulk-import/fitxa.types.ts
new file mode 100644
index 0000000..b7c1e50
--- /dev/null
+++ b/backend/src/bulk-import/fitxa.types.ts
@@ -0,0 +1,121 @@
+export interface FitxaPhonology {
+  nombre_mans?: string | null;
+  configuracio?: string | null;
+  configuracio_ma_dominant?: string | null;
+  configuracio_ma_no_dominant?: string | null;
+  canvi_configuracio?: string | null;
+  relacio_articuladors?: string | null;
+  relacio_articuladors_ma_dominant?: string | null;
+  relacio_articuladors_ma_no_dominant?: string | null;
+  localitzacio?: string | null;
+  orientacio_moviment?: string | null;
+  orientacio_localitzacio?: string | null;
+  canvi_orientacio?: string | null;
+  tipus_contacte?: string | null;
+  forma_moviment?: string | null;
+  direccio_moviment?: string | null;
+  moviment_repetit?: string | null;
+  vocalitzacio?: string | null;
+  component_no_manual?: string | null;
+}
+
+export interface FitxaMinimalPair {
+  sign?: string | null;
+  description?: string | null;
+}
+
+export interface FitxaJson {
+  id?: string;
+  name?: string;
+  tr_en?: string;
+  tr_es?: string;
+  tr_ca?: string;
+  definitions?: string[];
+  definition?: string;
+  lexical_category?: string;
+  phonology?: FitxaPhonology;
+  minimal_pairs?: FitxaMinimalPair[];
+  related_signs?: Record<string, string[]>;
+  notes?: string | null;
+  video_url?: string | null;
+  is_compound?: boolean;
+  compound_signs?: string[];
+  morfologia_sequencial?: {
+    compost_1?: string | null;
+    compost_2?: string | null;
+    compost_3?: string | null;
+  };
+}
+
+export interface ImportIssue {
+  gloss: string;
+  fileName: string;
+  field: string;
+  value: string;
+  message: string;
+}
+
+export interface ImportDuplicate {
+  gloss: string;
+  fileName: string;
+  existingGlossId: string;
+  reason: string;
+}
+
+export interface BulkImportResult {
+  created: number;
+  updated: number;
+  stubsCreated: number;
+  skipped: number;
+  relationsCreated: number;
+  errors: ImportIssue[];
+  duplicates: ImportDuplicate[];
+}
+
+export interface MappedDefinition {
+  title: string | null;
+  definition: string;
+  lexicalCategory: string;
+}
+
+export interface MappedRelation {
+  type: string;
+  targetGloss: string;
+}
+
+export interface MappedMinimalPair {
+  targetGloss: string;
+  distinction: string;
+}
+
+export interface MappedPhonology {
+  hands: string;
+  configuration: string;
+  configurationChanges: string;
+  relationBetweenArticulators: string;
+  location: string;
+  movementRelatedOrientation: string;
+  orientationRelatedToLocation: string;
+  orientationChange: string;
+  contactType: string;
+  movementType: string;
+  movementDirection: string;
+  vocalization: string;
+  nonManualComponent: string;
+  inicialization: string;
+  repeatedMovement: boolean;
+}
+
+export interface MappedFitxa {
+  fileName: string;
+  gloss: string;
+  notes: string | null;
+  translations: Array<{ language: 'CATALAN' | 'SPANISH' | 'ENGLISH'; translation: string }>;
+  definitions: MappedDefinition[];
+  phonology: MappedPhonology | null;
+  videoUrl: string | null;
+  relations: MappedRelation[];
+  minimalPairs: MappedMinimalPair[];
+  linkedGlossNames: string[];
+  issues: ImportIssue[];
+}
diff --git a/backend/src/bulk-import/fixtures/bessons-test.json b/backend/src/bulk-import/fixtures/bessons-test.json
new file mode 100644
index 0000000..e9443da
--- /dev/null
+++ b/backend/src/bulk-import/fixtures/bessons-test.json
@@ -0,0 +1,36 @@
+{
+  "id": "test_bessons",
+  "name": "BESSONS-TEST",
+  "tr_en": "TWINS",
+  "tr_es": "GEMELOS",
+  "tr_ca": "BESSONS",
+  "definitions": [
+    "Adj- Nat d’un mateix part, amb un altre o altres"
+  ],
+  "lexical_category": "Adjectiu",
+  "phonology": {
+    "nombre_mans": "1",
+    "configuracio": "2 (beak2_open_spread)",
+    "localitzacio": "Espai neutre",
+    "moviment_repetit": "No"
+  },
+  "minimal_pairs": [],
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": [],
+    "VARIANT": ["BESSONS-T-ANTIGA"],
+    "ANTÒNIM": [],
+    "HIPÒNIM": [],
+    "HIPERÒNIM": [],
+    "VEURE TAMBÉ": []
+  },
+  "notes": "Fitxa de prova de compost: GERMÀ-TEST + SEGON-TEST",
+  "video_url": null,
+  "is_compound": true,
+  "compound_signs": ["GERMÀ-TEST", "SEGON-TEST"],
+  "morfologia_sequencial": {
+    "compost_1": "GERMÀ-TEST",
+    "compost_2": "SEGON-TEST",
+    "compost_3": null
+  }
+}
diff --git a/backend/src/bulk-import/fixtures/casa-test.json b/backend/src/bulk-import/fixtures/casa-test.json
new file mode 100644
index 0000000..fe61461
--- /dev/null
+++ b/backend/src/bulk-import/fixtures/casa-test.json
@@ -0,0 +1,31 @@
+{
+  "id": "test_casa",
+  "name": "CASA-TEST",
+  "tr_en": "HOUSE",
+  "tr_es": "CASA",
+  "tr_ca": "CASA",
+  "definitions": [
+    "Nom – Edifici destinat a habitatge."
+  ],
+  "lexical_category": "Nom",
+  "phonology": {
+    "nombre_mans": "2s",
+    "configuracio": "B (B)",
+    "localitzacio": "Espai neutre",
+    "moviment_repetit": "No"
+  },
+  "minimal_pairs": [],
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": [],
+    "VARIANT": ["CASA-ANTIGA"],
+    "ANTÒNIM": [],
+    "HIPÒNIM": ["PIS-TEST"],
+    "HIPERÒNIM": ["EDIFICI-TEST"],
+    "VEURE TAMBÉ": ["FINESTRA-TEST", "PORTA-TEST"]
+  },
+  "notes": "Fitxa de prova per stubs de relacions",
+  "video_url": null,
+  "is_compound": false,
+  "compound_signs": []
+}
diff --git a/backend/src/bulk-import/fixtures/gos-test.json b/backend/src/bulk-import/fixtures/gos-test.json
new file mode 100644
index 0000000..343370d
--- /dev/null
+++ b/backend/src/bulk-import/fixtures/gos-test.json
@@ -0,0 +1,37 @@
+{
+  "id": "test_gos",
+  "name": "GOS-TEST",
+  "tr_en": "DOG",
+  "tr_es": "PERRO",
+  "tr_ca": "GOS",
+  "definitions": [
+    "Nom – Animal de companyia de l'espècie Canis familiaris."
+  ],
+  "lexical_category": "Nom",
+  "phonology": {
+    "nombre_mans": "1",
+    "configuracio": "Q (Beak)",
+    "localitzacio": "Boca",
+    "canvi_orientacio": "Extensió > Flexió",
+    "moviment_repetit": "Sí"
+  },
+  "minimal_pairs": [
+    {
+      "sign": "GAT-TEST",
+      "description": "Configuració diferent"
+    }
+  ],
+  "related_signs": {
+    "HOMÒNIM": [],
+    "SINÒNIM": ["CA-TEST"],
+    "VARIANT": [],
+    "ANTÒNIM": [],
+    "HIPÒNIM": [],
+    "HIPERÒNIM": ["ANIMAL-TEST"],
+    "VEURE TAMBÉ": []
+  },
+  "notes": "Fitxa de prova: sinònim, hiperònim i parell mínim inexistent",
+  "video_url": null,
+  "is_compound": false,
+  "compound_signs": []
+}
diff --git a/backend/src/import/fitxa-enum-resolver.ts b/backend/src/import/fitxa-enum-resolver.ts
index 7261123..a0bcda6 100644
--- a/backend/src/import/fitxa-enum-resolver.ts
+++ b/backend/src/import/fitxa-enum-resolver.ts
@@ -1,11 +1,28 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-const mappings = JSON.parse(
-  fs.readFileSync(path.join(__dirname, 'fitxa-enum-mappings.json'), 'utf8'),
-) as typeof import('./fitxa-enum-mappings.json');
+function loadMappings() {
+  const candidates = [
+    path.join(__dirname, 'fitxa-enum-mappings.json'),
+    path.join(process.cwd(), 'src/import/fitxa-enum-mappings.json'),
+    path.join(process.cwd(), 'dist/src/import/fitxa-enum-mappings.json'),
+  ];
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) {
+      return JSON.parse(fs.readFileSync(candidate, 'utf8'));
+    }
+  }
+  throw new Error(`fitxa-enum-mappings.json not found. Tried: ${candidates.join(', ')}`);
+}
+
+const mappings = loadMappings() as {
+  fields: Record<
+    string,
+    { entries?: Array<{ signbankId?: string; value?: boolean; aliases: string[] }> }
+  >;
+};
 
-export type FitxaMappingField = keyof typeof mappings.fields;
+export type FitxaMappingField = string;
 
 export interface EnumResolveResult<T = string> {
   value: T | null;
diff --git a/frontend/src/components/HeaderComponent.vue b/frontend/src/components/HeaderComponent.vue
index 9e1293d..3725423 100644
--- a/frontend/src/components/HeaderComponent.vue
+++ b/frontend/src/components/HeaderComponent.vue
@@ -84,6 +84,19 @@
             </q-item-section>
             <q-item-section>{{ translate('userManagement') }}</q-item-section>
           </q-item>
+
+          <q-item
+            clickable
+            v-ripple
+            :active="isActive('/bulk-import')"
+            active-class="nav-item-active"
+            @click="navigateTo('/bulk-import')"
+          >
+            <q-item-section avatar>
+              <q-icon name="upload_file" />
+            </q-item-section>
+            <q-item-section>{{ translate('bulkImport') }}</q-item-section>
+          </q-item>
         </template>
       </q-list>
 
diff --git a/frontend/src/components/loginComponent.vue b/frontend/src/components/loginComponent.vue
index e7ef270..8df2ef9 100644
--- a/frontend/src/components/loginComponent.vue
+++ b/frontend/src/components/loginComponent.vue
@@ -19,11 +19,8 @@
         />
       </q-card-section>
 
-      <q-card-section>
-        <q-form
-          class="q-gutter-md"
-          @submit="handleLogin"
-        >
+      <q-form @submit="handleLogin">
+        <q-card-section class="q-pt-none q-pb-sm">
           <q-input
             v-model="email"
             type="email"
@@ -39,6 +36,7 @@
 
           <q-input
             v-model="password"
+            class="q-mt-md"
             :type="isPwd ? 'password' : 'text'"
             autocomplete="current-password"
             :label="translate('password')"
@@ -58,26 +56,30 @@
             </template>
           </q-input>
 
-          <div class="row justify-between items-center">
+          <div class="row items-center q-mt-sm">
             <q-btn
               flat
               dense
+              no-caps
               color="primary"
               :label="translate('forgotPassword')"
               tabindex="-1"
             />
           </div>
+        </q-card-section>
 
+        <q-card-actions class="q-px-md q-pb-md">
           <q-btn
             type="submit"
             color="primary"
             :label="translate('login')"
-            class="full-width q-mt-sm"
+            class="full-width"
             unelevated
+            no-caps
             :loading="isLoading"
           />
-        </q-form>
-      </q-card-section>
+        </q-card-actions>
+      </q-form>
     </q-card>
   </q-dialog>
 </template>
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index c5882f7..0228b01 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -426,6 +426,29 @@ const translations: TranslateKeys = {
   createGlossHint: 'Després creareu la definició, el vídeo i la traducció en un procés guiat pas a pas.',
   requestAlreadyAccepted: 'Aquesta sol·licitud ja ha estat acceptada. El contingut és només de lectura.',
   requestAlreadyReviewed: 'Aquesta sol·licitud ja ha estat revisada. El contingut és només de lectura.',
+  bulkImport: 'Importació en massa',
+  bulkImportDescription: 'Pugeu fitxers JSON de fitxes. Les gloses enllaçades que no existeixin es crearan buides (només el nom). Si una glosa té errors (p. ex. enums invàlids), no s\'insereix i queda a la llista d\'errors.',
+  bulkImportSelectFiles: 'Seleccioneu fitxers JSON',
+  bulkImportLimitsHint: 'Màxim 2000 fitxers, 5 MB per fitxer i 20 MB en total.',
+  bulkImportOverwrite: 'Sobreescriure tot',
+  bulkImportOverwriteHint: 'Si està actiu, les gloses existents es substitueixen. Si no, es salten i apareixen a la llista de duplicats.',
+  bulkImportStart: 'Importar',
+  bulkImportCreated: 'Creades',
+  bulkImportUpdated: 'Actualitzades',
+  bulkImportStubs: 'Buides creades',
+  bulkImportSkipped: 'Omeses',
+  bulkImportErrors: 'Errors',
+  bulkImportDuplicates: 'Duplicats',
+  bulkImportNoErrors: 'No s\'han detectat errors.',
+  bulkImportNoDuplicates: 'No s\'han detectat duplicats.',
+  bulkImportFile: 'Fitxer',
+  bulkImportField: 'Camp',
+  bulkImportValue: 'Valor',
+  bulkImportMessage: 'Missatge',
+  bulkImportFinished: 'Importació finalitzada',
+  bulkImportFailed: 'La importació ha fallat',
+  bulkImportOverwriteOne: 'Sobreescriure',
+  bulkImportOverwriteOneDone: 'Glossa sobreescrita',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index 723dc33..4636468 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -340,6 +340,31 @@ const translations: TranslateKeys = {
   next: 'Next',
   back: 'Back',
   exitEditMode: 'Exit edit mode',
+  requestAlreadyAccepted: 'This request has already been accepted. The content is read-only.',
+  requestAlreadyReviewed: 'This request has already been reviewed. The content is read-only.',
+  bulkImport: 'Bulk import',
+  bulkImportDescription: 'Upload fitxa JSON files. Linked glosses that do not exist are created empty (name only). If a gloss has errors (e.g. invalid enums), it is not inserted and is listed under errors.',
+  bulkImportSelectFiles: 'Select JSON files',
+  bulkImportLimitsHint: 'Maximum 2000 files, 5 MB per file and 20 MB in total.',
+  bulkImportOverwrite: 'Overwrite everything',
+  bulkImportOverwriteHint: 'When enabled, existing glosses are replaced. When disabled, they are skipped and listed as duplicates.',
+  bulkImportStart: 'Import',
+  bulkImportCreated: 'Created',
+  bulkImportUpdated: 'Updated',
+  bulkImportStubs: 'Empty stubs',
+  bulkImportSkipped: 'Skipped',
+  bulkImportErrors: 'Errors',
+  bulkImportDuplicates: 'Duplicates',
+  bulkImportNoErrors: 'No errors detected.',
+  bulkImportNoDuplicates: 'No duplicates detected.',
+  bulkImportFile: 'File',
+  bulkImportField: 'Field',
+  bulkImportValue: 'Value',
+  bulkImportMessage: 'Message',
+  bulkImportFinished: 'Import finished',
+  bulkImportFailed: 'Import failed',
+  bulkImportOverwriteOne: 'Overwrite',
+  bulkImportOverwriteOneDone: 'Gloss overwritten',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 7938142..f8be16c 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -358,6 +358,29 @@ const translations: TranslateKeys = {
   createGlossHint: 'Después crearás la definición, el vídeo y la traducción en un proceso guiado paso a paso.',
   requestAlreadyAccepted: 'Esta solicitud ya ha sido aceptada. El contenido es solo de lectura.',
   requestAlreadyReviewed: 'Esta solicitud ya ha sido revisada. El contenido es solo de lectura.',
+  bulkImport: 'Importación masiva',
+  bulkImportDescription: 'Sube archivos JSON de fichas. Las glosas enlazadas que no existan se crearán vacías (solo el nombre). Si una glosa tiene errores (p. ej. enums inválidos), no se inserta y queda en la lista de errores.',
+  bulkImportSelectFiles: 'Selecciona archivos JSON',
+  bulkImportLimitsHint: 'Máximo 2000 archivos, 5 MB por archivo y 20 MB en total.',
+  bulkImportOverwrite: 'Sobrescribir todo',
+  bulkImportOverwriteHint: 'Si está activo, se sustituyen las glosas existentes. Si no, se omiten y aparecen en la lista de duplicados.',
+  bulkImportStart: 'Importar',
+  bulkImportCreated: 'Creadas',
+  bulkImportUpdated: 'Actualizadas',
+  bulkImportStubs: 'Vacías creadas',
+  bulkImportSkipped: 'Omitidas',
+  bulkImportErrors: 'Errores',
+  bulkImportDuplicates: 'Duplicados',
+  bulkImportNoErrors: 'No se han detectado errores.',
+  bulkImportNoDuplicates: 'No se han detectado duplicados.',
+  bulkImportFile: 'Archivo',
+  bulkImportField: 'Campo',
+  bulkImportValue: 'Valor',
+  bulkImportMessage: 'Mensaje',
+  bulkImportFinished: 'Importación finalizada',
+  bulkImportFailed: 'La importación ha fallado',
+  bulkImportOverwriteOne: 'Sobrescribir',
+  bulkImportOverwriteOneDone: 'Glosa sobrescrita',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index 923db66..afecef3 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -874,6 +874,29 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   createGlossHint: string;
   requestAlreadyAccepted: string;
   requestAlreadyReviewed: string;
+  bulkImport: string;
+  bulkImportDescription: string;
+  bulkImportSelectFiles: string;
+  bulkImportLimitsHint: string;
+  bulkImportOverwrite: string;
+  bulkImportOverwriteHint: string;
+  bulkImportStart: string;
+  bulkImportCreated: string;
+  bulkImportUpdated: string;
+  bulkImportStubs: string;
+  bulkImportSkipped: string;
+  bulkImportErrors: string;
+  bulkImportDuplicates: string;
+  bulkImportNoErrors: string;
+  bulkImportNoDuplicates: string;
+  bulkImportFile: string;
+  bulkImportField: string;
+  bulkImportValue: string;
+  bulkImportMessage: string;
+  bulkImportFinished: string;
+  bulkImportFailed: string;
+  bulkImportOverwriteOne: string;
+  bulkImportOverwriteOneDone: string;
 }
 
 export default TranslateKeys;
\ No newline at end of file
diff --git a/frontend/src/pages/BulkImportPage.vue b/frontend/src/pages/BulkImportPage.vue
new file mode 100644
index 0000000..81f0fe4
--- /dev/null
+++ b/frontend/src/pages/BulkImportPage.vue
@@ -0,0 +1,283 @@
+<template>
+  <q-page class="q-pa-md">
+    <div class="text-h4 q-mb-md">{{ translate('bulkImport') }}</div>
+    <p class="text-body1 text-grey-8 q-mb-lg">
+      {{ translate('bulkImportDescription') }}
+    </p>
+
+    <q-card flat bordered class="q-mb-lg">
+      <q-card-section>
+        <q-file
+          v-model="files"
+          multiple
+          accept=".json,application/json"
+          :label="translate('bulkImportSelectFiles')"
+          outlined
+          use-chips
+          counter
+          :max-files="MAX_FILES"
+          :max-file-size="MAX_FILE_SIZE"
+          :max-total-size="MAX_TOTAL_SIZE"
+          :disable="loading"
+          @rejected="onFilesRejected"
+        >
+          <template #prepend>
+            <q-icon name="attach_file" />
+          </template>
+        </q-file>
+        <div class="text-caption text-grey-7 q-mt-xs">
+          {{ translate('bulkImportLimitsHint') }}
+        </div>
+
+        <q-checkbox
+          v-model="overwriteAll"
+          class="q-mt-md"
+          :disable="loading"
+          :label="translate('bulkImportOverwrite')"
+        />
+        <div class="text-caption text-grey-7 q-ml-lg">
+          {{ translate('bulkImportOverwriteHint') }}
+        </div>
+      </q-card-section>
+
+      <q-card-actions align="right">
+        <q-btn
+          color="primary"
+          unelevated
+          icon="upload"
+          :label="translate('bulkImportStart')"
+          :loading="loading"
+          :disable="!files.length"
+          @click="runImport"
+        />
+      </q-card-actions>
+    </q-card>
+
+    <div v-if="result" class="column q-gutter-md">
+      <div class="row q-gutter-sm">
+        <q-banner class="bg-positive text-white col">
+          {{ translate('bulkImportCreated') }}: {{ result.created }}
+        </q-banner>
+        <q-banner class="bg-info text-white col">
+          {{ translate('bulkImportUpdated') }}: {{ result.updated }}
+        </q-banner>
+        <q-banner class="bg-secondary col">
+          {{ translate('bulkImportStubs') }}: {{ result.stubsCreated }}
+        </q-banner>
+        <q-banner class="bg-warning col">
+          {{ translate('bulkImportSkipped') }}: {{ result.skipped }}
+        </q-banner>
+        <q-banner class="bg-grey-4 col">
+          {{ translate('relatedGlosses') }}: {{ result.relationsCreated }}
+        </q-banner>
+      </div>
+
+      <q-card flat bordered>
+        <q-card-section>
+          <div class="text-h6 q-mb-sm">
+            {{ translate('bulkImportErrors') }} ({{ result.errors.length }})
+          </div>
+          <q-table
+            v-if="result.errors.length"
+            :rows="errorRows"
+            :columns="errorColumns"
+            row-key="rowKey"
+            flat
+            :pagination="{ rowsPerPage: 10 }"
+          />
+          <div v-else class="text-grey-7">{{ translate('bulkImportNoErrors') }}</div>
+        </q-card-section>
+      </q-card>
+
+      <q-card flat bordered>
+        <q-card-section>
+          <div class="text-h6 q-mb-sm">
+            {{ translate('bulkImportDuplicates') }} ({{ result.duplicates.length }})
+          </div>
+          <q-table
+            v-if="result.duplicates.length"
+            :rows="duplicateRows"
+            :columns="duplicateColumns"
+            row-key="rowKey"
+            flat
+            :pagination="{ rowsPerPage: 10 }"
+          >
+            <template #body-cell-actions="props">
+              <q-td :props="props">
+                <q-btn
+                  color="primary"
+                  unelevated
+                  dense
+                  size="sm"
+                  :label="translate('bulkImportOverwriteOne')"
+                  :loading="overwritingGloss === props.row.gloss"
+                  :disable="loading || Boolean(overwritingGloss)"
+                  @click="overwriteDuplicate(props.row)"
+                />
+              </q-td>
+            </template>
+          </q-table>
+          <div v-else class="text-grey-7">{{ translate('bulkImportNoDuplicates') }}</div>
+        </q-card-section>
+      </q-card>
+    </div>
+  </q-page>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
+import translate from 'src/utils/translate';
+import { api } from 'src/services/api';
+import useUserStore from 'src/stores/user.store';
+
+interface ImportIssue {
+  gloss: string;
+  fileName: string;
+  field: string;
+  value: string;
+  message: string;
+}
+
+interface ImportDuplicate {
+  gloss: string;
+  fileName: string;
+  existingGlossId: string;
+  reason: string;
+}
+
+interface BulkImportResult {
+  created: number;
+  updated: number;
+  stubsCreated: number;
+  skipped: number;
+  relationsCreated: number;
+  errors: ImportIssue[];
+  duplicates: ImportDuplicate[];
+}
+
+const router = useRouter();
+const $q = useQuasar();
+const userStore = useUserStore();
+
+const MAX_FILES = 2000;
+const MAX_FILE_SIZE = 5 * 1024 * 1024;
+const MAX_TOTAL_SIZE = 20 * 1024 * 1024;
+
+const files = ref<File[]>([]);
+const overwriteAll = ref(false);
+const loading = ref(false);
+const overwritingGloss = ref<string | null>(null);
+const result = ref<BulkImportResult | null>(null);
+
+const errorColumns = [
+  { name: 'gloss', label: translate('gloss'), field: 'gloss', align: 'left' as const, sortable: true },
+  { name: 'fileName', label: translate('bulkImportFile'), field: 'fileName', align: 'left' as const, sortable: true },
+  { name: 'field', label: translate('bulkImportField'), field: 'field', align: 'left' as const, sortable: true },
+  { name: 'value', label: translate('bulkImportValue'), field: 'value', align: 'left' as const },
+  { name: 'message', label: translate('bulkImportMessage'), field: 'message', align: 'left' as const },
+];
+
+const duplicateColumns = [
+  { name: 'gloss', label: translate('gloss'), field: 'gloss', align: 'left' as const, sortable: true },
+  { name: 'fileName', label: translate('bulkImportFile'), field: 'fileName', align: 'left' as const, sortable: true },
+  { name: 'reason', label: translate('bulkImportMessage'), field: 'reason', align: 'left' as const },
+  { name: 'actions', label: translate('actions'), field: 'actions', align: 'right' as const },
+];
+
+const errorRows = computed(() =>
+  (result.value?.errors || []).map((error, index) => ({
+    ...error,
+    rowKey: `${error.fileName}-${error.field}-${index}`,
+  })),
+);
+
+const duplicateRows = computed(() =>
+  (result.value?.duplicates || []).map((duplicate, index) => ({
+    ...duplicate,
+    rowKey: `${duplicate.fileName}-${duplicate.gloss}-${index}`,
+  })),
+);
+
+onMounted(() => {
+  if (!userStore.isAdmin) {
+    router.push('/').catch((err) => console.error(err));
+  }
+});
+
+const overwriteDuplicate = async (duplicate: ImportDuplicate) => {
+  const selected = Array.isArray(files.value) ? files.value : files.value ? [files.value] : [];
+  if (!selected.length || !result.value) return;
+
+  overwritingGloss.value = duplicate.gloss;
+  try {
+    const response = await api.bulkImport.importFitxas(selected, false, [duplicate.gloss]);
+    const single = response.data as BulkImportResult;
+    result.value.duplicates = result.value.duplicates.filter(
+      (row) => row.gloss !== duplicate.gloss,
+    );
+    result.value.updated += single.updated;
+    result.value.stubsCreated += single.stubsCreated;
+    result.value.relationsCreated += single.relationsCreated;
+    result.value.skipped = Math.max(0, result.value.skipped - 1);
+    result.value.errors.push(...single.errors);
+    $q.notify({
+      type: single.errors.length ? 'warning' : 'positive',
+      message: translate('bulkImportOverwriteOneDone'),
+    });
+  } catch (error) {
+    console.error(error);
+    $q.notify({
+      type: 'negative',
+      message: translate('bulkImportFailed'),
+    });
+  } finally {
+    overwritingGloss.value = null;
+  }
+};
+
+const onFilesRejected = () => {
+  $q.notify({
+    type: 'warning',
+    message: translate('bulkImportLimitsHint'),
+  });
+};
+
+const runImport = async () => {
+    const selected = Array.isArray(files.value) ? files.value : files.value ? [files.value] : [];
+    if (!selected.length) return;
+
+    const totalSize = selected.reduce((sum, file) => sum + file.size, 0);
+    if (
+      selected.length > MAX_FILES ||
+      selected.some((file) => file.size > MAX_FILE_SIZE) ||
+      totalSize > MAX_TOTAL_SIZE
+    ) {
+      $q.notify({
+        type: 'warning',
+        message: translate('bulkImportLimitsHint'),
+      });
+      return;
+    }
+
+    loading.value = true;
+    result.value = null;
+    try {
+    const response = await api.bulkImport.importFitxas(selected, overwriteAll.value);
+    result.value = response.data;
+    $q.notify({
+      type: 'positive',
+      message: translate('bulkImportFinished'),
+    });
+  } catch (error) {
+    console.error(error);
+    $q.notify({
+      type: 'negative',
+      message: translate('bulkImportFailed'),
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+</script>
diff --git a/frontend/src/router/routes.ts b/frontend/src/router/routes.ts
index 18a2ffc..e9c5d08 100644
--- a/frontend/src/router/routes.ts
+++ b/frontend/src/router/routes.ts
@@ -41,6 +41,13 @@ const routes: RouteRecordRaw[] = [
       { path: '', component: () => import('pages/UserManagementPage.vue') },
     ],
   },
+  {
+    path: '/bulk-import',
+    component: () => import('layouts/MainLayout.vue'),
+    children: [
+      { path: '', component: () => import('pages/BulkImportPage.vue') },
+    ],
+  },
 
   // Always leave this as last one,
   // but you can also remove it
diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts
index 27b8f84..a9d6d6d 100644
--- a/frontend/src/services/api.ts
+++ b/frontend/src/services/api.ts
@@ -209,6 +209,17 @@ export const api = {
     changePassword: (userId: string, newPassword: string) =>
       apiClient.put(`/users/${userId}/password`, { newPassword }),
   },
+  bulkImport: {
+    importFitxas: (files: File[], overwriteAll: boolean, overwriteGlosses: string[] = []) => {
+      const formData = new FormData()
+      files.forEach((file) => formData.append('files', file))
+      formData.append('overwriteAll', String(overwriteAll))
+      formData.append('overwriteGlosses', JSON.stringify(overwriteGlosses))
+      return apiClient.post('/bulk-import', formData, {
+        timeout: 10 * 60 * 1000,
+      })
+    },
+  },
 }
 
 export default api
\ No newline at end of file

From d24acee29a23f8ec309b266e28c42d11c1583857 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Mon, 17 Aug 2026 17:17:25 +0200
Subject: [PATCH 15/17] fix: bulk import

---
 .../src/bulk-import/bulk-import.service.ts    | 178 +++++++++++++++---
 backend/src/bulk-import/fitxa-mapper.ts       | 147 +++++++++++++--
 backend/src/bulk-import/fitxa.types.ts        |  45 ++++-
 3 files changed, 325 insertions(+), 45 deletions(-)

diff --git a/backend/src/bulk-import/bulk-import.service.ts b/backend/src/bulk-import/bulk-import.service.ts
index a008682..1c14940 100644
--- a/backend/src/bulk-import/bulk-import.service.ts
+++ b/backend/src/bulk-import/bulk-import.service.ts
@@ -19,12 +19,11 @@ import {
 } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.service';
 import { TypesenseService } from '../typesense/typesense.service';
-import { mapFitxa } from './fitxa-mapper';
+import { mapFitxa, extractFitxas } from './fitxa-mapper';
 import type {
   BulkImportResult,
-  FitxaJson,
-  ImportDuplicate,
   ImportIssue,
+  MappedCompoundPart,
   MappedFitxa,
   MappedPhonology,
 } from './fitxa.types';
@@ -127,10 +126,24 @@ export class BulkImportService {
         continue;
       }
 
-      const items = Array.isArray(parsed) ? parsed : [parsed];
+      const items = extractFitxas(parsed);
+      if (!items.length) {
+        errors.push({
+          gloss: '',
+          fileName: file.originalname,
+          field: 'file',
+          value: file.originalname,
+          message: 'No fitxa entries found in JSON file',
+        });
+        continue;
+      }
+
       for (const [index, item] of items.entries()) {
-        const fileName = items.length > 1 ? `${file.originalname}[${index}]` : file.originalname;
-        const result = mapFitxa(item as FitxaJson, fileName);
+        const fileName =
+          items.length > 1
+            ? `${file.originalname}[${item.gloss_id || item.id || index}]`
+            : file.originalname;
+        const result = mapFitxa(item, fileName);
         if ('error' in result) {
           errors.push(result.error);
           continue;
@@ -211,6 +224,7 @@ export class BulkImportService {
     }
 
     await this.ensureLinks(glossId, fitxa, index, result);
+    await this.syncCompoundParts(glossId, fitxa, index, result);
   }
 
   private async ensureGloss(
@@ -240,6 +254,9 @@ export class BulkImportService {
     const created = await this.prisma.glossData.create({
       data: {
         gloss: fitxa.gloss,
+        externalId: fitxa.externalId,
+        isCompound: fitxa.isCompound,
+        iconicity: fitxa.iconicity,
         editComment: fitxa.notes,
         dictionaryEntry: {
           create: { status: GlossStatus.PUBLISHED },
@@ -260,6 +277,9 @@ export class BulkImportService {
         where: { id: glossDataId },
         data: {
           gloss: fitxa.gloss,
+          externalId: fitxa.externalId,
+          isCompound: fitxa.isCompound,
+          iconicity: fitxa.iconicity,
           editComment: fitxa.notes,
           glossTranslations: nested.glossTranslations,
           definitions: nested.definitions,
@@ -304,6 +324,7 @@ export class BulkImportService {
     await tx.glossTranslation.deleteMany({ where: { glossDataId } });
     await tx.relatedGloss.deleteMany({ where: { sourceGlossId: glossDataId } });
     await tx.minimalPair.deleteMany({ where: { sourceGlossId: glossDataId } });
+    await this.clearCompoundParts(tx, glossDataId);
   }
 
   private glossNestedCreate(fitxa: MappedFitxa) {
@@ -338,29 +359,7 @@ export class BulkImportService {
       title: gloss,
       priority: 0,
       videoData: {
-        create: {
-          handedness: phonology.handedness as Handedness,
-          dominantConfiguration: phonology.dominantConfiguration as HandConfiguration | null,
-          nonDominantConfiguration: phonology.nonDominantConfiguration as HandConfiguration | null,
-          dominantRelationBetweenArticulators:
-            phonology.dominantRelationBetweenArticulators as RelationBetweenArticulators | null,
-          nonDominantRelationBetweenArticulators:
-            phonology.nonDominantRelationBetweenArticulators as RelationBetweenArticulators | null,
-          configurationChanges: phonology.configurationChanges as ConfigurationChange,
-          location: phonology.location as Location,
-          movementRelatedOrientation:
-            phonology.movementRelatedOrientation as MovementRelatedOrientation,
-          orientationRelatedToLocation:
-            phonology.orientationRelatedToLocation as OrientationRelatedToLocation,
-          orientationChange: phonology.orientationChange as OrientationChange,
-          contactType: phonology.contactType as ContactType,
-          movementType: phonology.movementType as MovementType,
-          movementDirection: phonology.movementDirection as MovementDirection,
-          vocalization: phonology.vocalization,
-          nonManualComponent: phonology.nonManualComponent,
-          inicialization: phonology.inicialization,
-          repeatedMovement: phonology.repeatedMovement,
-        },
+        create: this.videoDataCreate(phonology),
       },
       videos: videoUrl
         ? {
@@ -370,6 +369,32 @@ export class BulkImportService {
     };
   }
 
+  private videoDataCreate(phonology: MappedPhonology) {
+    return {
+      handedness: phonology.handedness as Handedness,
+      dominantConfiguration: phonology.dominantConfiguration as HandConfiguration | null,
+      nonDominantConfiguration: phonology.nonDominantConfiguration as HandConfiguration | null,
+      dominantRelationBetweenArticulators:
+        phonology.dominantRelationBetweenArticulators as RelationBetweenArticulators | null,
+      nonDominantRelationBetweenArticulators:
+        phonology.nonDominantRelationBetweenArticulators as RelationBetweenArticulators | null,
+      configurationChanges: phonology.configurationChanges as ConfigurationChange,
+      location: phonology.location as Location,
+      movementRelatedOrientation:
+        phonology.movementRelatedOrientation as MovementRelatedOrientation,
+      orientationRelatedToLocation:
+        phonology.orientationRelatedToLocation as OrientationRelatedToLocation,
+      orientationChange: phonology.orientationChange as OrientationChange,
+      contactType: phonology.contactType as ContactType,
+      movementType: phonology.movementType as MovementType,
+      movementDirection: phonology.movementDirection as MovementDirection,
+      vocalization: phonology.vocalization,
+      nonManualComponent: phonology.nonManualComponent,
+      inicialization: phonology.inicialization,
+      repeatedMovement: phonology.repeatedMovement,
+    };
+  }
+
   private async ensureLinks(
     sourceId: string,
     fitxa: MappedFitxa,
@@ -448,6 +473,101 @@ export class BulkImportService {
     }
   }
 
+  private async clearCompoundParts(tx: Prisma.TransactionClient, glossDataId: string) {
+    const parts = await tx.compoundPart.findMany({
+      where: { glossDataId },
+      select: { id: true, inlinePhonologyId: true, inlineSignVideoId: true },
+    });
+    if (!parts.length) return;
+
+    const signVideoIds = parts
+      .map((part) => part.inlineSignVideoId)
+      .filter((id): id is string => Boolean(id));
+    if (signVideoIds.length) {
+      await tx.video.deleteMany({ where: { signVideoId: { in: signVideoIds } } });
+      await tx.signVideo.deleteMany({ where: { id: { in: signVideoIds } } });
+    }
+
+    await tx.compoundPart.deleteMany({ where: { glossDataId } });
+
+    const phonologyIds = parts
+      .map((part) => part.inlinePhonologyId)
+      .filter((id): id is string => Boolean(id));
+    if (phonologyIds.length) {
+      await tx.videoData.deleteMany({ where: { id: { in: phonologyIds } } });
+    }
+  }
+
+  private async syncCompoundParts(
+    glossDataId: string,
+    fitxa: MappedFitxa,
+    index: Map<string, GlossIndexEntry>,
+    result: BulkImportResult,
+  ) {
+    await this.prisma.glossData.update({
+      where: { id: glossDataId },
+      data: { isCompound: fitxa.isCompound },
+    });
+
+    if (!fitxa.isCompound || !fitxa.compoundParts.length) {
+      await this.clearCompoundParts(this.prisma, glossDataId);
+      return;
+    }
+
+    await this.clearCompoundParts(this.prisma, glossDataId);
+
+    for (const part of fitxa.compoundParts) {
+      try {
+        await this.createCompoundPart(glossDataId, part, index);
+      } catch (error) {
+        result.errors.push({
+          gloss: fitxa.gloss,
+          fileName: fitxa.fileName,
+          field: 'compound',
+          value: part.gloss,
+          message: error instanceof Error ? error.message : 'Failed to create compound part',
+        });
+      }
+    }
+  }
+
+  private async createCompoundPart(
+    glossDataId: string,
+    part: MappedCompoundPart,
+    index: Map<string, GlossIndexEntry>,
+  ) {
+    const linkedGlossId = part.linked
+      ? index.get(this.glossKey(part.gloss))?.id ?? null
+      : null;
+
+    if (linkedGlossId) {
+      await this.prisma.compoundPart.create({
+        data: {
+          glossDataId,
+          position: part.position,
+          gloss: part.gloss,
+          compExternalId: part.compExternalId,
+          redundant: part.redundant,
+          linkedGlossId,
+        },
+      });
+      return;
+    }
+
+    await this.prisma.compoundPart.create({
+      data: {
+        glossDataId,
+        position: part.position,
+        gloss: part.gloss,
+        compExternalId: part.compExternalId,
+        redundant: part.redundant,
+        inlinePhonology: part.phonology
+          ? { create: this.videoDataCreate(part.phonology) }
+          : undefined,
+      },
+    });
+  }
+
   private glossKey(name: string): string {
     return name.trim().normalize('NFC').toUpperCase();
   }
diff --git a/backend/src/bulk-import/fitxa-mapper.ts b/backend/src/bulk-import/fitxa-mapper.ts
index f4996f0..4df3600 100644
--- a/backend/src/bulk-import/fitxa-mapper.ts
+++ b/backend/src/bulk-import/fitxa-mapper.ts
@@ -1,12 +1,13 @@
-import { Handedness } from '@prisma/client';
 import {
   resolveFitxaEnum,
   type FitxaMappingField,
 } from '../import/fitxa-enum-resolver';
 import type {
+  FitxaCompoundComponent,
   FitxaJson,
   FitxaPhonology,
   ImportIssue,
+  MappedCompoundPart,
   MappedFitxa,
   MappedPhonology,
 } from './fitxa.types';
@@ -52,6 +53,7 @@ const ENUM_FALLBACKS: Record<string, Record<string, string>> = {
   orientationChange: {
     'extensio > flexio': 'EXTENSION_TO_FLEXION',
     'flexio > extensio': 'FLEXION_TO_EXTENSION',
+    inclinacio: 'RADIAL_AND_ULNAR_FLEXION',
   },
 };
 
@@ -90,6 +92,8 @@ function splitCandidates(raw: string): string[] {
   return [trimmed, ...parts.filter((part) => part !== trimmed)];
 }
 
+const EMPTY_ENUM_LABELS = new Set(['no', 'none', 'n/a', 'na', 'cap', 'empty', '-']);
+
 function resolveEnumValue(
   field: FitxaMappingField,
   raw: string | null | undefined,
@@ -104,7 +108,15 @@ function resolveEnumValue(
   }
 
   const original = String(raw).trim();
-  for (const candidate of splitCandidates(original)) {
+  if (EMPTY_ENUM_LABELS.has(normalize(original))) {
+    return emptyValue;
+  }
+
+  const withoutParens = original.replace(/\([^)]*\)/g, ' ').replace(/\s+/g, ' ').trim();
+  const candidates = [...new Set([...splitCandidates(original), ...splitCandidates(withoutParens)])];
+
+  for (const candidate of candidates) {
+    if (!candidate) continue;
     const resolved = resolveFitxaEnum(field, candidate);
     if (resolved.value) {
       return String(resolved.value);
@@ -131,14 +143,14 @@ function mapHandedness(
   gloss: string,
   fileName: string,
   issues: ImportIssue[],
-): Handedness {
+): string {
   if (raw == null || String(raw).trim() === '') {
-    return Handedness.ONE;
+    return 'ONE';
   }
 
   const resolved = resolveFitxaEnum('handedness', raw);
   if (resolved.value) {
-    return resolved.value as Handedness;
+    return String(resolved.value);
   }
 
   issues.push({
@@ -148,7 +160,7 @@ function mapHandedness(
     value: String(raw),
     message: 'Invalid handedness code; stored as ONE',
   });
-  return Handedness.ONE;
+  return 'ONE';
 }
 
 function mapLexicalCategory(
@@ -169,6 +181,7 @@ function mapLexicalCategory(
 
   const normalized = normalize(String(raw));
   if (normalized === 'nom o verb') return 'NOUN_OR_VERB';
+  if (normalized === 'adjectiu o nom' || normalized === 'nom o adjectiu') return 'NOUN_OR_ADJECTIVE';
   if (normalized === 'adjectiu') return 'ADJECTIVE';
   if (normalized === 'nom') return 'NOUN';
   if (normalized === 'verb') return 'VERB';
@@ -275,11 +288,105 @@ function collectLinkedNames(fitxa: FitxaJson): string[] {
     if (part?.trim()) names.add(part.trim());
   }
 
+  for (const component of fitxa.compound?.components || []) {
+    if (component.name?.trim() && component.comp_id) {
+      names.add(component.name.trim());
+    }
+  }
+
   return [...names];
 }
 
+function firstVideoUrl(fitxa: FitxaJson): string | null {
+  const fromList = (fitxa.video_urls || [])
+    .map((item) => item.url?.trim())
+    .find((url): url is string => Boolean(url));
+  return fromList || fitxa.video_url?.trim() || null;
+}
+
+function mapCompoundParts(
+  fitxa: FitxaJson,
+  gloss: string,
+  fileName: string,
+  issues: ImportIssue[],
+): MappedCompoundPart[] {
+  const components = fitxa.compound?.components;
+  if (components?.length) {
+    return components
+      .map((component, index) => mapCompoundComponent(component, index, gloss, fileName, issues))
+      .filter((part): part is MappedCompoundPart => Boolean(part));
+  }
+
+  const v1Names = [
+    ...(fitxa.compound_signs || []),
+    fitxa.morfologia_sequencial?.compost_1,
+    fitxa.morfologia_sequencial?.compost_2,
+    fitxa.morfologia_sequencial?.compost_3,
+  ]
+    .map((name) => name?.trim())
+    .filter((name): name is string => Boolean(name));
+
+  return [...new Set(v1Names)].map((name, index) => ({
+    position: index + 1,
+    gloss: name,
+    compExternalId: null,
+    redundant: false,
+    linked: true,
+    phonology: null,
+  }));
+}
+
+function mapCompoundComponent(
+  component: FitxaCompoundComponent,
+  index: number,
+  gloss: string,
+  fileName: string,
+  issues: ImportIssue[],
+): MappedCompoundPart | null {
+  const name = component.name?.trim();
+  if (!name) return null;
+
+  const linked = Boolean(component.comp_id?.trim());
+  return {
+    position: component.ordinal ?? index + 1,
+    gloss: name,
+    compExternalId: component.comp_id?.trim() || null,
+    redundant: Boolean(component.redundant),
+    linked,
+    phonology: component.phonology
+      ? mapPhonology(component.phonology, `${gloss}/${name}`, fileName, issues)
+      : null,
+  };
+}
+
+export function isFitxaJson(value: unknown): value is FitxaJson {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return false;
+  }
+  const obj = value as Record<string, unknown>;
+  return (
+    typeof obj.gloss_name === 'string' ||
+    typeof obj.name === 'string' ||
+    typeof obj.gloss_id === 'string' ||
+    typeof obj.id === 'string'
+  );
+}
+
+export function extractFitxas(parsed: unknown): FitxaJson[] {
+  if (Array.isArray(parsed)) {
+    return parsed.filter(isFitxaJson);
+  }
+  if (isFitxaJson(parsed)) {
+    return [parsed];
+  }
+  if (!parsed || typeof parsed !== 'object') {
+    return [];
+  }
+  return Object.values(parsed as Record<string, unknown>).filter(isFitxaJson);
+}
+
 function mapPhonology(
-  phonology: FitxaPhonology | undefined,
+  phonology: FitxaPhonology | null | undefined,
   gloss: string,
   fileName: string,
   issues: ImportIssue[],
@@ -372,13 +479,13 @@ function mapPhonology(
 }
 
 export function mapFitxa(fitxa: FitxaJson, fileName: string): MappedFitxa | { error: ImportIssue } {
-  const gloss = fitxa.name?.trim();
+  const gloss = (fitxa.gloss_name || fitxa.name || '').trim();
   if (!gloss) {
     return {
       error: {
         gloss: '',
         fileName,
-        field: 'name',
+        field: 'gloss_name',
         value: '',
         message: 'Missing gloss name',
       },
@@ -401,14 +508,18 @@ export function mapFitxa(fitxa: FitxaJson, fileName: string): MappedFitxa | { er
     parseDefinitionLine(line, gloss, fileName, issues, defaultCategory),
   );
 
+  const catalan = fitxa.translations?.catalan ?? fitxa.tr_ca;
+  const spanish = fitxa.translations?.spanish ?? fitxa.tr_es;
+  const english = fitxa.translations?.english ?? fitxa.tr_en;
+
   const translations: MappedFitxa['translations'] = [];
-  for (const translation of splitTranslations(fitxa.tr_ca)) {
+  for (const translation of splitTranslations(catalan)) {
     translations.push({ language: 'CATALAN', translation });
   }
-  for (const translation of splitTranslations(fitxa.tr_es)) {
+  for (const translation of splitTranslations(spanish)) {
     translations.push({ language: 'SPANISH', translation });
   }
-  for (const translation of splitTranslations(fitxa.tr_en)) {
+  for (const translation of splitTranslations(english)) {
     translations.push({ language: 'ENGLISH', translation });
   }
 
@@ -433,18 +544,24 @@ export function mapFitxa(fitxa: FitxaJson, fileName: string): MappedFitxa | { er
   }
 
   const phonology = mapPhonology(fitxa.phonology, gloss, fileName, issues);
-  const hasVideo = Boolean(fitxa.video_url?.trim());
+  const videoUrl = firstVideoUrl(fitxa);
+  const compoundParts = mapCompoundParts(fitxa, gloss, fileName, issues);
+  const isCompound = Boolean(fitxa.compound?.is_compound ?? fitxa.is_compound);
 
   return {
     fileName,
     gloss,
+    externalId: (fitxa.gloss_id || fitxa.id || '').trim() || null,
     notes: fitxa.notes?.trim() || null,
+    iconicity: fitxa.iconicity?.trim() || null,
+    isCompound,
     translations,
     definitions,
-    phonology: phonology || (hasVideo ? mapPhonology({}, gloss, fileName, issues) : null),
-    videoUrl: fitxa.video_url?.trim() || null,
+    phonology: phonology || (videoUrl ? mapPhonology({}, gloss, fileName, issues) : null),
+    videoUrl,
     relations,
     minimalPairs,
+    compoundParts,
     linkedGlossNames: collectLinkedNames(fitxa),
     issues,
   };
diff --git a/backend/src/bulk-import/fitxa.types.ts b/backend/src/bulk-import/fitxa.types.ts
index 01ce64b..30a4c24 100644
--- a/backend/src/bulk-import/fitxa.types.ts
+++ b/backend/src/bulk-import/fitxa.types.ts
@@ -24,22 +24,52 @@ export interface FitxaMinimalPair {
   description?: string | null;
 }
 
+export interface FitxaVideoUrl {
+  url?: string | null;
+}
+
+export interface FitxaTranslations {
+  english?: string | null;
+  spanish?: string | null;
+  catalan?: string | null;
+}
+
+export interface FitxaCompoundComponent {
+  ordinal?: number;
+  name?: string | null;
+  comp_id?: string | null;
+  redundant?: boolean;
+  phonology?: FitxaPhonology | null;
+}
+
+export interface FitxaCompound {
+  is_compound?: boolean;
+  components?: FitxaCompoundComponent[];
+}
+
 export interface FitxaJson {
   id?: string;
   name?: string;
+  gloss_id?: string;
+  gloss_name?: string;
+  schema_version?: number;
   tr_en?: string;
   tr_es?: string;
   tr_ca?: string;
+  translations?: FitxaTranslations;
   definitions?: string[];
   definition?: string;
   lexical_category?: string;
-  phonology?: FitxaPhonology;
+  phonology?: FitxaPhonology | null;
   minimal_pairs?: FitxaMinimalPair[];
   related_signs?: Record<string, string[]>;
   notes?: string | null;
+  iconicity?: string | null;
   video_url?: string | null;
+  video_urls?: FitxaVideoUrl[];
   is_compound?: boolean;
   compound_signs?: string[];
+  compound?: FitxaCompound;
   morfologia_sequencial?: {
     compost_1?: string | null;
     compost_2?: string | null;
@@ -108,16 +138,29 @@ export interface MappedPhonology {
   repeatedMovement: boolean;
 }
 
+export interface MappedCompoundPart {
+  position: number;
+  gloss: string;
+  compExternalId: string | null;
+  redundant: boolean;
+  linked: boolean;
+  phonology: MappedPhonology | null;
+}
+
 export interface MappedFitxa {
   fileName: string;
   gloss: string;
+  externalId: string | null;
   notes: string | null;
+  iconicity: string | null;
+  isCompound: boolean;
   translations: Array<{ language: 'CATALAN' | 'SPANISH' | 'ENGLISH'; translation: string }>;
   definitions: MappedDefinition[];
   phonology: MappedPhonology | null;
   videoUrl: string | null;
   relations: MappedRelation[];
   minimalPairs: MappedMinimalPair[];
+  compoundParts: MappedCompoundPart[];
   linkedGlossNames: string[];
   issues: ImportIssue[];
 }

From 54fbb2b7da6adf765a6f351c2ddc62ed137185f0 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Mon, 17 Aug 2026 17:53:17 +0200
Subject: [PATCH 16/17] feat: configurable phonology values

---
 backend/README.md                             |    8 +
 backend/nest-cli.json                         |    4 +
 backend/prisma/emptySeed.ts                   |    2 +-
 .../migration.sql                             |   57 +
 .../migration.sql                             |   73 +
 .../migration.sql                             |   64 +
 backend/prisma/schema.prisma                  |  544 +-
 backend/prisma/seed.ts                        |  266 +-
 backend/prisma/seed/compound-bessons-1d.ts    |  148 +-
 .../generate-phonology-catalog-defaults.js    |  144 +
 backend/src/app.module.ts                     |    2 +
 .../src/bulk-import/bulk-import.service.ts    |   57 +-
 backend/src/gloss-data/gloss-data.module.ts   |    3 +-
 backend/src/gloss-data/gloss-data.service.ts  |   42 +-
 .../dto/create-gloss-request.dto.ts           |   54 +-
 .../gloss-requests/gloss-requests.service.ts  |   24 +-
 backend/src/glosses/compound-include.ts       |   88 +-
 backend/src/glosses/glosses.service.ts        |   11 +-
 .../dto/create-phonology-value.dto.ts         |   66 +
 .../dto/query-phonology-values.dto.ts         |   25 +
 .../dto/update-phonology-value.dto.ts         |   60 +
 .../phonology-catalog.defaults.json           | 6169 +++++++++++++++++
 .../phonology-catalog.seed.ts                 |   46 +
 .../src/phonology-values/phonology-fields.ts  |   59 +
 .../phonology-values.controller.ts            |   40 +
 .../phonology-values.module.ts                |   12 +
 .../phonology-values.service.ts               |  327 +
 .../phonology-values/phonology-video-data.ts  |  220 +
 .../sign-videos/dto/create-sign-video.dto.ts  |   75 +-
 .../sign-videos/dto/update-sign-video.dto.ts  |   77 +-
 backend/src/sign-videos/dto/video-data.dto.ts |   67 +-
 backend/src/sign-videos/sign-videos.module.ts |    3 +-
 .../src/sign-videos/sign-videos.service.ts    |   47 +-
 .../src/typesense/types/gloss-index.type.ts   |   41 +-
 backend/src/typesense/typesense.service.ts    |   43 +-
 frontend/quasar.config.ts                     |   23 +-
 frontend/src/boot/phonology-catalog.ts        |   11 +
 .../components/CompoundPhonologyTable.vue     |   22 +-
 .../components/VideosComponent.vue            |   21 +-
 frontend/src/components/HeaderComponent.vue   |   25 +-
 .../components/SearchPhonologyFilters.vue     |   75 +-
 .../src/components/Shared/PhonologyTable.vue  |   79 +-
 frontend/src/css/app.css                      |  156 +-
 frontend/src/css/quasar.variables.scss        |   34 +-
 frontend/src/i18n/ca-ES/index.ts              |   41 +
 frontend/src/i18n/en-US/index.ts              |   41 +
 frontend/src/i18n/es-ES/index.ts              |   41 +
 frontend/src/i18n/translateKeys.ts            |   41 +
 frontend/src/pages/PhonologyCatalogPage.vue   |  482 ++
 frontend/src/pages/SearchPage.vue             |    6 +-
 frontend/src/router/routes.ts                 |    7 +
 frontend/src/services/api.ts                  |   10 +
 .../src/stores/phonology-catalog.store.ts     |   78 +
 frontend/src/types/api.ts                     |    5 +-
 frontend/src/types/models.ts                  |   39 +-
 frontend/src/types/phonology-catalog.ts       |   62 +
 frontend/src/utils/apiError.ts                |   22 +
 frontend/src/utils/defaultPhonology.ts        |   35 +-
 frontend/src/utils/phonologyHelpers.ts        |   34 +-
 frontend/src/utils/phonologyOptions.ts        |  122 +-
 60 files changed, 8917 insertions(+), 1563 deletions(-)
 create mode 100644 backend/prisma/migrations/20260817152000_phonology_value_catalog/migration.sql
 create mode 100644 backend/prisma/migrations/20260817174500_videodata_phonology_relations/migration.sql
 create mode 100644 backend/prisma/migrations/20260817180000_videodata_phonology_set_null/migration.sql
 create mode 100644 backend/scripts/generate-phonology-catalog-defaults.js
 create mode 100644 backend/src/phonology-values/dto/create-phonology-value.dto.ts
 create mode 100644 backend/src/phonology-values/dto/query-phonology-values.dto.ts
 create mode 100644 backend/src/phonology-values/dto/update-phonology-value.dto.ts
 create mode 100644 backend/src/phonology-values/phonology-catalog.defaults.json
 create mode 100644 backend/src/phonology-values/phonology-catalog.seed.ts
 create mode 100644 backend/src/phonology-values/phonology-fields.ts
 create mode 100644 backend/src/phonology-values/phonology-values.controller.ts
 create mode 100644 backend/src/phonology-values/phonology-values.module.ts
 create mode 100644 backend/src/phonology-values/phonology-values.service.ts
 create mode 100644 backend/src/phonology-values/phonology-video-data.ts
 create mode 100644 frontend/src/boot/phonology-catalog.ts
 create mode 100644 frontend/src/pages/PhonologyCatalogPage.vue
 create mode 100644 frontend/src/stores/phonology-catalog.store.ts
 create mode 100644 frontend/src/types/phonology-catalog.ts
 create mode 100644 frontend/src/utils/apiError.ts

diff --git a/backend/README.md b/backend/README.md
index bf10370..eb1ab54 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -48,6 +48,14 @@ The following diagram illustrates the main structure of the database used by the
 
 ---
 
+## Phonology values (`/phonology-values`)
+- `GET /phonology-values` — List catalog values (query: `dimension`, `includeInactive`, `withUsage`)
+- `POST /phonology-values` — Create a value (admin)
+- `PATCH /phonology-values/:id` — Update a value (admin)
+- `DELETE /phonology-values/:id` — Delete a value if unused (admin)
+
+---
+
 ## Gloss Requests (`/gloss-requests`)
 - `GET /gloss-requests/pending` — List all pending requests (admin)
 - `GET /gloss-requests/my-requests` — List requests created by current user
diff --git a/backend/nest-cli.json b/backend/nest-cli.json
index 1f450e1..a1279b7 100644
--- a/backend/nest-cli.json
+++ b/backend/nest-cli.json
@@ -8,6 +8,10 @@
       {
         "include": "import/**/*.json",
         "watchAssets": true
+      },
+      {
+        "include": "phonology-values/**/*.json",
+        "watchAssets": true
       }
     ]
   }
diff --git a/backend/prisma/emptySeed.ts b/backend/prisma/emptySeed.ts
index 60574b7..c15aada 100644
--- a/backend/prisma/emptySeed.ts
+++ b/backend/prisma/emptySeed.ts
@@ -1,4 +1,4 @@
-import { PrismaClient, Role, Language, LexicalCategory, Handedness, GlossStatus, ConfigurationChange, RelationBetweenArticulators, Location, MovementType, MovementRelatedOrientation, OrientationChange, ContactType, OrientationRelatedToLocation, HandConfiguration, RelationType } from '@prisma/client';
+import { PrismaClient, Role, Language, LexicalCategory, GlossStatus, RelationType } from '@prisma/client';
 import * as argon2 from 'argon2';
 
 const prisma = new PrismaClient();
diff --git a/backend/prisma/migrations/20260817152000_phonology_value_catalog/migration.sql b/backend/prisma/migrations/20260817152000_phonology_value_catalog/migration.sql
new file mode 100644
index 0000000..f9dcfc4
--- /dev/null
+++ b/backend/prisma/migrations/20260817152000_phonology_value_catalog/migration.sql
@@ -0,0 +1,57 @@
+-- CreateEnum
+CREATE TYPE "PhonologyDimension" AS ENUM ('HANDEDNESS', 'HAND_CONFIGURATION', 'CONFIGURATION_CHANGE', 'RELATION_BETWEEN_ARTICULATORS', 'LOCATION', 'MOVEMENT_RELATED_ORIENTATION', 'ORIENTATION_RELATED_TO_LOCATION', 'ORIENTATION_CHANGE', 'CONTACT_TYPE', 'MOVEMENT_TYPE', 'MOVEMENT_DIRECTION');
+
+-- AlterTable: keep existing phonology codes while converting enums to text
+ALTER TABLE "VideoData" ALTER COLUMN "handedness" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "handedness" SET DEFAULT 'ONE';
+ALTER TABLE "VideoData" ALTER COLUMN "dominantConfiguration" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "nonDominantConfiguration" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "dominantRelationBetweenArticulators" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "nonDominantRelationBetweenArticulators" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "configurationChanges" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "location" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "movementRelatedOrientation" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "orientationRelatedToLocation" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "orientationChange" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "contactType" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "movementType" SET DATA TYPE TEXT;
+ALTER TABLE "VideoData" ALTER COLUMN "movementDirection" SET DATA TYPE TEXT;
+
+-- DropEnum
+DROP TYPE "ConfigurationChange";
+DROP TYPE "ContactType";
+DROP TYPE "HandConfiguration";
+DROP TYPE "Handedness";
+DROP TYPE "Location";
+DROP TYPE "MovementDirection";
+DROP TYPE "MovementRelatedOrientation";
+DROP TYPE "MovementType";
+DROP TYPE "OrientationChange";
+DROP TYPE "OrientationRelatedToLocation";
+DROP TYPE "RelationBetweenArticulators";
+
+-- CreateTable
+CREATE TABLE "PhonologyValue" (
+    "id" TEXT NOT NULL,
+    "dimension" "PhonologyDimension" NOT NULL,
+    "code" TEXT NOT NULL,
+    "labelCa" TEXT NOT NULL,
+    "labelEn" TEXT,
+    "labelEs" TEXT,
+    "descriptionCa" TEXT,
+    "descriptionEn" TEXT,
+    "descriptionEs" TEXT,
+    "aliases" TEXT[] DEFAULT ARRAY[]::TEXT[],
+    "sortOrder" INTEGER NOT NULL DEFAULT 0,
+    "active" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "PhonologyValue_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "PhonologyValue_dimension_active_idx" ON "PhonologyValue"("dimension", "active");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PhonologyValue_dimension_code_key" ON "PhonologyValue"("dimension", "code");
diff --git a/backend/prisma/migrations/20260817174500_videodata_phonology_relations/migration.sql b/backend/prisma/migrations/20260817174500_videodata_phonology_relations/migration.sql
new file mode 100644
index 0000000..9b1b119
--- /dev/null
+++ b/backend/prisma/migrations/20260817174500_videodata_phonology_relations/migration.sql
@@ -0,0 +1,73 @@
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM "VideoData") AND NOT EXISTS (SELECT 1 FROM "PhonologyValue") THEN
+    RAISE EXCEPTION 'PhonologyValue catalog is empty; seed it before converting VideoData to foreign keys';
+  END IF;
+END $$;
+
+-- Add nullable FK columns while keeping existing code columns
+ALTER TABLE "VideoData" ADD COLUMN "handednessId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "dominantConfigurationId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "nonDominantConfigurationId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "dominantRelationBetweenArticulatorsId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "nonDominantRelationBetweenArticulatorsId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "configurationChangesId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "locationId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "movementRelatedOrientationId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "orientationRelatedToLocationId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "orientationChangeId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "contactTypeId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "movementTypeId" TEXT;
+ALTER TABLE "VideoData" ADD COLUMN "movementDirectionId" TEXT;
+
+UPDATE "VideoData" v SET "handednessId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'HANDEDNESS' AND p.code = v.handedness;
+UPDATE "VideoData" v SET "dominantConfigurationId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'HAND_CONFIGURATION' AND p.code = v."dominantConfiguration";
+UPDATE "VideoData" v SET "nonDominantConfigurationId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'HAND_CONFIGURATION' AND p.code = v."nonDominantConfiguration";
+UPDATE "VideoData" v SET "dominantRelationBetweenArticulatorsId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'RELATION_BETWEEN_ARTICULATORS' AND p.code = v."dominantRelationBetweenArticulators";
+UPDATE "VideoData" v SET "nonDominantRelationBetweenArticulatorsId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'RELATION_BETWEEN_ARTICULATORS' AND p.code = v."nonDominantRelationBetweenArticulators";
+UPDATE "VideoData" v SET "configurationChangesId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'CONFIGURATION_CHANGE' AND p.code = v."configurationChanges";
+UPDATE "VideoData" v SET "locationId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'LOCATION' AND p.code = v.location;
+UPDATE "VideoData" v SET "movementRelatedOrientationId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'MOVEMENT_RELATED_ORIENTATION' AND p.code = v."movementRelatedOrientation";
+UPDATE "VideoData" v SET "orientationRelatedToLocationId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'ORIENTATION_RELATED_TO_LOCATION' AND p.code = v."orientationRelatedToLocation";
+UPDATE "VideoData" v SET "orientationChangeId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'ORIENTATION_CHANGE' AND p.code = v."orientationChange";
+UPDATE "VideoData" v SET "contactTypeId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'CONTACT_TYPE' AND p.code = v."contactType";
+UPDATE "VideoData" v SET "movementTypeId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'MOVEMENT_TYPE' AND p.code = v."movementType";
+UPDATE "VideoData" v SET "movementDirectionId" = p.id FROM "PhonologyValue" p WHERE p.dimension = 'MOVEMENT_DIRECTION' AND p.code = v."movementDirection";
+
+ALTER TABLE "VideoData" ALTER COLUMN "handednessId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "configurationChangesId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "locationId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "movementRelatedOrientationId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "orientationRelatedToLocationId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "orientationChangeId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "contactTypeId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "movementTypeId" SET NOT NULL;
+ALTER TABLE "VideoData" ALTER COLUMN "movementDirectionId" SET NOT NULL;
+
+ALTER TABLE "VideoData" DROP COLUMN "handedness";
+ALTER TABLE "VideoData" DROP COLUMN "dominantConfiguration";
+ALTER TABLE "VideoData" DROP COLUMN "nonDominantConfiguration";
+ALTER TABLE "VideoData" DROP COLUMN "dominantRelationBetweenArticulators";
+ALTER TABLE "VideoData" DROP COLUMN "nonDominantRelationBetweenArticulators";
+ALTER TABLE "VideoData" DROP COLUMN "configurationChanges";
+ALTER TABLE "VideoData" DROP COLUMN "location";
+ALTER TABLE "VideoData" DROP COLUMN "movementRelatedOrientation";
+ALTER TABLE "VideoData" DROP COLUMN "orientationRelatedToLocation";
+ALTER TABLE "VideoData" DROP COLUMN "orientationChange";
+ALTER TABLE "VideoData" DROP COLUMN "contactType";
+ALTER TABLE "VideoData" DROP COLUMN "movementType";
+ALTER TABLE "VideoData" DROP COLUMN "movementDirection";
+
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_handednessId_fkey" FOREIGN KEY ("handednessId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_dominantConfigurationId_fkey" FOREIGN KEY ("dominantConfigurationId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_nonDominantConfigurationId_fkey" FOREIGN KEY ("nonDominantConfigurationId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_dominantRelationBetweenArticulatorsId_fkey" FOREIGN KEY ("dominantRelationBetweenArticulatorsId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_nonDominantRelationBetweenArticulatorsId_fkey" FOREIGN KEY ("nonDominantRelationBetweenArticulatorsId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_configurationChangesId_fkey" FOREIGN KEY ("configurationChangesId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_locationId_fkey" FOREIGN KEY ("locationId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_movementRelatedOrientationId_fkey" FOREIGN KEY ("movementRelatedOrientationId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_orientationRelatedToLocationId_fkey" FOREIGN KEY ("orientationRelatedToLocationId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_orientationChangeId_fkey" FOREIGN KEY ("orientationChangeId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_contactTypeId_fkey" FOREIGN KEY ("contactTypeId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_movementTypeId_fkey" FOREIGN KEY ("movementTypeId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_movementDirectionId_fkey" FOREIGN KEY ("movementDirectionId") REFERENCES "PhonologyValue"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/backend/prisma/migrations/20260817180000_videodata_phonology_set_null/migration.sql b/backend/prisma/migrations/20260817180000_videodata_phonology_set_null/migration.sql
new file mode 100644
index 0000000..ee2ea5a
--- /dev/null
+++ b/backend/prisma/migrations/20260817180000_videodata_phonology_set_null/migration.sql
@@ -0,0 +1,64 @@
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_configurationChangesId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_contactTypeId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_handednessId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_locationId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_movementDirectionId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_movementRelatedOrientationId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_movementTypeId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_orientationChangeId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "VideoData" DROP CONSTRAINT "VideoData_orientationRelatedToLocationId_fkey";
+
+-- AlterTable
+ALTER TABLE "VideoData" ALTER COLUMN "handednessId" DROP NOT NULL,
+ALTER COLUMN "configurationChangesId" DROP NOT NULL,
+ALTER COLUMN "locationId" DROP NOT NULL,
+ALTER COLUMN "movementRelatedOrientationId" DROP NOT NULL,
+ALTER COLUMN "orientationRelatedToLocationId" DROP NOT NULL,
+ALTER COLUMN "orientationChangeId" DROP NOT NULL,
+ALTER COLUMN "contactTypeId" DROP NOT NULL,
+ALTER COLUMN "movementTypeId" DROP NOT NULL,
+ALTER COLUMN "movementDirectionId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_handednessId_fkey" FOREIGN KEY ("handednessId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_configurationChangesId_fkey" FOREIGN KEY ("configurationChangesId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_locationId_fkey" FOREIGN KEY ("locationId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_movementRelatedOrientationId_fkey" FOREIGN KEY ("movementRelatedOrientationId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_orientationRelatedToLocationId_fkey" FOREIGN KEY ("orientationRelatedToLocationId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_orientationChangeId_fkey" FOREIGN KEY ("orientationChangeId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_contactTypeId_fkey" FOREIGN KEY ("contactTypeId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_movementTypeId_fkey" FOREIGN KEY ("movementTypeId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "VideoData" ADD CONSTRAINT "VideoData_movementDirectionId_fkey" FOREIGN KEY ("movementDirectionId") REFERENCES "PhonologyValue"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
index 53a96b3..1ec84f1 100644
--- a/backend/prisma/schema.prisma
+++ b/backend/prisma/schema.prisma
@@ -67,14 +67,6 @@ enum RelationType {
     HYPONYM
 }
 
-enum Handedness {
-    ONE
-    TWO_A
-    TWO_N
-    TWO_S
-    NA
-}
-
 enum GlossStatus {
     PUBLISHED
     ARCHIVED
@@ -86,443 +78,52 @@ enum EditStatus {
     REJECTED
 }
 
-enum HandConfiguration {
-    EMPTY
-    CONF_1
-    CONF_2
-    CONF_3
-    CONF_4
-    CONF_5
-    CONF_6
-    CONF_1D834
-    CONF_7
-    CONF_8
-    CONF_9
-    CONF_10
-    CONF_11
-    CONF_12
-    CONF_13
-    CONF_14
-    CONF_15
-    CONF_16
-    CONF_1D86C
-    CONF_18
-    CONF_1D82E
-    CONF_19
-    CONF_20
-    CONF_21
-    CONF_22
-    CONF_23
-    CONF_24
-    CONF_25
-    CONF_26
-    CONF_27
-    CONF_29
-    CONF_30
-    CONF_31
-    CONF_32
-    CONF_33
-    CONF_34
-    CONF_35
-    CONF_36
-    CONF_37
-    CONF_38
-    CONF_39
-    CONF_40
-    CONF_1D8C3
-    CONF_42
-    CONF_1D87D
-    CONF_1D8C5
-    CONF_1D8A7
-    CONF_1D8B
-    CONF_1D88E
-    CONF_1D8BA
-    CONF_1D8C7
-    CONF_2A
-}
-
-enum ConfigurationChange {
-    EMPTY
-    BENDING
-    CLOSING
-    CLOSING_AND_RUBBING
-    CLOSING_AND_WIGGLING
-    CLOSING_TO_OPENING
-    CONSECUTIVE_CLOSING
-    CURVING
-    NONE_TO_SPREADING
-    OPENING
-    OPENING_AND_RUBBING
-    OPENING_AND_SPREADING
-    OPENING_AND_WIGGLING
-    OPENING_TO_CLOSING
-    RUBBING
-    SPREADING
-    UNBENDING
-    UNCURVING
-    UNSPREADING
-    WIGGLING
-}
-
-enum RelationBetweenArticulators {
-    EMPTY
-    ABOVE
-    ABOVE_BELOW
-    AROUND
-    BACK
-    BELOW
-    CROSS
-    FRONT
-    FRONT_BACK
-    INSIDE
-    INTERWOVEN
-    NEXT_TO
-}
-
-enum Location {
-    EMPTY
-    ARM
-    ARMPIT
-    BACK
-    BACK_OF_HEAD
-    BELLY
-    BREASTS
-    BREAST_IPSI
-    BREAST_CONTRA
-    BRIDGE_OF_NOSE
-    CHEEK
-    CHEEK_CONTRA
-    CHEEKBONE
-    CHEST
-    CHEST_CONTRA
-    CHIN
-    CHIN_CONTRA
-    CROTCH
-    EAR
-    EARLOBE
-    EAST
-    ELBOW
-    EYE
-    EYEBROW
-    FACE
-    FACE_IPSI
-    FLANK
-    FOREHEAD
-    FOREHEAD_CONTRA
-    HEAD
-    HEAD_CONTRA
-    HEAD_IPSI
-    HIP
-    HORIZONTAL_PLANE
-    KNEE
-    LEG
-    LOWER_ARM
-    LOWER_LIP
-    MOUTH
-    MOUTH_CONTRA
-    MOUTH_IPSI
-    NECK
-    NECK_CONTRA
-    NEUTRAL_SPACE
-    NOSE
-    PARALLEL_PLANE
-    R_LOC
-    SHOULDER
-    SHOULDER_CONTRA
-    TEETH
-    TEMPLE
-    THUMB
-    TONGUE
-    TRUNK
-    UPPER_ARM
-    UPPER_LIP
-    VARIABLE
-    VIRTUAL_OBJECT
-    WAIST
-    WEST
-    WRIST
-
-    WEAK_HAND
-    WEAK_HAND_BACK
-    WEAK_HAND_BASE
-    WEAK_HAND_FINGER_TIPS
-    WEAK_HAND_FINGER
-    WEAK_HAND_FRONT
-    WEAK_HAND_INDEX_FINGER
-    WEAK_HAND_KNUCKLES
-    WEAK_HAND_MIDDLE_FINGER
-    WEAK_HAND_PALM
-    WEAK_HAND_PINKIE
-    WEAK_HAND_PINKIE_SIDE
-    WEAK_HAND_RING_FINGER
-    WEAK_HAND_THENAR
-    WEAK_HAND_THUMB
-    WEAK_HAND_THUMB_SIDE
-    WEAK_HAND_WEB_SPACE
-
-    BELLY_TO_CHEST
-    CHEEK_TO_CHEEK
-    CHEEK_TO_CHIN
-    CHIN_TO_CHEST
-    CHIN_TO_NEUTRAL_SPACE
-    CHIN_TO_WEAK_HAND_INDEX
-    CHIN_TO_WEAK_HAND_PALM
-    CHIN_TO_WEAK_HAND_THUMB
-    EAR_TO_CHEEK
-    EAR_TO_CHEST
-    EAR_TO_MOUTH
-    EYE_TO_NEUTRAL_SPACE
-    FACE_TO_HEAD
-    FACE_TO_NEUTRAL_SPACE
-    FOREHEAD_TO_CHEST
-    FOREHEAD_TO_CHIN
-    FOREHEAD_TO_NEUTRAL_SPACE
-    FOREHEAD_TO_WEAK_HAND_PALM
-    HEAD_TO_CHEST
-    HEAD_TO_CHEST_TO_SHOULDER
-    HEAD_TO_NEUTRAL_SPACE
-    HEAD_TO_SHOULDER
-    HEAD_TO_WEAK_HAND_PALM
-    LEG_TO_WAIST
-    MOUTH_TO_CHEEK
-    MOUTH_TO_CHEST
-    MOUTH_TO_CHIN
-    MOUTH_TO_NEUTRAL_SPACE
-    MOUTH_TO_WEAK_HAND
-    MOUTH_TO_WEAK_HAND_PALM
-    NECK_TO_CHEST
-    NECK_TO_NEUTRAL_SPACE
-    NEUTRAL_SPACE_TO_HEAD
-    NEUTRAL_SPACE_TO_SHOULDER
-    NEUTRAL_SPACE_TO_NOSE
-    NEUTRAL_SPACE_TO_CHEEK
-    NEUTRAL_SPACE_TO_MOUTH
-    NEUTRAL_SPACE_TO_CHEST
-    NEUTRAL_SPACE_TO_WEAK_HAND
-    NOSE_TO_CHIN
-    NOSE_TO_NEUTRAL_SPACE
-    NOSE_TO_WEAK_HAND
-    R_LOC_TO_R_LOC
-    SHOULDER_TO_CHEST
-    SHOULDER_TO_SHOULDER
-    SHOULDER_TO_WEAK_HAND_PALM
-    SHOULDER_TO_NEUTRAL_SPACE
-    SHOULDER_TO_HIT
-    TEMPLE_TO_CHEST
-    TEMPLE_TO_CHEEK
-    TEMPLE_TO_SHOULDER
-    TEMPLE_TO_NEUTRAL_SPACE
-    WEAK_HAND_TO_ARM
-    WEAK_HAND_TO_NEUTRAL_SPACE
-    WEAK_HAND_THUMB_SIDE_TO_ARM
-    ARMPIT_TO_NEUTRAL_SPACE
-    CHEST_TO_CHIN
-    CHEST_TO_NEUTRAL_SPACE
-
-    BELLY_AND_FOREHEAD
-    HEAD_AND_NEUTRAL_SPACE
-    FLANK_OR_HEAD
-    NEUTRAL_SPACE_OR_WEAK_HAND_FRONT
-    BOTTOM_OR_CROTCH
-}
-
-enum MovementRelatedOrientation {
-    EMPTY
-    BACK
-    BASE
-    FINGER_TIPS
-    FRONT
-    PALM
-    RADIAL
-    ULNAR
-    VARIABLE
-    BACK_AND_BASE
-    BACK_AND_RADIAL
-    BACK_AND_ULNAR
-    BASE_AND_FRONT
-    BASE_AND_PALM
-    BASE_AND_ULNAR
-    FRONT_AND_ULNAR
-    PALM_AND_RADIAL
-    PALM_AND_ULNAR
-    PALM_AND_RADIAL_OR_ULNAR
-    BACK_TO_FINGER_TIPS
-    BACK_TO_FRONT
-    BACK_TO_PALM
-    BACK_TO_RADIAL
-    BASE_TO_BACK
-    BASE_TO_BASE
-    BASE_TO_FRONT
-    BASE_TO_PALM
-    BASE_TO_ULNAR
-    FINGER_TIPS_TO_BACK
-    FINGER_TIPS_TO_BASE
-    FINGER_TIPS_TO_PALM
-    FRONT_TO_BACK
-    PALM_TO_BACK
-    PALM_TO_BASE
-    RADIAL_TO_ULNAR
-    ULNAR_TO_BASE
-    ULNAR_TO_BASE_TO_RADIAL
-    ULNAR_TO_FRONT
-    ULNAR_TO_PALM
-    ULNAR_TO_PALM_TO_RADIAL
-    ULNAR_TO_RADIAL
-    BACK_OR_BASE
-    BACK_OR_FINGER_TIPS
-    BACK_OR_PALM
-    BASE_OR_FRONT
-    FINGER_TIPS_OR_BASE
-    FINGER_TIPS_OR_ULNAR
-    FRONT_OR_PALM
-    RADIAL_OR_ULNAR
-}
-
-enum OrientationRelatedToLocation {
-    EMPTY
-    AO_FINGERS_CONTRA
-    AO_FINGERS_DOWN
-    AO_FINGERS_UP
-    AO_PALM_BACKWARDS
-    AO_PALM_DOWN
-    AO_PALM_DOWN_TO_UP
-    AO_PALM_FORWARDS
-    AO_PALM_INWARDS
-    AO_PALM_OUTWARDS
-    AO_PALM_UP
-    AO_PALM_UP_OR_DOWN
-    BACK
-    BACK_TO_PALM
-    BACK_TO_ULNAR
-    BACK_OR_PALM
-    BACK_OR_PALM_TO_PALM
-    BASE
-    COUNTING
-    FINGER_TIPS
-    FINGER_TIPS_OR_BASE
-    FINGERSPELLING
-    FRONT
-    PALM
-    PALM_TO_ULNAR
-    RADIAL
-    RADIAL_OR_ULNAR
-    ULNAR
-}
-
-enum OrientationChange {
-    EMPTY
-    EXTENSION
-    EXTENSION_AND_PRONATION
-    EXTENSION_TO_FLEXION
-    EXTENSION_OR_FLEXION
-    FLEXION
-    FLEXION_TO_EXTENSION
-    PRONATION
-    PRONATION_OR_SUPINATION
-    RADIAL_AND_ULNAR_FLEXION
-    RADIAL_FLEXION
-    ROTATION
-    SUPINATION
-    SUPINATION_TO_PRONATION
-    ULNAR_FLEXION
-    PRONATION_TO_FLEXION
-    SUPINATION_TO_EXTENSION
-}
-
-enum ContactType {
-    EMPTY
-    BRUSH
-    CONTINUOUS
-    CONTINUOUS_TO_CONTINUOUS
-    CONTINUOUS_TO_FINAL
-    CONTINUOUS_TO_NONE
-    DOUBLE
-    FINAL
-    FINAL_TO_CONTINUOUS
-    FINAL_TO_NONE
-    INITIAL
-    NONE_TO_FINAL
-    NONE_TO_INITIAL
-    INITIAL_TO_FINAL
-}
-
-enum MovementType {
-    EMPTY
-    ARC
-    CIRCLE
-    CROSS
-    MOTIVATED_SHAPE
-    SPIRAL
-    STRAIGHT
-    ZIGZAG
-    STRAIGHT_TO_CIRCLE
-}
-
-enum MovementDirection {
-    EMPTY
-    BACKWARDS
-    BACKWARDS_AND_CONTRALATERAL
-    BACKWARDS_AND_DOWNWARDS
-    BACKWARDS_AND_IPSILATERAL
-    BACKWARDS_AND_UPWARDS
-    BACKWARDS_TO_DOWNWARDS
-    BACKWARDS_TO_FORWARDS
-    BACKWARDS_OR_FORWARDS
-    CONTRALATERAL
-    CONTRALATERAL_AND_DOWNWARDS
-    CONTRALATERAL_AND_FORWARDS
-    CONTRALATERAL_AND_UPWARDS
-    CONTRALATERAL_TO_FORWARDS
-    CONTRALATERAL_TO_IPSILATERAL
-    DISTAL
-    DOWNWARDS
-    DOWNWARDS_AND_CONTRALATERAL_OR_IPSILATERAL
-    DOWNWARDS_AND_FORWARDS
-    DOWNWARDS_AND_IPSILATERAL
-    DOWNWARDS_AND_IPSILATERAL_TO_DOWNWARDS
-    DOWNWARDS_AND_TOWARDS
-    DOWNWARDS_TO_CONTRALATERAL
-    DOWNWARDS_TO_FORWARDS
-    DOWNWARDS_TO_IPSILATERAL
-    DOWNWARDS_TO_UPWARDS
-    DOWNWARDS_OR_UPWARDS
-    DOWNWARDS_OR_UPWARDS_AND_IPSILATERAL
-    FORWARDS
-    FORWARDS_AND_IPSILATERAL
-    FORWARDS_AND_UPWARDS
-    FORWARDS_TO_BACKWARDS
-    FORWARDS_TO_CONTRALATERAL
-    FORWARDS_TO_DOWNWARDS
-    FORWARDS_TO_IPSILATERAL
-    FORWARDS_TO_IPSILATERAL_TO_FORWARDS
-    FORWARDS_TO_UPWARDS
-    FROM_LOCATION
-    IPSILATERAL
-    IPSILATERAL_AND_UP_AND_DOWN
-    IPSILATERAL_AND_UPWARDS
-    IPSILATERAL_TO_CONTRALATERAL
-    IPSILATERAL_TO_DOWNWARDS
-    IPSILATERAL_TO_DOWNWARDS_TO_CONTRALATERAL
-    IPSILATERAL_TO_UPWARDS
-    IPSILATERAL_AND_CONTRALATERAL
-    IPSILATERAL_OR_CONTRALATERAL
-    LATERAL
-    PROXIMAL
-    TO_AND_FRO
-    TOWARDS_LOCATION
-    UP_AND_DOWN
-    UPWARDS
-    UPWARDS_TO_DOWNWARDS
-    UPWARDS_TO_FORWARDS_TO_DOWNWARDS
-    UPWARDS_TO_IPSILATERAL
-    VARIABLE
-    FORWARDS_AND_DOWNWARDS
-    CONTRALATERAL_TO_DOWNWARDS
-    DOWNWARDS_TO_CONTRALATERAL_TO_IPSILATERAL
-    UPWARDS_AND_FORWARDS
-    IPSILATERAL_TO_FORWARDS
-    IPSILATERAL_TO_BACKWARDS_TO_CONTRALATERAL
-    IPSILATERAL_AND_DOWNWARDS
+enum PhonologyDimension {
+    HANDEDNESS
+    HAND_CONFIGURATION
+    CONFIGURATION_CHANGE
+    RELATION_BETWEEN_ARTICULATORS
+    LOCATION
+    MOVEMENT_RELATED_ORIENTATION
+    ORIENTATION_RELATED_TO_LOCATION
+    ORIENTATION_CHANGE
+    CONTACT_TYPE
+    MOVEMENT_TYPE
+    MOVEMENT_DIRECTION
+}
+
+model PhonologyValue {
+    id             String              @id @default(uuid())
+    dimension      PhonologyDimension
+    code           String
+    labelCa        String
+    labelEn        String?
+    labelEs        String?
+    descriptionCa  String?
+    descriptionEn  String?
+    descriptionEs  String?
+    aliases        String[]            @default([])
+    sortOrder      Int                 @default(0)
+    active         Boolean             @default(true)
+    createdAt      DateTime            @default(now())
+    updatedAt      DateTime            @updatedAt
+
+    usedAsHandedness                         VideoData[] @relation("VideoHandedness")
+    usedAsDominantConfiguration              VideoData[] @relation("VideoDominantConfiguration")
+    usedAsNonDominantConfiguration           VideoData[] @relation("VideoNonDominantConfiguration")
+    usedAsDominantRelationBetweenArticulators VideoData[] @relation("VideoDominantRelation")
+    usedAsNonDominantRelationBetweenArticulators VideoData[] @relation("VideoNonDominantRelation")
+    usedAsConfigurationChanges               VideoData[] @relation("VideoConfigurationChanges")
+    usedAsLocation                           VideoData[] @relation("VideoLocation")
+    usedAsMovementRelatedOrientation         VideoData[] @relation("VideoMovementRelatedOrientation")
+    usedAsOrientationRelatedToLocation       VideoData[] @relation("VideoOrientationRelatedToLocation")
+    usedAsOrientationChange                  VideoData[] @relation("VideoOrientationChange")
+    usedAsContactType                        VideoData[] @relation("VideoContactType")
+    usedAsMovementType                       VideoData[] @relation("VideoMovementType")
+    usedAsMovementDirection                  VideoData[] @relation("VideoMovementDirection")
+
+    @@unique([dimension, code])
+    @@index([dimension, active])
 }
 
 model User {
@@ -669,26 +270,39 @@ model SignVideo {
 }
 
 model VideoData {
-    handedness                         Handedness                   @default(ONE)
-    dominantConfiguration              HandConfiguration?
-    nonDominantConfiguration           HandConfiguration?
-    dominantRelationBetweenArticulators  RelationBetweenArticulators?
-    nonDominantRelationBetweenArticulators RelationBetweenArticulators?
-    configurationChanges         ConfigurationChange
-    location                     Location
-    movementRelatedOrientation   MovementRelatedOrientation
-    orientationRelatedToLocation OrientationRelatedToLocation
-    orientationChange            OrientationChange
-    contactType                  ContactType
-    movementType                 MovementType
-    movementDirection            MovementDirection
-    vocalization                 String
-    nonManualComponent           String
-    inicialization               String
-    repeatedMovement             Boolean                      @default(false)
-    signVideo                    SignVideo[]
-    compoundPart                 CompoundPart?                @relation("CompoundPartInlinePhonology")
-    id                           String                       @id @default(uuid())
+    handednessId                             String?
+    handedness                               PhonologyValue?            @relation("VideoHandedness", fields: [handednessId], references: [id], onDelete: SetNull)
+    dominantConfigurationId                  String?
+    dominantConfiguration                    PhonologyValue?            @relation("VideoDominantConfiguration", fields: [dominantConfigurationId], references: [id], onDelete: SetNull)
+    nonDominantConfigurationId               String?
+    nonDominantConfiguration                 PhonologyValue?            @relation("VideoNonDominantConfiguration", fields: [nonDominantConfigurationId], references: [id], onDelete: SetNull)
+    dominantRelationBetweenArticulatorsId    String?
+    dominantRelationBetweenArticulators      PhonologyValue?            @relation("VideoDominantRelation", fields: [dominantRelationBetweenArticulatorsId], references: [id], onDelete: SetNull)
+    nonDominantRelationBetweenArticulatorsId String?
+    nonDominantRelationBetweenArticulators   PhonologyValue?            @relation("VideoNonDominantRelation", fields: [nonDominantRelationBetweenArticulatorsId], references: [id], onDelete: SetNull)
+    configurationChangesId                   String?
+    configurationChanges                     PhonologyValue?            @relation("VideoConfigurationChanges", fields: [configurationChangesId], references: [id], onDelete: SetNull)
+    locationId                               String?
+    location                                 PhonologyValue?            @relation("VideoLocation", fields: [locationId], references: [id], onDelete: SetNull)
+    movementRelatedOrientationId             String?
+    movementRelatedOrientation               PhonologyValue?            @relation("VideoMovementRelatedOrientation", fields: [movementRelatedOrientationId], references: [id], onDelete: SetNull)
+    orientationRelatedToLocationId           String?
+    orientationRelatedToLocation             PhonologyValue?            @relation("VideoOrientationRelatedToLocation", fields: [orientationRelatedToLocationId], references: [id], onDelete: SetNull)
+    orientationChangeId                      String?
+    orientationChange                        PhonologyValue?            @relation("VideoOrientationChange", fields: [orientationChangeId], references: [id], onDelete: SetNull)
+    contactTypeId                            String?
+    contactType                              PhonologyValue?            @relation("VideoContactType", fields: [contactTypeId], references: [id], onDelete: SetNull)
+    movementTypeId                           String?
+    movementType                             PhonologyValue?            @relation("VideoMovementType", fields: [movementTypeId], references: [id], onDelete: SetNull)
+    movementDirectionId                      String?
+    movementDirection                        PhonologyValue?            @relation("VideoMovementDirection", fields: [movementDirectionId], references: [id], onDelete: SetNull)
+    vocalization                             String
+    nonManualComponent                       String
+    inicialization                           String
+    repeatedMovement                         Boolean                    @default(false)
+    signVideo                                SignVideo[]
+    compoundPart                             CompoundPart?              @relation("CompoundPartInlinePhonology")
+    id                                       String                     @id @default(uuid())
 }
 
 model Video {
diff --git a/backend/prisma/seed.ts b/backend/prisma/seed.ts
index 115660f..1a39af1 100644
--- a/backend/prisma/seed.ts
+++ b/backend/prisma/seed.ts
@@ -1,10 +1,14 @@
-import { PrismaClient, Role, Language, LexicalCategory, Handedness, GlossStatus, ConfigurationChange, RelationBetweenArticulators, Location, MovementType, MovementRelatedOrientation, OrientationChange, ContactType, OrientationRelatedToLocation, HandConfiguration, RelationType, MovementDirection } from '@prisma/client';
+import { PrismaClient, Role, Language, LexicalCategory, GlossStatus, RelationType } from '@prisma/client';
 import * as argon2 from 'argon2';
 import { seedCompoundBessonsExample } from './seed/compound-bessons-1d';
+import { ensurePhonologyCatalog } from '../src/phonology-values/phonology-catalog.seed';
+import { videoDataFromCodes } from '../src/phonology-values/phonology-video-data';
 
 const prisma = new PrismaClient();
 
 async function main() {
+  await ensurePhonologyCatalog(prisma);
+
   await prisma.$transaction([
     prisma.exampleTranslation.deleteMany(),
     prisma.glossTranslation.deleteMany(),
@@ -147,23 +151,23 @@ async function main() {
           priority: 1,
           glossData: { connect: { id: collGlossData.id } },
           videoData: {
-            create: {
-              handedness: senseTitle === 'Coll (part del cos)' ? Handedness.ONE : Handedness.TWO_S,
-              dominantConfiguration: HandConfiguration.CONF_1,
-              configurationChanges: ConfigurationChange.BENDING,
-              dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE,
-              location: senseTitle === 'Coll (part del cos)' ? Location.NECK : Location.NEUTRAL_SPACE,
-              movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-              orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-              orientationChange: OrientationChange.EXTENSION,
-              contactType: ContactType.CONTINUOUS,
-              movementType: MovementType.STRAIGHT,
-              movementDirection: MovementDirection.BACKWARDS,
+            create: videoDataFromCodes({
+              handedness: senseTitle === 'Coll (part del cos)' ? 'ONE' : 'TWO_S',
+              dominantConfiguration: 'CONF_1',
+              configurationChanges: 'BENDING',
+              dominantRelationBetweenArticulators: 'ABOVE',
+              location: senseTitle === 'Coll (part del cos)' ? 'NECK' : 'NEUTRAL_SPACE',
+              movementRelatedOrientation: 'FRONT',
+              orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+              orientationChange: 'EXTENSION',
+              contactType: 'CONTINUOUS',
+              movementType: 'STRAIGHT',
+              movementDirection: 'BACKWARDS',
               vocalization: 'none',
               nonManualComponent: 'none',
               inicialization: 'none',
               repeatedMovement: false,
-            },
+            }),
           },
           videos: {
             create: [
@@ -293,23 +297,23 @@ async function main() {
       priority: 1,
       glossData: { connect: { id: contentGlossData.id } },
       videoData: {
-        create: {
-          handedness: Handedness.TWO_S,
-          dominantConfiguration: HandConfiguration.CONF_8,
-          configurationChanges: ConfigurationChange.OPENING_AND_SPREADING,
-          dominantRelationBetweenArticulators: RelationBetweenArticulators.CROSS,
-          location: Location.CHEST,
-          movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-          orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-          orientationChange: OrientationChange.FLEXION,
-          contactType: ContactType.BRUSH,
-          movementType: MovementType.SPIRAL,
-          movementDirection: MovementDirection.BACKWARDS,
+        create: videoDataFromCodes({
+          handedness: 'TWO_S',
+          dominantConfiguration: 'CONF_8',
+          configurationChanges: 'OPENING_AND_SPREADING',
+          dominantRelationBetweenArticulators: 'CROSS',
+          location: 'CHEST',
+          movementRelatedOrientation: 'FRONT',
+          orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+          orientationChange: 'FLEXION',
+          contactType: 'BRUSH',
+          movementType: 'SPIRAL',
+          movementDirection: 'BACKWARDS',
           vocalization: 'none',
           nonManualComponent: 'smile',
           inicialization: 'none',
           repeatedMovement: false,
-        },
+        }),
       },
       videos: {
         create: [
@@ -326,23 +330,23 @@ async function main() {
       priority: 1,
       glossData: { connect: { id: felicGlossData.id } },
       videoData: {
-        create: {
-          handedness: Handedness.ONE,
-          dominantConfiguration: HandConfiguration.CONF_15,
-          configurationChanges: ConfigurationChange.CLOSING_AND_WIGGLING,
-          dominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT,
-          location: Location.CHEEK,
-          movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-          orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-          orientationChange: OrientationChange.EXTENSION_AND_PRONATION,
-          contactType: ContactType.DOUBLE,
-          movementType: MovementType.CIRCLE,
-          movementDirection: MovementDirection.BACKWARDS,
+        create: videoDataFromCodes({
+          handedness: 'ONE',
+          dominantConfiguration: 'CONF_15',
+          configurationChanges: 'CLOSING_AND_WIGGLING',
+          dominantRelationBetweenArticulators: 'FRONT',
+          location: 'CHEEK',
+          movementRelatedOrientation: 'FRONT',
+          orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+          orientationChange: 'EXTENSION_AND_PRONATION',
+          contactType: 'DOUBLE',
+          movementType: 'CIRCLE',
+          movementDirection: 'BACKWARDS',
           vocalization: 'none',
           nonManualComponent: 'smile with cheek puff',
           inicialization: 'none',
           repeatedMovement: false,
-        },
+        }),
       },
       videos: {
         create: [
@@ -675,22 +679,22 @@ async function main() {
         priority: 1,
         glossData: { connect: { id: petitGlossData.id } },
         videoData: {
-          create: {
-            handedness: Handedness.TWO_S,
-            dominantConfiguration: HandConfiguration.CONF_23,
-            configurationChanges: ConfigurationChange.CLOSING_AND_RUBBING,
-            dominantRelationBetweenArticulators: RelationBetweenArticulators.INSIDE,
-            location: Location.NEUTRAL_SPACE,
-            movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-            orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-            orientationChange: OrientationChange.PRONATION,
-            contactType: ContactType.CONTINUOUS_TO_FINAL,
-            movementType: MovementType.MOTIVATED_SHAPE,
-            movementDirection: MovementDirection.BACKWARDS,
+          create: videoDataFromCodes({
+            handedness: 'TWO_S',
+            dominantConfiguration: 'CONF_23',
+            configurationChanges: 'CLOSING_AND_RUBBING',
+            dominantRelationBetweenArticulators: 'INSIDE',
+            location: 'NEUTRAL_SPACE',
+            movementRelatedOrientation: 'FRONT',
+            orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+            orientationChange: 'PRONATION',
+            contactType: 'CONTINUOUS_TO_FINAL',
+            movementType: 'MOTIVATED_SHAPE',
+            movementDirection: 'BACKWARDS',
             vocalization: 'none',
             nonManualComponent: 'cheeks in',
             inicialization: 'none',
-          },
+          }),
         },
         videos: {
           create: [
@@ -706,22 +710,22 @@ async function main() {
         priority: 1,
         glossData: { connect: { id: granGlossData.id } },
         videoData: {
-          create: {
-            handedness: Handedness.TWO_S,
-            dominantConfiguration: HandConfiguration.CONF_31,
-            configurationChanges: ConfigurationChange.OPENING_AND_RUBBING,
-            dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE_BELOW,
-            location: Location.NEUTRAL_SPACE,
-            movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-            orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-            orientationChange: OrientationChange.SUPINATION,
-            contactType: ContactType.INITIAL,
-            movementType: MovementType.ZIGZAG,
-            movementDirection: MovementDirection.BACKWARDS,
+          create: videoDataFromCodes({
+            handedness: 'TWO_S',
+            dominantConfiguration: 'CONF_31',
+            configurationChanges: 'OPENING_AND_RUBBING',
+            dominantRelationBetweenArticulators: 'ABOVE_BELOW',
+            location: 'NEUTRAL_SPACE',
+            movementRelatedOrientation: 'FRONT',
+            orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+            orientationChange: 'SUPINATION',
+            contactType: 'INITIAL',
+            movementType: 'ZIGZAG',
+            movementDirection: 'BACKWARDS',
             vocalization: 'none',
             nonManualComponent: 'cheeks out',
             inicialization: 'none',
-          },
+          }),
         },
         videos: {
           create: [
@@ -737,22 +741,22 @@ async function main() {
         priority: 1,
         glossData: { connect: { id: bancGlossData.id } },
         videoData: {
-          create: {
-            handedness: Handedness.ONE,
-            dominantConfiguration: HandConfiguration.CONF_12,
-            configurationChanges: ConfigurationChange.UNBENDING,
-            dominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT,
-            location: Location.WEAK_HAND_PALM,
-            movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-            orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-            orientationChange: OrientationChange.RADIAL_AND_ULNAR_FLEXION,
-            contactType: ContactType.CONTINUOUS,
-            movementType: MovementType.CROSS,
-            movementDirection: MovementDirection.BACKWARDS,
+          create: videoDataFromCodes({
+            handedness: 'ONE',
+            dominantConfiguration: 'CONF_12',
+            configurationChanges: 'UNBENDING',
+            dominantRelationBetweenArticulators: 'FRONT',
+            location: 'WEAK_HAND_PALM',
+            movementRelatedOrientation: 'FRONT',
+            orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+            orientationChange: 'RADIAL_AND_ULNAR_FLEXION',
+            contactType: 'CONTINUOUS',
+            movementType: 'CROSS',
+            movementDirection: 'BACKWARDS',
             vocalization: 'none',
             nonManualComponent: 'none',
             inicialization: 'none',
-          },
+          }),
         },
         videos: {
           create: [
@@ -768,22 +772,22 @@ async function main() {
         priority: 2,
         glossData: { connect: { id: bancGlossData.id } },
         videoData: {
-          create: {
-            handedness: Handedness.TWO_S,
-            dominantConfiguration: HandConfiguration.CONF_18,
-            configurationChanges: ConfigurationChange.CURVING,
-            dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
-            location: Location.HORIZONTAL_PLANE,
-            movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-            orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-            orientationChange: OrientationChange.ROTATION,
-            contactType: ContactType.CONTINUOUS,
-            movementType: MovementType.STRAIGHT_TO_CIRCLE,
-            movementDirection: MovementDirection.BACKWARDS,
+          create: videoDataFromCodes({
+            handedness: 'TWO_S',
+            dominantConfiguration: 'CONF_18',
+            configurationChanges: 'CURVING',
+            dominantRelationBetweenArticulators: 'NEXT_TO',
+            location: 'HORIZONTAL_PLANE',
+            movementRelatedOrientation: 'FRONT',
+            orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+            orientationChange: 'ROTATION',
+            contactType: 'CONTINUOUS',
+            movementType: 'STRAIGHT_TO_CIRCLE',
+            movementDirection: 'BACKWARDS',
             vocalization: 'none',
             nonManualComponent: 'none',
             inicialization: 'none',
-          },
+          }),
         },
         videos: {
           create: [
@@ -799,22 +803,22 @@ async function main() {
         priority: 1,
         glossData: { connect: { id: sotaGlossData.id } },
         videoData: {
-          create: {
-            handedness: Handedness.ONE,
-            dominantConfiguration: HandConfiguration.CONF_25,
-            configurationChanges: ConfigurationChange.OPENING_AND_WIGGLING,
-            dominantRelationBetweenArticulators: RelationBetweenArticulators.BELOW,
-            location: Location.WEAK_HAND_PALM,
-            movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-            orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-            orientationChange: OrientationChange.ULNAR_FLEXION,
-            contactType: ContactType.NONE_TO_INITIAL,
-            movementType: MovementType.ARC,
-            movementDirection: MovementDirection.BACKWARDS,
+          create: videoDataFromCodes({
+            handedness: 'ONE',
+            dominantConfiguration: 'CONF_25',
+            configurationChanges: 'OPENING_AND_WIGGLING',
+            dominantRelationBetweenArticulators: 'BELOW',
+            location: 'WEAK_HAND_PALM',
+            movementRelatedOrientation: 'FRONT',
+            orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+            orientationChange: 'ULNAR_FLEXION',
+            contactType: 'NONE_TO_INITIAL',
+            movementType: 'ARC',
+            movementDirection: 'BACKWARDS',
             vocalization: 'none',
             nonManualComponent: 'none',
             inicialization: 'none',
-          },
+          }),
         },
         videos: {
           create: [
@@ -830,22 +834,22 @@ async function main() {
         priority: 1,
         glossData: { connect: { id: sobreGlossData.id } },
         videoData: {
-          create: {
-            handedness: Handedness.ONE,
-            dominantConfiguration: HandConfiguration.CONF_35,
-            configurationChanges: ConfigurationChange.OPENING_TO_CLOSING,
-            dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE,
-            location: Location.WEAK_HAND_PALM,
-            movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-            orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-            orientationChange: OrientationChange.PRONATION_TO_FLEXION,
-            contactType: ContactType.FINAL_TO_CONTINUOUS,
-            movementType: MovementType.STRAIGHT,
-            movementDirection: MovementDirection.BACKWARDS,
+          create: videoDataFromCodes({
+            handedness: 'ONE',
+            dominantConfiguration: 'CONF_35',
+            configurationChanges: 'OPENING_TO_CLOSING',
+            dominantRelationBetweenArticulators: 'ABOVE',
+            location: 'WEAK_HAND_PALM',
+            movementRelatedOrientation: 'FRONT',
+            orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+            orientationChange: 'PRONATION_TO_FLEXION',
+            contactType: 'FINAL_TO_CONTINUOUS',
+            movementType: 'STRAIGHT',
+            movementDirection: 'BACKWARDS',
             vocalization: 'none',
             nonManualComponent: 'none',
             inicialization: 'none',
-          },
+          }),
         },
         videos: {
           create: [
@@ -861,22 +865,22 @@ async function main() {
         priority: 3,
         glossData: { connect: { id: sobreGlossData.id } },
         videoData: {
-          create: {
-            handedness: Handedness.TWO_S,
-            dominantConfiguration: HandConfiguration.CONF_42,
-            configurationChanges: ConfigurationChange.CLOSING_TO_OPENING,
-            dominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT_BACK,
-            location: Location.NEUTRAL_SPACE,
-            movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-            orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-            orientationChange: OrientationChange.SUPINATION_TO_PRONATION,
-            contactType: ContactType.CONTINUOUS_TO_NONE,
-            movementType: MovementType.MOTIVATED_SHAPE,
-            movementDirection: MovementDirection.BACKWARDS,
+          create: videoDataFromCodes({
+            handedness: 'TWO_S',
+            dominantConfiguration: 'CONF_42',
+            configurationChanges: 'CLOSING_TO_OPENING',
+            dominantRelationBetweenArticulators: 'FRONT_BACK',
+            location: 'NEUTRAL_SPACE',
+            movementRelatedOrientation: 'FRONT',
+            orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+            orientationChange: 'SUPINATION_TO_PRONATION',
+            contactType: 'CONTINUOUS_TO_NONE',
+            movementType: 'MOTIVATED_SHAPE',
+            movementDirection: 'BACKWARDS',
             vocalization: 'none',
             nonManualComponent: 'none',
             inicialization: 'none',
-          },
+          }),
         },
         videos: {
           create: [
diff --git a/backend/prisma/seed/compound-bessons-1d.ts b/backend/prisma/seed/compound-bessons-1d.ts
index 306c670..fb37462 100644
--- a/backend/prisma/seed/compound-bessons-1d.ts
+++ b/backend/prisma/seed/compound-bessons-1d.ts
@@ -3,126 +3,116 @@ import {
   Language,
   LexicalCategory,
   GlossStatus,
-  Handedness,
-  HandConfiguration,
-  ConfigurationChange,
-  RelationBetweenArticulators,
-  Location,
-  MovementRelatedOrientation,
-  OrientationRelatedToLocation,
-  OrientationChange,
-  ContactType,
-  MovementType,
-  MovementDirection,
   RelationType,
 } from '@prisma/client';
+import { videoDataFromCodes } from '../../src/phonology-values/phonology-video-data';
 
 /** Simple one-handed phonology for SEGON inline morpheme and BESSONS-T_antiga. */
 function buildBessonsComponentPhonology() {
-  return {
-    handedness: Handedness.ONE,
-    location: Location.NEUTRAL_SPACE,
-    orientationChange: OrientationChange.FLEXION,
-    configurationChanges: ConfigurationChange.EMPTY,
-    movementRelatedOrientation: MovementRelatedOrientation.EMPTY,
-    orientationRelatedToLocation: OrientationRelatedToLocation.EMPTY,
-    contactType: ContactType.EMPTY,
-    movementType: MovementType.EMPTY,
-    movementDirection: MovementDirection.EMPTY,
+  return videoDataFromCodes({
+    handedness: 'ONE',
+    location: 'NEUTRAL_SPACE',
+    orientationChange: 'FLEXION',
+    configurationChanges: 'EMPTY',
+    movementRelatedOrientation: 'EMPTY',
+    orientationRelatedToLocation: 'EMPTY',
+    contactType: 'EMPTY',
+    movementType: 'EMPTY',
+    movementDirection: 'EMPTY',
     vocalization: 'none',
     nonManualComponent: 'none',
     inicialization: 'none',
     repeatedMovement: false,
-  };
+  });
 }
 
 /** Two-handed asymmetric phonology for GERMÀ (see synonym GERMÀ+Conf 2 in bessons-1d.json). */
 function buildGermaPhonology() {
-  return {
-    handedness: Handedness.TWO_A,
-    dominantConfiguration: HandConfiguration.CONF_2,
-    nonDominantConfiguration: HandConfiguration.CONF_1,
-    dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
-    nonDominantRelationBetweenArticulators: RelationBetweenArticulators.FRONT,
-    configurationChanges: ConfigurationChange.OPENING,
-    location: Location.NEUTRAL_SPACE,
-    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-    orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-    orientationChange: OrientationChange.FLEXION,
-    contactType: ContactType.CONTINUOUS,
-    movementType: MovementType.ARC,
-    movementDirection: MovementDirection.FORWARDS,
+  return videoDataFromCodes({
+    handedness: 'TWO_A',
+    dominantConfiguration: 'CONF_2',
+    nonDominantConfiguration: 'CONF_1',
+    dominantRelationBetweenArticulators: 'NEXT_TO',
+    nonDominantRelationBetweenArticulators: 'FRONT',
+    configurationChanges: 'OPENING',
+    location: 'NEUTRAL_SPACE',
+    movementRelatedOrientation: 'FRONT',
+    orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+    orientationChange: 'FLEXION',
+    contactType: 'CONTINUOUS',
+    movementType: 'ARC',
+    movementDirection: 'FORWARDS',
     vocalization: 'none',
     nonManualComponent: 'none',
     inicialization: 'none',
     repeatedMovement: true,
-  };
+  });
 }
 
 /** Phonology for the full BESSONS-1d compound sign (distinct from component phonology). */
 function buildBessonsCompoundPhonology() {
-  return {
-    handedness: Handedness.TWO_S,
-    dominantConfiguration: HandConfiguration.CONF_2,
-    nonDominantConfiguration: HandConfiguration.CONF_2,
-    dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
-    nonDominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
-    configurationChanges: ConfigurationChange.OPENING_AND_SPREADING,
-    location: Location.NEUTRAL_SPACE,
-    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-    orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-    orientationChange: OrientationChange.FLEXION,
-    contactType: ContactType.CONTINUOUS,
-    movementType: MovementType.ARC,
-    movementDirection: MovementDirection.FORWARDS,
+  return videoDataFromCodes({
+    handedness: 'TWO_S',
+    dominantConfiguration: 'CONF_2',
+    nonDominantConfiguration: 'CONF_2',
+    dominantRelationBetweenArticulators: 'NEXT_TO',
+    nonDominantRelationBetweenArticulators: 'NEXT_TO',
+    configurationChanges: 'OPENING_AND_SPREADING',
+    location: 'NEUTRAL_SPACE',
+    movementRelatedOrientation: 'FRONT',
+    orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+    orientationChange: 'FLEXION',
+    contactType: 'CONTINUOUS',
+    movementType: 'ARC',
+    movementDirection: 'FORWARDS',
     vocalization: 'none',
     nonManualComponent: 'none',
     inicialization: 'none',
     repeatedMovement: true,
-  };
+  });
 }
 
 /** One-handed phonology for TERCER inline morpheme in nested compound example. */
 function buildTercerInlinePhonology() {
-  return {
-    handedness: Handedness.ONE,
-    dominantConfiguration: HandConfiguration.CONF_3,
-    configurationChanges: ConfigurationChange.CLOSING,
-    location: Location.CHEST,
-    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-    orientationRelatedToLocation: OrientationRelatedToLocation.EMPTY,
-    orientationChange: OrientationChange.EXTENSION,
-    contactType: ContactType.FINAL,
-    movementType: MovementType.STRAIGHT,
-    movementDirection: MovementDirection.DOWNWARDS,
+  return videoDataFromCodes({
+    handedness: 'ONE',
+    dominantConfiguration: 'CONF_3',
+    configurationChanges: 'CLOSING',
+    location: 'CHEST',
+    movementRelatedOrientation: 'FRONT',
+    orientationRelatedToLocation: 'EMPTY',
+    orientationChange: 'EXTENSION',
+    contactType: 'FINAL',
+    movementType: 'STRAIGHT',
+    movementDirection: 'DOWNWARDS',
     vocalization: 'none',
     nonManualComponent: 'none',
     inicialization: 'none',
     repeatedMovement: false,
-  };
+  });
 }
 
 /** Phonology for the full BESSONS-TRES nested compound sign. */
 function buildBessonsTresCompoundPhonology() {
-  return {
-    handedness: Handedness.TWO_S,
-    dominantConfiguration: HandConfiguration.CONF_3,
-    nonDominantConfiguration: HandConfiguration.CONF_3,
-    dominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
-    nonDominantRelationBetweenArticulators: RelationBetweenArticulators.NEXT_TO,
-    configurationChanges: ConfigurationChange.OPENING_AND_SPREADING,
-    location: Location.NEUTRAL_SPACE,
-    movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-    orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-    orientationChange: OrientationChange.FLEXION,
-    contactType: ContactType.CONTINUOUS,
-    movementType: MovementType.CIRCLE,
-    movementDirection: MovementDirection.FORWARDS,
+  return videoDataFromCodes({
+    handedness: 'TWO_S',
+    dominantConfiguration: 'CONF_3',
+    nonDominantConfiguration: 'CONF_3',
+    dominantRelationBetweenArticulators: 'NEXT_TO',
+    nonDominantRelationBetweenArticulators: 'NEXT_TO',
+    configurationChanges: 'OPENING_AND_SPREADING',
+    location: 'NEUTRAL_SPACE',
+    movementRelatedOrientation: 'FRONT',
+    orientationRelatedToLocation: 'AO_FINGERS_CONTRA',
+    orientationChange: 'FLEXION',
+    contactType: 'CONTINUOUS',
+    movementType: 'CIRCLE',
+    movementDirection: 'FORWARDS',
     vocalization: 'none',
     nonManualComponent: 'none',
     inicialization: 'none',
     repeatedMovement: true,
-  };
+  });
 }
 
 /** Inline morpheme video — not a published gloss; only shown on the parent compound. */
diff --git a/backend/scripts/generate-phonology-catalog-defaults.js b/backend/scripts/generate-phonology-catalog-defaults.js
new file mode 100644
index 0000000..9290f73
--- /dev/null
+++ b/backend/scripts/generate-phonology-catalog-defaults.js
@@ -0,0 +1,144 @@
+/**
+ * One-off generator: Prisma phonology enums + i18n labels + fitxa aliases
+ * → backend/src/phonology-values/phonology-catalog.defaults.json
+ */
+const fs = require('fs');
+const path = require('path');
+
+const ROOT = path.join(__dirname, '../..');
+const mappings = JSON.parse(
+  fs.readFileSync(path.join(ROOT, 'backend/src/import/fitxa-enum-mappings.json'), 'utf8'),
+);
+
+const I18N_SECTION_TO_DIMENSION = {
+  handedness: 'HANDEDNESS',
+  handConfiguration: 'HAND_CONFIGURATION',
+  configurationChange: 'CONFIGURATION_CHANGE',
+  relationBetweenArticulators: 'RELATION_BETWEEN_ARTICULATORS',
+  location: 'LOCATION',
+  movementRelatedOrientation: 'MOVEMENT_RELATED_ORIENTATION',
+  orientationRelatedToLocation: 'ORIENTATION_RELATED_TO_LOCATION',
+  orientationChange: 'ORIENTATION_CHANGE',
+  contactType: 'CONTACT_TYPE',
+  movementType: 'MOVEMENT_TYPE',
+  movementDirection: 'MOVEMENT_DIRECTION',
+};
+
+const MAPPING_FIELD_TO_DIMENSION = {
+  handedness: 'HANDEDNESS',
+  configuration: 'HAND_CONFIGURATION',
+  configurationChanges: 'CONFIGURATION_CHANGE',
+  relationBetweenArticulators: 'RELATION_BETWEEN_ARTICULATORS',
+  location: 'LOCATION',
+  movementRelatedOrientation: 'MOVEMENT_RELATED_ORIENTATION',
+  orientationRelatedToLocation: 'ORIENTATION_RELATED_TO_LOCATION',
+  orientationChange: 'ORIENTATION_CHANGE',
+  contactType: 'CONTACT_TYPE',
+  movementType: 'MOVEMENT_TYPE',
+  movementDirection: 'MOVEMENT_DIRECTION',
+};
+
+const HANDEDNESS_FITXA_TO_CODE = {
+  '1': 'ONE',
+  '2a': 'TWO_A',
+  '2n': 'TWO_N',
+  '2s': 'TWO_S',
+  x: 'NA',
+};
+
+const FALLBACK_CODES = {
+  HANDEDNESS: ['ONE', 'TWO_A', 'TWO_N', 'TWO_S', 'NA'],
+  HAND_CONFIGURATION: [],
+  CONFIGURATION_CHANGE: [],
+  RELATION_BETWEEN_ARTICULATORS: [],
+  LOCATION: [],
+  MOVEMENT_RELATED_ORIENTATION: [],
+  ORIENTATION_RELATED_TO_LOCATION: [],
+  ORIENTATION_CHANGE: [],
+  CONTACT_TYPE: [],
+  MOVEMENT_TYPE: [],
+  MOVEMENT_DIRECTION: [],
+};
+
+function loadPhonologyI18n(rel) {
+  const text = fs.readFileSync(path.join(ROOT, rel), 'utf8');
+  const match = text.match(/const phonology[^=]*=\s*(\{[\s\S]*\});/);
+  if (!match) throw new Error(`Could not parse ${rel}`);
+  return Function(`"use strict"; return (${match[1]});`)();
+}
+
+function codesFromI18n(section) {
+  return Object.keys(section).filter((k) => !k.endsWith('_description'));
+}
+
+function loadAliases() {
+  const byDimCode = new Map();
+  const add = (dimension, code, alias) => {
+    if (!code || alias == null || alias === '') return;
+    const key = `${dimension}:${code}`;
+    if (!byDimCode.has(key)) byDimCode.set(key, new Set());
+    byDimCode.get(key).add(String(alias));
+  };
+
+  for (const [field, dimension] of Object.entries(MAPPING_FIELD_TO_DIMENSION)) {
+    const entries = mappings.fields[field]?.entries;
+    if (!Array.isArray(entries)) continue;
+    for (const entry of entries) {
+      let code = entry.signbankId;
+      if (!code && dimension === 'HANDEDNESS') {
+        code = HANDEDNESS_FITXA_TO_CODE[String(entry.code)];
+      }
+      if (!code) continue;
+      for (const alias of entry.aliases || []) add(dimension, code, alias);
+      if (entry.code != null) add(dimension, code, entry.code);
+    }
+  }
+  return byDimCode;
+}
+
+const ca = loadPhonologyI18n('frontend/src/i18n/ca-ES/phonology.ts');
+const en = loadPhonologyI18n('frontend/src/i18n/en-US/phonology.ts');
+const es = loadPhonologyI18n('frontend/src/i18n/es-ES/phonology.ts');
+const aliases = loadAliases();
+
+const defaults = [];
+for (const [section, dimension] of Object.entries(I18N_SECTION_TO_DIMENSION)) {
+  const caSection = ca.phonology[section] || {};
+  const enSection = en.phonology[section] || {};
+  const esSection = es.phonology[section] || {};
+  const codes = codesFromI18n(caSection);
+  const extra = FALLBACK_CODES[dimension].filter((c) => !codes.includes(c));
+  const allCodes = [...codes, ...extra];
+  allCodes.forEach((code, index) => {
+    const key = `${dimension}:${code}`;
+    const aliasSet = aliases.get(key) || new Set();
+    defaults.push({
+      dimension,
+      code,
+      labelCa: caSection[code] ?? code,
+      labelEn: enSection[code] ?? null,
+      labelEs: esSection[code] ?? null,
+      descriptionCa: caSection[`${code}_description`] ?? null,
+      descriptionEn: enSection[`${code}_description`] ?? null,
+      descriptionEs: esSection[`${code}_description`] ?? null,
+      aliases: [...aliasSet].sort(),
+      sortOrder: index,
+    });
+  });
+}
+
+const outDir = path.join(ROOT, 'backend/src/phonology-values');
+fs.mkdirSync(outDir, { recursive: true });
+const outFile = path.join(outDir, 'phonology-catalog.defaults.json');
+fs.writeFileSync(outFile, JSON.stringify(defaults, null, 2) + '\n');
+console.log(`Wrote ${defaults.length} catalog entries to ${path.relative(ROOT, outFile)}`);
+console.log(
+  Object.entries(
+    defaults.reduce((acc, row) => {
+      acc[row.dimension] = (acc[row.dimension] || 0) + 1;
+      return acc;
+    }, {}),
+  )
+    .map(([k, v]) => `  ${k}: ${v}`)
+    .join('\n'),
+);
diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts
index 06ebe2e..2742436 100644
--- a/backend/src/app.module.ts
+++ b/backend/src/app.module.ts
@@ -18,12 +18,14 @@ import { ExampleTranslationsModule } from './example-translations/example-transl
 import { UsersModule } from './users/users.module';
 import { BackupModule } from './backup/backup.module';
 import { BulkImportModule } from './bulk-import/bulk-import.module';
+import { PhonologyValuesModule } from './phonology-values/phonology-values.module';
 
 @Module({
   imports: [
     ScheduleModule.forRoot(),
     PrismaModule,
     AuthModule,
+    PhonologyValuesModule,
     GlossRequestsModule,
     GlossesModule,
     GlossDataModule,
diff --git a/backend/src/bulk-import/bulk-import.service.ts b/backend/src/bulk-import/bulk-import.service.ts
index 1c14940..b10abb6 100644
--- a/backend/src/bulk-import/bulk-import.service.ts
+++ b/backend/src/bulk-import/bulk-import.service.ts
@@ -1,20 +1,9 @@
 import { Injectable, Logger } from '@nestjs/common';
 import {
-  ConfigurationChange,
-  ContactType,
   GlossStatus,
-  Handedness,
-  HandConfiguration,
   Language,
   LexicalCategory,
-  Location,
-  MovementDirection,
-  MovementRelatedOrientation,
-  MovementType,
-  OrientationChange,
-  OrientationRelatedToLocation,
   Prisma,
-  RelationBetweenArticulators,
   RelationType,
 } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.service';
@@ -27,6 +16,7 @@ import type {
   MappedFitxa,
   MappedPhonology,
 } from './fitxa.types';
+import { videoDataFromCodes } from '../phonology-values/phonology-video-data';
 
 type UploadedJsonFile = {
   originalname: string;
@@ -370,29 +360,7 @@ export class BulkImportService {
   }
 
   private videoDataCreate(phonology: MappedPhonology) {
-    return {
-      handedness: phonology.handedness as Handedness,
-      dominantConfiguration: phonology.dominantConfiguration as HandConfiguration | null,
-      nonDominantConfiguration: phonology.nonDominantConfiguration as HandConfiguration | null,
-      dominantRelationBetweenArticulators:
-        phonology.dominantRelationBetweenArticulators as RelationBetweenArticulators | null,
-      nonDominantRelationBetweenArticulators:
-        phonology.nonDominantRelationBetweenArticulators as RelationBetweenArticulators | null,
-      configurationChanges: phonology.configurationChanges as ConfigurationChange,
-      location: phonology.location as Location,
-      movementRelatedOrientation:
-        phonology.movementRelatedOrientation as MovementRelatedOrientation,
-      orientationRelatedToLocation:
-        phonology.orientationRelatedToLocation as OrientationRelatedToLocation,
-      orientationChange: phonology.orientationChange as OrientationChange,
-      contactType: phonology.contactType as ContactType,
-      movementType: phonology.movementType as MovementType,
-      movementDirection: phonology.movementDirection as MovementDirection,
-      vocalization: phonology.vocalization,
-      nonManualComponent: phonology.nonManualComponent,
-      inicialization: phonology.inicialization,
-      repeatedMovement: phonology.repeatedMovement,
-    };
+    return videoDataFromCodes(phonology);
   }
 
   private async ensureLinks(
@@ -540,18 +508,12 @@ export class BulkImportService {
       ? index.get(this.glossKey(part.gloss))?.id ?? null
       : null;
 
-    if (linkedGlossId) {
-      await this.prisma.compoundPart.create({
-        data: {
-          glossDataId,
-          position: part.position,
-          gloss: part.gloss,
-          compExternalId: part.compExternalId,
-          redundant: part.redundant,
-          linkedGlossId,
-        },
+    let inlinePhonologyId: string | undefined;
+    if (!linkedGlossId && part.phonology) {
+      const phonology = await this.prisma.videoData.create({
+        data: this.videoDataCreate(part.phonology),
       });
-      return;
+      inlinePhonologyId = phonology.id;
     }
 
     await this.prisma.compoundPart.create({
@@ -561,9 +523,8 @@ export class BulkImportService {
         gloss: part.gloss,
         compExternalId: part.compExternalId,
         redundant: part.redundant,
-        inlinePhonology: part.phonology
-          ? { create: this.videoDataCreate(part.phonology) }
-          : undefined,
+        linkedGlossId,
+        inlinePhonologyId,
       },
     });
   }
diff --git a/backend/src/gloss-data/gloss-data.module.ts b/backend/src/gloss-data/gloss-data.module.ts
index a80a31f..e860931 100644
--- a/backend/src/gloss-data/gloss-data.module.ts
+++ b/backend/src/gloss-data/gloss-data.module.ts
@@ -2,9 +2,10 @@ import { Module } from '@nestjs/common';
 import { GlossDataController } from './gloss-data.controller';
 import { GlossDataService } from './gloss-data.service';
 import { PrismaModule } from '../prisma/prisma.module';
+import { PhonologyValuesModule } from '../phonology-values/phonology-values.module';
 
 @Module({
-  imports: [PrismaModule],
+  imports: [PrismaModule, PhonologyValuesModule],
   controllers: [GlossDataController],
   providers: [GlossDataService],
   exports: [GlossDataService],
diff --git a/backend/src/gloss-data/gloss-data.service.ts b/backend/src/gloss-data/gloss-data.service.ts
index 4c226cb..5ee27e2 100644
--- a/backend/src/gloss-data/gloss-data.service.ts
+++ b/backend/src/gloss-data/gloss-data.service.ts
@@ -2,11 +2,18 @@ import { Injectable, NotFoundException, BadRequestException, ConflictException }
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { PrismaService } from '../prisma/prisma.service';
 import { UpdateDefinitionDto, UpdateDefinitionTranslationDto } from './dto/update-definition.dto';
-import { GlossStatus, Handedness, Language, LexicalCategory, Prisma } from '@prisma/client';
+import { GlossStatus, Language, LexicalCategory, Prisma } from '@prisma/client';
 import { GLOSS_SEARCH_SYNC_EVENT } from '../typesense/types/gloss-index.type';
 import { compoundPartsInclude } from '../glosses/compound-include';
 import { CompoundPartInputDto, UpdateCompoundDto } from './dto/update-compound.dto';
 import { VideoDataDto } from '../sign-videos/dto/video-data.dto';
+import { PhonologyValuesService } from '../phonology-values/phonology-values.service';
+import {
+  flattenPhonologyInTree,
+  videoDataFromCodes,
+  videoDataPhonologyInclude,
+  videoDataUpdateFromCodes,
+} from '../phonology-values/phonology-video-data';
 
 const glossDataInclude = {
   dictionaryEntry: true,
@@ -14,7 +21,7 @@ const glossDataInclude = {
   glossVideos: {
     include: {
       videos: true,
-      videoData: true,
+      videoData: { include: videoDataPhonologyInclude },
     },
   },
   definitions: {
@@ -85,13 +92,15 @@ export class GlossDataService {
   constructor(
     private prisma: PrismaService,
     private eventEmitter: EventEmitter2,
+    private phonologyValuesService: PhonologyValuesService,
   ) {}
 
   async getGlossData(id: string) {
-    return this.prisma.glossData.findUnique({
+    const gloss = await this.prisma.glossData.findUnique({
       where: { id },
       include: glossDataInclude,
     });
+    return flattenPhonologyInTree(gloss);
   }
 
   async updateGloss(id: string, gloss: string) {
@@ -723,26 +732,9 @@ export class GlossDataService {
     return this.getGlossData(signVideo.glossDataId);
   }
 
-  private buildVideoDataCreateInput(videoData: VideoDataDto): Prisma.VideoDataCreateInput {
-    return {
-      handedness: videoData.handedness || Handedness.ONE,
-      dominantConfiguration: videoData.dominantConfiguration ?? null,
-      nonDominantConfiguration: videoData.nonDominantConfiguration ?? null,
-      dominantRelationBetweenArticulators: videoData.dominantRelationBetweenArticulators ?? null,
-      nonDominantRelationBetweenArticulators: videoData.nonDominantRelationBetweenArticulators ?? null,
-      configurationChanges: videoData.configurationChanges || 'EMPTY',
-      location: videoData.location || 'EMPTY',
-      movementRelatedOrientation: videoData.movementRelatedOrientation || 'EMPTY',
-      orientationRelatedToLocation: videoData.orientationRelatedToLocation || 'EMPTY',
-      orientationChange: videoData.orientationChange || 'EMPTY',
-      contactType: videoData.contactType || 'EMPTY',
-      movementType: videoData.movementType || 'EMPTY',
-      movementDirection: videoData.movementDirection || 'EMPTY',
-      vocalization: videoData.vocalization || 'none',
-      nonManualComponent: videoData.nonManualComponent || 'none',
-      inicialization: videoData.inicialization || 'none',
-      repeatedMovement: videoData.repeatedMovement ?? false,
-    };
+  private async buildVideoDataCreateInput(videoData: VideoDataDto): Promise<Prisma.VideoDataCreateInput> {
+    await this.phonologyValuesService.assertVideoDataCodes(videoData);
+    return videoDataFromCodes(videoData);
   }
 
   private async deleteCompoundPartById(partId: string) {
@@ -892,11 +884,11 @@ export class GlossDataService {
     if (phonologyId) {
       await this.prisma.videoData.update({
         where: { id: phonologyId },
-        data: this.buildVideoDataCreateInput(partDto.inlinePhonology),
+        data: videoDataUpdateFromCodes(partDto.inlinePhonology),
       });
     } else {
       const created = await this.prisma.videoData.create({
-        data: this.buildVideoDataCreateInput(partDto.inlinePhonology),
+        data: await this.buildVideoDataCreateInput(partDto.inlinePhonology),
       });
       phonologyId = created.id;
     }
diff --git a/backend/src/gloss-requests/dto/create-gloss-request.dto.ts b/backend/src/gloss-requests/dto/create-gloss-request.dto.ts
index 9d1d4a8..6a93faa 100644
--- a/backend/src/gloss-requests/dto/create-gloss-request.dto.ts
+++ b/backend/src/gloss-requests/dto/create-gloss-request.dto.ts
@@ -1,57 +1,9 @@
 import { IsString, IsOptional, ValidateNested, IsEnum, IsNotEmpty, ArrayNotEmpty, IsInt, Min, IsArray } from 'class-validator';
 import { Type, Transform } from 'class-transformer';
-import { Language, LexicalCategory, Handedness, RelationType, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType } from '@prisma/client';
+import { Language, LexicalCategory, RelationType } from '@prisma/client';
+import { VideoDataDto } from '../../sign-videos/dto/video-data.dto';
 
-export class VideoDataDto {
-  @IsEnum(Handedness)
-  handedness: Handedness;
-
-  @IsEnum(HandConfiguration)
-  @IsOptional()
-  dominantConfiguration?: HandConfiguration;
-
-  @IsEnum(HandConfiguration)
-  @IsOptional()
-  nonDominantConfiguration?: HandConfiguration;
-
-  @IsEnum(ConfigurationChange)
-  configurationChanges: ConfigurationChange;
-
-  @IsEnum(RelationBetweenArticulators)
-  @IsOptional()
-  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
-
-  @IsEnum(RelationBetweenArticulators)
-  @IsOptional()
-  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
-
-  @IsEnum(Location)
-  location: Location;
-
-  @IsEnum(MovementRelatedOrientation)
-  movementRelatedOrientation: MovementRelatedOrientation;
-
-  @IsEnum(OrientationRelatedToLocation)
-  orientationRelatedToLocation: OrientationRelatedToLocation;
-
-  @IsEnum(OrientationChange)
-  orientationChange: OrientationChange;
-
-  @IsEnum(ContactType)
-  contactType: ContactType;
-
-  @IsEnum(MovementType)
-  movementType: MovementType;
-
-  @IsString()
-  vocalization: string;
-
-  @IsString()
-  nonManualComponent: string;
-
-  @IsString()
-  inicialization: string;
-}
+export { VideoDataDto };
 
 export class VideoDto {
   @IsString()
diff --git a/backend/src/gloss-requests/gloss-requests.service.ts b/backend/src/gloss-requests/gloss-requests.service.ts
index 2c3d85c..7601515 100644
--- a/backend/src/gloss-requests/gloss-requests.service.ts
+++ b/backend/src/gloss-requests/gloss-requests.service.ts
@@ -6,6 +6,7 @@ import { DeclineGlossRequestDto } from './dto/decline-gloss-request.dto';
 import { GlossStatus, RequestStatus } from '@prisma/client';
 import { validateGlossRequest } from '../utils/gloss-validation';
 import { GLOSS_SEARCH_SYNC_EVENT } from '../typesense/types/gloss-index.type';
+import { flattenPhonologyInTree, videoDataPhonologyInclude } from '../phonology-values/phonology-video-data';
 
 const requestedGlossDataInclude = {
   definitions: {
@@ -23,7 +24,7 @@ const requestedGlossDataInclude = {
   glossVideos: {
     include: {
       videos: true,
-      videoData: true,
+      videoData: { include: videoDataPhonologyInclude },
     },
   },
   minimalPairsAsSource: {
@@ -84,7 +85,7 @@ export class GlossRequestsService {
   }
 
   async getGlossRequest(id: string) {
-    return this.prisma.glossRequest.findUnique({
+    const request = await this.prisma.glossRequest.findUnique({
       where: { id },
       include: {
         creator: true,
@@ -93,6 +94,7 @@ export class GlossRequestsService {
         requestedGlossData: { include: requestedGlossDataInclude },
       },
     });
+    return flattenPhonologyInTree(request);
   }
 
   async createGlossRequest(userId: string, createGlossRequestDto: CreateGlossRequestDto) {
@@ -192,13 +194,15 @@ export class GlossRequestsService {
       });
     }
 
-    return this.prisma.glossRequest.update({
-      where: { id },
-      data: { status: RequestStatus.WAITING_FOR_APPROVAL },
-      include: {
-        creator: { select: { id: true, username: true, email: true } },
-        requestedGlossData: { include: requestedGlossDataInclude },
-      },
-    });
+    return flattenPhonologyInTree(
+      await this.prisma.glossRequest.update({
+        where: { id },
+        data: { status: RequestStatus.WAITING_FOR_APPROVAL },
+        include: {
+          creator: { select: { id: true, username: true, email: true } },
+          requestedGlossData: { include: requestedGlossDataInclude },
+        },
+      }),
+    );
   }
 }
diff --git a/backend/src/glosses/compound-include.ts b/backend/src/glosses/compound-include.ts
index 42c2560..4dfb1e3 100644
--- a/backend/src/glosses/compound-include.ts
+++ b/backend/src/glosses/compound-include.ts
@@ -1,43 +1,45 @@
-/** Nested compound parts for gloss detail (max ~2 levels per domain rules). */

-const glossVideosInclude = {

-  orderBy: { priority: 'asc' as const },

-  include: {

-    videoData: true,

-    videos: { orderBy: { priority: 'asc' as const } },

-  },

-};

-

-const inlineSignVideoInclude = {

-  include: {

-    videos: { orderBy: { priority: 'asc' as const } },

-    videoData: true,

-  },

-};

-

-/** Linked gloss at the innermost compound level (e.g. GERMÀ inside BESSONS-1d). */

-const nestedLinkedGlossInclude = {

-  include: {

-    glossVideos: glossVideosInclude,

-  },

-};

-

-export const compoundPartsInclude = {

-  orderBy: { position: 'asc' as const },

-  include: {

-    linkedGloss: {

-      include: {

-        glossVideos: glossVideosInclude,

-        compoundParts: {

-          orderBy: { position: 'asc' as const },

-          include: {

-            linkedGloss: nestedLinkedGlossInclude,

-            inlinePhonology: true,

-            inlineSignVideo: inlineSignVideoInclude,

-          },

-        },

-      },

-    },

-    inlinePhonology: true,

-    inlineSignVideo: inlineSignVideoInclude,

-  },

-};

+/** Nested compound parts for gloss detail (max ~2 levels per domain rules). */
+import { videoDataPhonologyInclude } from '../phonology-values/phonology-video-data';
+
+const glossVideosInclude = {
+  orderBy: { priority: 'asc' as const },
+  include: {
+    videoData: { include: videoDataPhonologyInclude },
+    videos: { orderBy: { priority: 'asc' as const } },
+  },
+};
+
+const inlineSignVideoInclude = {
+  include: {
+    videos: { orderBy: { priority: 'asc' as const } },
+    videoData: { include: videoDataPhonologyInclude },
+  },
+};
+
+/** Linked gloss at the innermost compound level (e.g. GERMÀ inside BESSONS-1d). */
+const nestedLinkedGlossInclude = {
+  include: {
+    glossVideos: glossVideosInclude,
+  },
+};
+
+export const compoundPartsInclude = {
+  orderBy: { position: 'asc' as const },
+  include: {
+    linkedGloss: {
+      include: {
+        glossVideos: glossVideosInclude,
+        compoundParts: {
+          orderBy: { position: 'asc' as const },
+          include: {
+            linkedGloss: nestedLinkedGlossInclude,
+            inlinePhonology: { include: videoDataPhonologyInclude },
+            inlineSignVideo: inlineSignVideoInclude,
+          },
+        },
+      },
+    },
+    inlinePhonology: { include: videoDataPhonologyInclude },
+    inlineSignVideo: inlineSignVideoInclude,
+  },
+};
diff --git a/backend/src/glosses/glosses.service.ts b/backend/src/glosses/glosses.service.ts
index ceb783b..ba913f5 100644
--- a/backend/src/glosses/glosses.service.ts
+++ b/backend/src/glosses/glosses.service.ts
@@ -2,6 +2,7 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
 import { GlossStatus } from '@prisma/client'
 import { compoundPartsInclude } from './compound-include';
+import { flattenPhonologyInTree, videoDataPhonologyInclude } from '../phonology-values/phonology-video-data';
 
 @Injectable()
 export class GlossesService {
@@ -27,7 +28,7 @@ export class GlossesService {
         glossVideos: {
           include: {
             videos: true,
-            videoData: true,
+            videoData: { include: videoDataPhonologyInclude },
           },
         },
         relationsAsSource: {
@@ -37,7 +38,7 @@ export class GlossesService {
                 glossVideos: {
                   include: {
                     videos: true,
-                    videoData: true,
+                    videoData: { include: videoDataPhonologyInclude },
                   },
                 },
               },
@@ -61,7 +62,7 @@ export class GlossesService {
                 glossVideos: {
                   include: {
                     videos: true,
-                    videoData: true,
+                    videoData: { include: videoDataPhonologyInclude },
                   },
                 },
               },
@@ -78,7 +79,7 @@ export class GlossesService {
                 glossVideos: {
                   include: {
                     videos: true,
-                    videoData: true,
+                    videoData: { include: videoDataPhonologyInclude },
                   },
                 },
               },
@@ -104,6 +105,6 @@ export class GlossesService {
       throw new NotFoundException(`Gloss with ID ${id} not found`);
     }
 
-    return gloss;
+    return flattenPhonologyInTree(gloss);
   }
 } 
\ No newline at end of file
diff --git a/backend/src/phonology-values/dto/create-phonology-value.dto.ts b/backend/src/phonology-values/dto/create-phonology-value.dto.ts
new file mode 100644
index 0000000..95bdc6c
--- /dev/null
+++ b/backend/src/phonology-values/dto/create-phonology-value.dto.ts
@@ -0,0 +1,66 @@
+import {
+  IsArray,
+  IsBoolean,
+  IsEnum,
+  IsInt,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  Min,
+} from 'class-validator';
+import { Transform } from 'class-transformer';
+import { PhonologyDimension } from '@prisma/client';
+
+export class CreatePhonologyValueDto {
+  @IsEnum(PhonologyDimension)
+  dimension: PhonologyDimension;
+
+  @IsString()
+  @IsNotEmpty()
+  code: string;
+
+  @IsString()
+  @IsNotEmpty()
+  labelCa: string;
+
+  @IsOptional()
+  @IsString()
+  labelEn?: string;
+
+  @IsOptional()
+  @IsString()
+  labelEs?: string;
+
+  @IsOptional()
+  @IsString()
+  descriptionCa?: string;
+
+  @IsOptional()
+  @IsString()
+  descriptionEn?: string;
+
+  @IsOptional()
+  @IsString()
+  descriptionEs?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  @Transform(({ value }) =>
+    Array.isArray(value)
+      ? value
+      : typeof value === 'string'
+        ? value.split(',').map((item) => item.trim()).filter(Boolean)
+        : [],
+  )
+  aliases?: string[];
+
+  @IsOptional()
+  @IsInt()
+  @Min(0)
+  sortOrder?: number;
+
+  @IsOptional()
+  @IsBoolean()
+  active?: boolean;
+}
diff --git a/backend/src/phonology-values/dto/query-phonology-values.dto.ts b/backend/src/phonology-values/dto/query-phonology-values.dto.ts
new file mode 100644
index 0000000..6de7342
--- /dev/null
+++ b/backend/src/phonology-values/dto/query-phonology-values.dto.ts
@@ -0,0 +1,25 @@
+import { IsBoolean, IsEnum, IsOptional } from 'class-validator';
+import { Transform } from 'class-transformer';
+import { PhonologyDimension } from '@prisma/client';
+
+function toBoolean(value: unknown): boolean {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'string') return value.toLowerCase() === 'true' || value === '1';
+  return false;
+}
+
+export class QueryPhonologyValuesDto {
+  @IsOptional()
+  @IsEnum(PhonologyDimension)
+  dimension?: PhonologyDimension;
+
+  @IsOptional()
+  @Transform(({ value }) => toBoolean(value))
+  @IsBoolean()
+  includeInactive?: boolean;
+
+  @IsOptional()
+  @Transform(({ value }) => toBoolean(value))
+  @IsBoolean()
+  withUsage?: boolean;
+}
diff --git a/backend/src/phonology-values/dto/update-phonology-value.dto.ts b/backend/src/phonology-values/dto/update-phonology-value.dto.ts
new file mode 100644
index 0000000..e1d6a98
--- /dev/null
+++ b/backend/src/phonology-values/dto/update-phonology-value.dto.ts
@@ -0,0 +1,60 @@
+import {
+  IsArray,
+  IsBoolean,
+  IsInt,
+  IsOptional,
+  IsString,
+  Min,
+} from 'class-validator';
+import { Transform } from 'class-transformer';
+
+export class UpdatePhonologyValueDto {
+  @IsOptional()
+  @IsString()
+  code?: string;
+
+  @IsOptional()
+  @IsString()
+  labelCa?: string;
+
+  @IsOptional()
+  @IsString()
+  labelEn?: string;
+
+  @IsOptional()
+  @IsString()
+  labelEs?: string;
+
+  @IsOptional()
+  @IsString()
+  descriptionCa?: string;
+
+  @IsOptional()
+  @IsString()
+  descriptionEn?: string;
+
+  @IsOptional()
+  @IsString()
+  descriptionEs?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  @Transform(({ value }) =>
+    Array.isArray(value)
+      ? value
+      : typeof value === 'string'
+        ? value.split(',').map((item) => item.trim()).filter(Boolean)
+        : [],
+  )
+  aliases?: string[];
+
+  @IsOptional()
+  @IsInt()
+  @Min(0)
+  sortOrder?: number;
+
+  @IsOptional()
+  @IsBoolean()
+  active?: boolean;
+}
diff --git a/backend/src/phonology-values/phonology-catalog.defaults.json b/backend/src/phonology-values/phonology-catalog.defaults.json
new file mode 100644
index 0000000..082711e
--- /dev/null
+++ b/backend/src/phonology-values/phonology-catalog.defaults.json
@@ -0,0 +1,6169 @@
+[
+  {
+    "dimension": "HANDEDNESS",
+    "code": "ONE",
+    "labelCa": "1",
+    "labelEn": "1",
+    "labelEs": "1",
+    "descriptionCa": "Signe amb una mà",
+    "descriptionEn": "One-handed sign",
+    "descriptionEs": "Signo con una mano",
+    "aliases": [
+      "1"
+    ],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "HANDEDNESS",
+    "code": "TWO_A",
+    "labelCa": "2a",
+    "labelEn": "2a",
+    "labelEs": "2a",
+    "descriptionCa": "Signe amb dues mans assimètric",
+    "descriptionEn": "Two-handed asymmetrical",
+    "descriptionEs": "Signo con dos manos asimétrico",
+    "aliases": [
+      "2a"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "HANDEDNESS",
+    "code": "TWO_N",
+    "labelCa": "2n",
+    "labelEn": "2n",
+    "labelEs": "2n",
+    "descriptionCa": "Signe amb dues mans no mirall",
+    "descriptionEn": "Two-handed non-mirrored",
+    "descriptionEs": "Signo con dos manos no espejadas",
+    "aliases": [
+      "2n"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "HANDEDNESS",
+    "code": "TWO_S",
+    "labelCa": "2s",
+    "labelEn": "2s",
+    "labelEs": "2s",
+    "descriptionCa": "Signe amb dues mans simètric",
+    "descriptionEn": "Two-handed symmetrical",
+    "descriptionEs": "Signo con dos manos simétrico",
+    "aliases": [
+      "2s"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "HANDEDNESS",
+    "code": "NA",
+    "labelCa": "x",
+    "labelEn": "x",
+    "labelEs": "x",
+    "descriptionCa": "No aplicable",
+    "descriptionEn": "Not applicable",
+    "descriptionEs": "No aplicable",
+    "aliases": [
+      "x"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "EMPTY",
+    "labelCa": "------- BUIT -------",
+    "labelEn": "------- BUIT -------",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1",
+    "labelCa": "0",
+    "labelEn": "BABY_O",
+    "labelEs": "BABY_O",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "(baby_o)",
+      "baby_o",
+      "baby_o ()"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_2",
+    "labelCa": "0e",
+    "labelEn": "BABY_beak_closed",
+    "labelEs": "BABY_beak_closed",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "0e",
+      "0e (baby_beak_closed)",
+      "baby_beak_closed",
+      "baby_beak_closed (0e)"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_3",
+    "labelCa": "0_SSI",
+    "labelEn": "O",
+    "labelEs": "O",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "0_ssi",
+      "0_ssi (o)",
+      "o",
+      "o (0_ssi)"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_4",
+    "labelCa": "1",
+    "labelEn": "1",
+    "labelEs": "1",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "1",
+      "1 (1)"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_5",
+    "labelCa": "1d",
+    "labelEn": "1_curved",
+    "labelEs": "1_curved",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "1_curved",
+      "1_curved (1d)",
+      "1d",
+      "1d (1_curved)"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_6",
+    "labelCa": "2",
+    "labelEn": "beak2_open_spread",
+    "labelEs": "beak2_open_spread",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "2",
+      "2 (beak2_open_spread)",
+      "beak2_open_spread",
+      "beak2_open_spread (2)"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D834",
+    "labelCa": "2t",
+    "labelEn": "Beak2_open",
+    "labelEs": "Beak2_open",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "2t",
+      "2t (beak2_open)",
+      "beak2_open",
+      "beak2_open (2t)"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_7",
+    "labelCa": "2d",
+    "labelEn": "C2_spread",
+    "labelEs": "C2_spread",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "2d",
+      "2d (c2_spread)",
+      "c2_spread",
+      "c2_spread (2d)"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_8",
+    "labelCa": "3",
+    "labelEn": "3",
+    "labelEs": "3",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "3",
+      "3 (3)"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_9",
+    "labelCa": "3d",
+    "labelEn": "3_curved",
+    "labelEs": "3_curved",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "3_curved",
+      "3_curved (3d)",
+      "3d",
+      "3d (3_curved)"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_10",
+    "labelCa": "4",
+    "labelEn": "4",
+    "labelEs": "4",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "4",
+      "4 (4)"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_11",
+    "labelCa": "4d",
+    "labelEn": "4_curved",
+    "labelEs": "4_curved",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "4_curved",
+      "4_curved (4d)",
+      "4d",
+      "4d (4_curved)"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_12",
+    "labelCa": "5",
+    "labelEn": "5",
+    "labelEs": "5",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "5",
+      "5 (5)"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_13",
+    "labelCa": "5d",
+    "labelEn": "C_spread",
+    "labelEs": "C_spread",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "5d",
+      "5d (c_spread)",
+      "c_spread",
+      "c_spread (5d)"
+    ],
+    "sortOrder": 14
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_14",
+    "labelCa": "6",
+    "labelEn": "A",
+    "labelEs": "A",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "6",
+      "6 (a)",
+      "a",
+      "a (6)"
+    ],
+    "sortOrder": 15
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_15",
+    "labelCa": "6d",
+    "labelEn": "6d",
+    "labelEs": "6d",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "6d",
+      "6d (6d)"
+    ],
+    "sortOrder": 16
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_16",
+    "labelCa": "7",
+    "labelEn": "Baby_beak_open",
+    "labelEs": "Baby_beak_open",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "7",
+      "7 (baby_beak_open)",
+      "baby_beak_open",
+      "baby_beak_open (7)"
+    ],
+    "sortOrder": 17
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D86C",
+    "labelCa": "7d",
+    "labelEn": "BABY_C",
+    "labelEs": "BABY_C",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "7d",
+      "7d (baby_c)",
+      "baby_c",
+      "baby_c (7d)"
+    ],
+    "sortOrder": 18
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_18",
+    "labelCa": "8",
+    "labelEn": "W",
+    "labelEs": "W",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "8",
+      "8 (w)",
+      "w",
+      "w (8)"
+    ],
+    "sortOrder": 19
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D82E",
+    "labelCa": "8t",
+    "labelEn": "L2",
+    "labelEs": "L2",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "8t",
+      "8t (l2)",
+      "l2",
+      "l2 (8t)"
+    ],
+    "sortOrder": 20
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_19",
+    "labelCa": "8d",
+    "labelEn": "V_curved",
+    "labelEs": "V_curved",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "8d",
+      "8d (v_curved)",
+      "v_curved",
+      "v_curved (8d)"
+    ],
+    "sortOrder": 21
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_20",
+    "labelCa": "A",
+    "labelEn": "E",
+    "labelEs": "E",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "a",
+      "a (e)",
+      "e",
+      "e (a)"
+    ],
+    "sortOrder": 22
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_21",
+    "labelCa": "B",
+    "labelEn": "B",
+    "labelEs": "B",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "b",
+      "b (b)"
+    ],
+    "sortOrder": 23
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_22",
+    "labelCa": "Bd",
+    "labelEn": "B_bent",
+    "labelEs": "B_bent",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "b_bent",
+      "b_bent (bd)",
+      "bd",
+      "bd (b_bent)"
+    ],
+    "sortOrder": 24
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_23",
+    "labelCa": "C",
+    "labelEn": "C",
+    "labelEs": "C",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "c",
+      "c (c)"
+    ],
+    "sortOrder": 25
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_24",
+    "labelCa": "D",
+    "labelEn": "P",
+    "labelEs": "P",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "d",
+      "d (p)",
+      "p",
+      "p (d)"
+    ],
+    "sortOrder": 26
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_25",
+    "labelCa": "E",
+    "labelEn": "C_spread",
+    "labelEs": "C_spread",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "c_spread",
+      "c_spread (e)",
+      "e",
+      "e (c_spread)"
+    ],
+    "sortOrder": 27
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_26",
+    "labelCa": "F",
+    "labelEn": "F",
+    "labelEs": "F",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "f",
+      "f (f)"
+    ],
+    "sortOrder": 28
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_27",
+    "labelCa": "G_SSI",
+    "labelEn": "BABY_C_extended",
+    "labelEs": "BABY_C_extended",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "baby_c_extended",
+      "baby_c_extended (g_ssi)",
+      "g_ssi",
+      "g_ssi (baby_c_extended)"
+    ],
+    "sortOrder": 29
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_29",
+    "labelCa": "Id",
+    "labelEn": "Id",
+    "labelEs": "Id",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "(id)",
+      "id",
+      "id ()"
+    ],
+    "sortOrder": 30
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_30",
+    "labelCa": "I",
+    "labelEn": "I",
+    "labelEs": "I",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "i",
+      "i (i)"
+    ],
+    "sortOrder": 31
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_31",
+    "labelCa": "K",
+    "labelEn": "K",
+    "labelEs": "K",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "k",
+      "k (k)"
+    ],
+    "sortOrder": 32
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_32",
+    "labelCa": "O",
+    "labelEn": "T",
+    "labelEs": "T",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "o",
+      "o (t)",
+      "t",
+      "t (o)"
+    ],
+    "sortOrder": 33
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_33",
+    "labelCa": "Q",
+    "labelEn": "beak",
+    "labelEs": "beak",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "beak",
+      "beak (q)",
+      "q",
+      "q (beak)"
+    ],
+    "sortOrder": 34
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_34",
+    "labelCa": "R",
+    "labelEn": "R",
+    "labelEs": "R",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "r",
+      "r (r)"
+    ],
+    "sortOrder": 35
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_35",
+    "labelCa": "S",
+    "labelEn": "S",
+    "labelEs": "S",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "(s)",
+      "s",
+      "s ()"
+    ],
+    "sortOrder": 36
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_36",
+    "labelCa": "T",
+    "labelEn": "T",
+    "labelEs": "T",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "(t)",
+      "t",
+      "t ()"
+    ],
+    "sortOrder": 37
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_37",
+    "labelCa": "T_antiga",
+    "labelEn": "Money",
+    "labelEs": "Money",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "money",
+      "money (t_antiga)",
+      "t_antiga",
+      "t_antiga (money)"
+    ],
+    "sortOrder": 38
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_38",
+    "labelCa": "U",
+    "labelEn": "Homs",
+    "labelEs": "Homs",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "homs",
+      "homs (u)",
+      "u",
+      "u (homs)"
+    ],
+    "sortOrder": 39
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_39",
+    "labelCa": "Y_SSI",
+    "labelEn": "Y",
+    "labelEs": "Y",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "y",
+      "y (y_ssi)",
+      "y_ssi",
+      "y_ssi (y)"
+    ],
+    "sortOrder": 40
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_40",
+    "labelCa": "polze-cor",
+    "labelEn": "5m_closed",
+    "labelEs": "5m_closed",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "5m_closed",
+      "5m_closed (polze-cor)",
+      "polze-cor",
+      "polze-cor (5m_closed)"
+    ],
+    "sortOrder": 41
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D8C3",
+    "labelCa": "Cor_e",
+    "labelEn": "Cor_e",
+    "labelEs": "Cor_e",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "(cor_e)",
+      "cor_e",
+      "cor_e ()"
+    ],
+    "sortOrder": 42
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_42",
+    "labelCa": "5m_tancat",
+    "labelEn": "5m_closed",
+    "labelEs": "5m_closed",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "5m_closed",
+      "5m_closed (5m_tancat)",
+      "5m_tancat",
+      "5m_tancat (5m_closed)"
+    ],
+    "sortOrder": 43
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D87D",
+    "labelCa": "Ce",
+    "labelEn": "beak_open",
+    "labelEs": "beak_open",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "beak_open",
+      "beak_open (ce)",
+      "ce",
+      "ce (beak_open)"
+    ],
+    "sortOrder": 44
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D8C5",
+    "labelCa": "Cor",
+    "labelEn": "5m",
+    "labelEs": "5m",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "5m",
+      "5m (cor)",
+      "cor",
+      "cor (5m)"
+    ],
+    "sortOrder": 45
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D8A7",
+    "labelCa": "5r",
+    "labelEn": "5r",
+    "labelEs": "5r",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "5r",
+      "5r (5r)"
+    ],
+    "sortOrder": 46
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D8B",
+    "labelCa": "5r_tancat",
+    "labelEn": "5r_closed",
+    "labelEs": "5r_closed",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "5r_closed",
+      "5r_closed (5r_tancat)",
+      "5r_tancat",
+      "5r_tancat (5r_closed)"
+    ],
+    "sortOrder": 47
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D88E",
+    "labelCa": "9",
+    "labelEn": "9",
+    "labelEs": "9",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "9",
+      "9 (9)"
+    ],
+    "sortOrder": 48
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D8BA",
+    "labelCa": "ASL_T",
+    "labelEn": "ASL_T",
+    "labelEs": "ASL_T",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ily",
+      "ily (ily)"
+    ],
+    "sortOrder": 49
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_1D8C7",
+    "labelCa": "Cor-E",
+    "labelEn": "G",
+    "labelEs": "G",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cor-e",
+      "cor-e (middle finger)",
+      "middle finger",
+      "middle finger (cor-e)"
+    ],
+    "sortOrder": 50
+  },
+  {
+    "dimension": "HAND_CONFIGURATION",
+    "code": "CONF_2A",
+    "labelCa": "ILY",
+    "labelEn": "ILY",
+    "labelEs": "ILY",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "baby_beak",
+      "baby_beak (oe)",
+      "oe",
+      "oe (baby_beak)"
+    ],
+    "sortOrder": 51
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "EMPTY",
+    "labelCa": "------- BUIT -------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": "No hi ha canvis de configuració",
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "BENDING",
+    "labelCa": "Flexió",
+    "labelEn": "Bending",
+    "labelEs": "Inclinación",
+    "descriptionCa": "Els dits seleccionats es flexionen només en les articulacions proximals",
+    "descriptionEn": "The selected fingers flex at the proximal joints only",
+    "descriptionEs": "Los dedos seleccionados flexionan solo en el punto de articulación más próximo",
+    "aliases": [
+      "bending",
+      "inclinacio"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "CLOSING",
+    "labelCa": "Tancament",
+    "labelEn": "Closing",
+    "labelEs": "Cierre",
+    "descriptionCa": "La relació d'obertura entre els dits seleccionats i el polze canvia d'obert a tancat",
+    "descriptionEn": "The aperture relation between the selected fingers and thumb changes from open to close",
+    "descriptionEs": "La relación de apertura entre los dedos seleccionados y el pulgar cambia de abierto a cerrado",
+    "aliases": [
+      "closing",
+      "tancament"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "CLOSING_AND_RUBBING",
+    "labelCa": "Tancament + Fregament",
+    "labelEn": "Closing and Rubbing",
+    "labelEs": "Cierre y Fricción",
+    "descriptionCa": "Moviment simultani de tancament i fregament",
+    "descriptionEn": "Simultaneous movement of closing and rubbing",
+    "descriptionEs": "Movimiento simultáneo de cierre y fricción",
+    "aliases": [
+      "closing + rubbing",
+      "closing+rubbing",
+      "tancament + friccio"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "CLOSING_AND_WIGGLING",
+    "labelCa": "Tancament + Vibració",
+    "labelEn": "Closing and Wiggling",
+    "labelEs": "Cierre y Vibración",
+    "descriptionCa": "Moviment simultani de tancament i vibració",
+    "descriptionEn": "Simultaneous movement of closing and wiggling",
+    "descriptionEs": "Movimiento simultáneo de cierre y vibración",
+    "aliases": [
+      "closing + wiggling",
+      "closing+wiggling",
+      "tancament + vibracio"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "CLOSING_TO_OPENING",
+    "labelCa": "Tancament > Obertura",
+    "labelEn": "Closing to Opening",
+    "labelEs": "Cierre a Apertura",
+    "descriptionCa": "D'un moviment de tancament passa a un moviment d'obertura",
+    "descriptionEn": "Movement changes from closing to opening",
+    "descriptionEs": "De un movimiento de cierre pasa a un movimiento de apertura",
+    "aliases": [
+      "closing > opening",
+      "closing>opening",
+      "tancament>obertura"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "CONSECUTIVE_CLOSING",
+    "labelCa": "Tancament consecutiu",
+    "labelEn": "Consecutive Closing",
+    "labelEs": "Cierre consecutivo",
+    "descriptionCa": "Moviments seqüencials de tancament",
+    "descriptionEn": "Sequential closing movements",
+    "descriptionEs": "Movimientos secuenciales de cierre",
+    "aliases": [
+      "consecutive closing",
+      "tancament consecutiu"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "CURVING",
+    "labelCa": "Corbat",
+    "labelEn": "Curving",
+    "labelEs": "Encorvado",
+    "descriptionCa": "Els dits seleccionats es flexionen en totes les articulacions distals",
+    "descriptionEn": "The selected fingers flex at all (distal) joints",
+    "descriptionEs": "Los dedos seleccionados flexionan en todas las articulaciones distales",
+    "aliases": [
+      "curving",
+      "encorbament"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "NONE_TO_SPREADING",
+    "labelCa": "Cap a Extensió",
+    "labelEn": "None to Spreading",
+    "labelEs": "Nada a Extensión",
+    "descriptionCa": "De cap moviment passa a extensió",
+    "descriptionEn": "Movement changes from no movement to spreading",
+    "descriptionEs": "De ningún movimiento pasa a extensión",
+    "aliases": [
+      "none > spreading",
+      "none>spreading",
+      "res>extensio"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "OPENING",
+    "labelCa": "Obertura",
+    "labelEn": "Opening",
+    "labelEs": "Apertura",
+    "descriptionCa": "La relació d'obertura entre els dits seleccionats i el polze canvia de tancat a obert",
+    "descriptionEn": "The aperture relation between the selected fingers and thumb changes from close to open",
+    "descriptionEs": "La relación de apertura entre los dedos seleccionados y el pulgar cambia de cerrado a abierto",
+    "aliases": [
+      "obertura",
+      "opening"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "OPENING_AND_RUBBING",
+    "labelCa": "Obertura + Fregament",
+    "labelEn": "Opening and Rubbing",
+    "labelEs": "Apertura y Fricción",
+    "descriptionCa": "Moviment simultani d'obertura i fregament",
+    "descriptionEn": "Simultaneous movement of opening and rubbing",
+    "descriptionEs": "Movimiento simultáneo de apertura y fricción",
+    "aliases": [
+      "obertura+friccio",
+      "opening + rubbing",
+      "opening+rubbing"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "OPENING_AND_SPREADING",
+    "labelCa": "Obertura + Extensió",
+    "labelEn": "Opening and Spreading",
+    "labelEs": "Apertura y Extensión",
+    "descriptionCa": "Moviment simultani d'obertura i extensió",
+    "descriptionEn": "Simultaneous movement of opening and spreading",
+    "descriptionEs": "Movimiento simultáneo de apertura y extensión",
+    "aliases": [
+      "obertura+extensio",
+      "opening + spreading",
+      "opening+spreading"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "OPENING_AND_WIGGLING",
+    "labelCa": "Obertura + Vibració",
+    "labelEn": "Opening and Wiggling",
+    "labelEs": "Apertura y Vibración",
+    "descriptionCa": "Moviment simultani d'obertura i vibració",
+    "descriptionEn": "Simultaneous movement of opening and wiggling",
+    "descriptionEs": "Movimiento simultáneo de apertura y vibración",
+    "aliases": [
+      "obertura+vibracio",
+      "opening + wiggling",
+      "opening+wiggling"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "OPENING_TO_CLOSING",
+    "labelCa": "Obertura > Tancament",
+    "labelEn": "Opening to Closing",
+    "labelEs": "Apertura a Cierre",
+    "descriptionCa": "De moviment d'obertura passa a moviment de tancament",
+    "descriptionEn": "Movement changes from opening to closing",
+    "descriptionEs": "De movimiento de apertura pasa a movimiento de cierre",
+    "aliases": [
+      "obertura>tancament",
+      "opening > closing",
+      "opening>closing"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "RUBBING",
+    "labelCa": "Fregament",
+    "labelEn": "Rubbing",
+    "labelEs": "Fricción",
+    "descriptionCa": "El polze i els dits seleccionats es freguen",
+    "descriptionEn": "Thumb and selected fingers rub",
+    "descriptionEs": "El pulgar y los dedos seleccionados se frotan",
+    "aliases": [
+      "friccio",
+      "rubbing"
+    ],
+    "sortOrder": 14
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "SPREADING",
+    "labelCa": "Extensió",
+    "labelEn": "Spreading",
+    "labelEs": "Extensión",
+    "descriptionCa": "L'espai entre els dits seleccionats augmenta",
+    "descriptionEn": "The space between the selected fingers increases",
+    "descriptionEs": "El espacio entre los dedos seleccionados aumenta",
+    "aliases": [
+      "extensio",
+      "spreading"
+    ],
+    "sortOrder": 15
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "UNBENDING",
+    "labelCa": "Estirament",
+    "labelEn": "Unbending",
+    "labelEs": "Estiramiento",
+    "descriptionCa": "Moviment d'estirament dels dits",
+    "descriptionEn": "Movement of straightening fingers from bent position",
+    "descriptionEs": "Movimiento de estiramiento de los dedos",
+    "aliases": [
+      "estirament",
+      "unbending"
+    ],
+    "sortOrder": 16
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "UNCURVING",
+    "labelCa": "Redreçament",
+    "labelEn": "Uncurving",
+    "labelEs": "Enderezamiento",
+    "descriptionCa": "Moviment de redreçament",
+    "descriptionEn": "Movement of straightening curved fingers",
+    "descriptionEs": "Movimiento de enderezamiento",
+    "aliases": [
+      "redrecament",
+      "uncurving"
+    ],
+    "sortOrder": 17
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "UNSPREADING",
+    "labelCa": "Ajustament",
+    "labelEn": "Unspreading",
+    "labelEs": "Ajuste",
+    "descriptionCa": "Els dits seleccionats (excloent el polze) s'apropen o contacten entre ells lateralment",
+    "descriptionEn": "The selected fingers (excluding the thumb) approach or contact each other at the lateral side",
+    "descriptionEs": "Los dedos seleccionados (excluyendo el pulgar) se juntan o contactan entre ellos lateralmente",
+    "aliases": [
+      "ajustament",
+      "unspreading"
+    ],
+    "sortOrder": 18
+  },
+  {
+    "dimension": "CONFIGURATION_CHANGE",
+    "code": "WIGGLING",
+    "labelCa": "Vibració",
+    "labelEn": "Wiggling",
+    "labelEs": "Vibración",
+    "descriptionCa": "Oscil·lació alterna dels dits seleccionats",
+    "descriptionEn": "Alternated bending of the selected fingers",
+    "descriptionEs": "Oscilación alterna de los dedos seleccionados",
+    "aliases": [
+      "vibracio",
+      "wiggling"
+    ],
+    "sortOrder": 19
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "EMPTY",
+    "labelCa": "------- BUIT -------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "ABOVE",
+    "labelCa": "A dalt",
+    "labelEn": "Above",
+    "labelEs": "Arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "above",
+      "damunt"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "ABOVE_BELOW",
+    "labelCa": "A dalt i a baix",
+    "labelEn": "Above and Below",
+    "labelEs": "Arriba y Abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "AROUND",
+    "labelCa": "Al voltant",
+    "labelEn": "Around",
+    "labelEs": "Alrededor",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "al voltant",
+      "around"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "BACK",
+    "labelCa": "Darrere",
+    "labelEn": "Back",
+    "labelEs": "Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back",
+      "darrere"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "BELOW",
+    "labelCa": "A baix",
+    "labelEn": "Below",
+    "labelEs": "Abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "below",
+      "sota"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "CROSS",
+    "labelCa": "Creuat",
+    "labelEn": "Cross",
+    "labelEs": "Cruzado",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "creuat",
+      "cross"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "FRONT",
+    "labelCa": "Davant",
+    "labelEn": "Front",
+    "labelEs": "Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "davant",
+      "front"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "FRONT_BACK",
+    "labelCa": "Davant i darrere",
+    "labelEn": "Front and Back",
+    "labelEs": "Frente y Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "INSIDE",
+    "labelCa": "Dins",
+    "labelEn": "Inside",
+    "labelEs": "Dentro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "dins",
+      "inside"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "INTERWOVEN",
+    "labelCa": "Entrellaçat",
+    "labelEn": "Interwoven",
+    "labelEs": "Entrelazado",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "entrellacats",
+      "interwoven"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "RELATION_BETWEEN_ARTICULATORS",
+    "code": "NEXT_TO",
+    "labelCa": "Al costat",
+    "labelEn": "Next to",
+    "labelEs": "Al lado",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "al costat",
+      "next-to"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EMPTY",
+    "labelCa": "-------------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "ARM",
+    "labelCa": "Braç",
+    "labelEn": "Arm",
+    "labelEs": "Brazo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "arm",
+      "brac"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "ARMPIT",
+    "labelCa": "Aixella",
+    "labelEn": "Armpit",
+    "labelEs": "Axila",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "aixella",
+      "armpit"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BACK",
+    "labelCa": "Esquena",
+    "labelEn": "Back",
+    "labelEs": "Espalda",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back",
+      "esquena"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BACK_OF_HEAD",
+    "labelCa": "Part posterior del cap",
+    "labelEn": "Back of Head",
+    "labelEs": "Parte trasera de la cabeza",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back of head",
+      "darrera del cap"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BELLY",
+    "labelCa": "Ventre",
+    "labelEn": "Belly",
+    "labelEs": "Vientre",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "belly",
+      "panxa"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BREASTS",
+    "labelCa": "Pits",
+    "labelEn": "Breasts",
+    "labelEs": "Pechos",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "breasts",
+      "pit"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BREAST_IPSI",
+    "labelCa": "Pit ipsilateral",
+    "labelEn": "Breast Ipsi",
+    "labelEs": "Pecho Ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "breast_ipsi",
+      "pit_ipsi"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BREAST_CONTRA",
+    "labelCa": "Pit contralateral",
+    "labelEn": "Breast Contra",
+    "labelEs": "Pecho Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "breast_contra",
+      "pit_contra"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BRIDGE_OF_NOSE",
+    "labelCa": "Pont del nas",
+    "labelEn": "Bridge of Nose",
+    "labelEs": "Puente de la nariz",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEEK",
+    "labelCa": "Galta",
+    "labelEn": "Cheek",
+    "labelEs": "Mejilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cheek",
+      "galta"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEEK_CONTRA",
+    "labelCa": "Galta contralateral",
+    "labelEn": "Cheek Contra",
+    "labelEs": "Mejilla Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cheek contra",
+      "galta_contra"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEEKBONE",
+    "labelCa": "Pòmul",
+    "labelEn": "Cheekbone",
+    "labelEs": "Pómulo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cheekbone",
+      "pomul"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEST",
+    "labelCa": "Pit",
+    "labelEn": "Chest",
+    "labelEs": "Pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "chest",
+      "torax"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEST_CONTRA",
+    "labelCa": "Pit contralateral",
+    "labelEn": "Chest Contra",
+    "labelEs": "Pecho Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "chest contra",
+      "torax_contra"
+    ],
+    "sortOrder": 14
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHIN",
+    "labelCa": "Barbeta",
+    "labelEn": "Chin",
+    "labelEs": "Barbilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "barbeta",
+      "chin"
+    ],
+    "sortOrder": 15
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHIN_CONTRA",
+    "labelCa": "Barbeta contralateral",
+    "labelEn": "Chin Contra",
+    "labelEs": "Barbilla Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "barbeta_contra",
+      "chin contra"
+    ],
+    "sortOrder": 16
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CROTCH",
+    "labelCa": "Entrecuix",
+    "labelEn": "Crotch",
+    "labelEs": "Entrepierna",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "crotch",
+      "entrecuix"
+    ],
+    "sortOrder": 17
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EAR",
+    "labelCa": "Orella",
+    "labelEn": "Ear",
+    "labelEs": "Oreja",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ear",
+      "orella"
+    ],
+    "sortOrder": 18
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EARLOBE",
+    "labelCa": "Lòbul de l'orella",
+    "labelEn": "Earlobe",
+    "labelEs": "Lóbulo de la oreja",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "earlobe",
+      "lobul"
+    ],
+    "sortOrder": 19
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EAST",
+    "labelCa": "Est",
+    "labelEn": "East",
+    "labelEs": "Este",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "east",
+      "est"
+    ],
+    "sortOrder": 20
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "ELBOW",
+    "labelCa": "Colze",
+    "labelEn": "Elbow",
+    "labelEs": "Codo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "colze",
+      "elbow"
+    ],
+    "sortOrder": 21
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EYE",
+    "labelCa": "Ull",
+    "labelEn": "Eye",
+    "labelEs": "Ojo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "eye",
+      "ull"
+    ],
+    "sortOrder": 22
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EYEBROW",
+    "labelCa": "Cella",
+    "labelEn": "Eyebrow",
+    "labelEs": "Ceja",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cella",
+      "eyebrow"
+    ],
+    "sortOrder": 23
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FACE",
+    "labelCa": "Cara",
+    "labelEn": "Face",
+    "labelEs": "Cara",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cara",
+      "face"
+    ],
+    "sortOrder": 24
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FACE_IPSI",
+    "labelCa": "Cara ipsilateral",
+    "labelEn": "Face Ipsi",
+    "labelEs": "Cara Ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cara ipsi",
+      "face ipsi"
+    ],
+    "sortOrder": 25
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FLANK",
+    "labelCa": "Costat",
+    "labelEn": "Flank",
+    "labelEs": "Costado",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "flank",
+      "templa"
+    ],
+    "sortOrder": 26
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FOREHEAD",
+    "labelCa": "Front",
+    "labelEn": "Forehead",
+    "labelEs": "Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "forehead",
+      "front"
+    ],
+    "sortOrder": 27
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FOREHEAD_CONTRA",
+    "labelCa": "Front contralateral",
+    "labelEn": "Forehead Contra",
+    "labelEs": "Frente Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "forehead contra",
+      "front_contra"
+    ],
+    "sortOrder": 28
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD",
+    "labelCa": "Cap",
+    "labelEn": "Head",
+    "labelEs": "Cabeza",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap",
+      "head"
+    ],
+    "sortOrder": 29
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_CONTRA",
+    "labelCa": "Cap contralateral",
+    "labelEn": "Head Contra",
+    "labelEs": "Cabeza Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap contra",
+      "head contra"
+    ],
+    "sortOrder": 30
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_IPSI",
+    "labelCa": "Cap ipsilateral",
+    "labelEn": "Head Ipsi",
+    "labelEs": "Cabeza Ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap ipsi",
+      "head ipsi"
+    ],
+    "sortOrder": 31
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HIP",
+    "labelCa": "Maluc",
+    "labelEn": "Hip",
+    "labelEs": "Cadera",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "hip",
+      "maluc"
+    ],
+    "sortOrder": 32
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HORIZONTAL_PLANE",
+    "labelCa": "Pla horitzontal",
+    "labelEn": "Horizontal Plane",
+    "labelEs": "Plano Horizontal",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "horizontal plane",
+      "pla horitzontal"
+    ],
+    "sortOrder": 33
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "KNEE",
+    "labelCa": "Genoll",
+    "labelEn": "Knee",
+    "labelEs": "Rodilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "genoll",
+      "knee"
+    ],
+    "sortOrder": 34
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "LEG",
+    "labelCa": "Cama",
+    "labelEn": "Leg",
+    "labelEs": "Pierna",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cama",
+      "leg"
+    ],
+    "sortOrder": 35
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "LOWER_ARM",
+    "labelCa": "Avantbraç",
+    "labelEn": "Lower Arm",
+    "labelEs": "Antebrazo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avantbrac",
+      "lower arm"
+    ],
+    "sortOrder": 36
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "LOWER_LIP",
+    "labelCa": "Llavi inferior",
+    "labelEn": "Lower Lip",
+    "labelEs": "Labio inferior",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "llavi inferior",
+      "lower lip"
+    ],
+    "sortOrder": 37
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH",
+    "labelCa": "Boca",
+    "labelEn": "Mouth",
+    "labelEs": "Boca",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca",
+      "mouth"
+    ],
+    "sortOrder": 38
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_CONTRA",
+    "labelCa": "Boca contralateral",
+    "labelEn": "Mouth Contra",
+    "labelEs": "Boca Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca_contra",
+      "mouth contra"
+    ],
+    "sortOrder": 39
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_IPSI",
+    "labelCa": "Boca ipsilateral",
+    "labelEn": "Mouth Ipsi",
+    "labelEs": "Boca Ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca_ipsi",
+      "mouth ipsi"
+    ],
+    "sortOrder": 40
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NECK",
+    "labelCa": "Coll",
+    "labelEn": "Neck",
+    "labelEs": "Cuello",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "coll",
+      "neck"
+    ],
+    "sortOrder": 41
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NECK_CONTRA",
+    "labelCa": "Coll contralateral",
+    "labelEn": "Neck Contra",
+    "labelEs": "Cuello Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "coll_contra",
+      "neck contra"
+    ],
+    "sortOrder": 42
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE",
+    "labelCa": "Espai neutral",
+    "labelEn": "Neutral Space",
+    "labelEs": "Espacio Neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre",
+      "neutral space"
+    ],
+    "sortOrder": 43
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NOSE",
+    "labelCa": "Nas",
+    "labelEn": "Nose",
+    "labelEs": "Nariz",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "nas",
+      "nose"
+    ],
+    "sortOrder": 44
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "PARALLEL_PLANE",
+    "labelCa": "Pla paral·lel",
+    "labelEn": "Parallel Plane",
+    "labelEs": "Plano Paralelo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "parallel plane",
+      "pla paral·lel"
+    ],
+    "sortOrder": 45
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "R_LOC",
+    "labelCa": "Ubicació R",
+    "labelEn": "R Location",
+    "labelEs": "Ubicación R",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "r-loc"
+    ],
+    "sortOrder": 46
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "SHOULDER",
+    "labelCa": "Espatlla",
+    "labelEn": "Shoulder",
+    "labelEs": "Hombro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espatlla",
+      "shoulder"
+    ],
+    "sortOrder": 47
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "SHOULDER_CONTRA",
+    "labelCa": "Espatlla contralateral",
+    "labelEn": "Shoulder Contra",
+    "labelEs": "Hombro Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espatlla_contra",
+      "shoulder contra"
+    ],
+    "sortOrder": 48
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TEETH",
+    "labelCa": "Dents",
+    "labelEn": "Teeth",
+    "labelEs": "Dientes",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "dents",
+      "teeth"
+    ],
+    "sortOrder": 49
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TEMPLE",
+    "labelCa": "Templa",
+    "labelEn": "Temple",
+    "labelEs": "Sien",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "templa",
+      "temple"
+    ],
+    "sortOrder": 50
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "THUMB",
+    "labelCa": "Polze",
+    "labelEn": "Thumb",
+    "labelEs": "Pulgar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "polze",
+      "thumb"
+    ],
+    "sortOrder": 51
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TONGUE",
+    "labelCa": "Llengua",
+    "labelEn": "Tongue",
+    "labelEs": "Lengua",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "llengua",
+      "tongue"
+    ],
+    "sortOrder": 52
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TRUNK",
+    "labelCa": "Tronc",
+    "labelEn": "Trunk",
+    "labelEs": "Tronco",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "tronc",
+      "trunk"
+    ],
+    "sortOrder": 53
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "UPPER_ARM",
+    "labelCa": "Braç superior",
+    "labelEn": "Upper Arm",
+    "labelEs": "Brazo superior",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "part alta brac",
+      "upper arm"
+    ],
+    "sortOrder": 54
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "UPPER_LIP",
+    "labelCa": "Llavi superior",
+    "labelEn": "Upper Lip",
+    "labelEs": "Labio superior",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "llavi superior",
+      "upper lip"
+    ],
+    "sortOrder": 55
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "VARIABLE",
+    "labelCa": "Variable",
+    "labelEn": "Variable",
+    "labelEs": "Variable",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "variable"
+    ],
+    "sortOrder": 56
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "VIRTUAL_OBJECT",
+    "labelCa": "Objecte virtual",
+    "labelEn": "Virtual Object",
+    "labelEs": "Objeto Virtual",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "objecte virtual",
+      "virtual object"
+    ],
+    "sortOrder": 57
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WAIST",
+    "labelCa": "Cintura",
+    "labelEn": "Waist",
+    "labelEs": "Cintura",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cintura",
+      "waist"
+    ],
+    "sortOrder": 58
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEST",
+    "labelCa": "Oest",
+    "labelEn": "West",
+    "labelEs": "Oeste",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "oest",
+      "west"
+    ],
+    "sortOrder": 59
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WRIST",
+    "labelCa": "Canell",
+    "labelEn": "Wrist",
+    "labelEs": "Muñeca",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "canell",
+      "wrist"
+    ],
+    "sortOrder": 60
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND",
+    "labelCa": "Mà feble",
+    "labelEn": "Weak Hand",
+    "labelEs": "Mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant",
+      "weak hand"
+    ],
+    "sortOrder": 61
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_BACK",
+    "labelCa": "Dors de la mà feble",
+    "labelEn": "Weak Hand Back",
+    "labelEs": "Dorso de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: darrere",
+      "weak hand: back"
+    ],
+    "sortOrder": 62
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_BASE",
+    "labelCa": "Base de la mà feble",
+    "labelEn": "Weak Hand Base",
+    "labelEs": "Base de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: base",
+      "weak hand: base"
+    ],
+    "sortOrder": 63
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_FINGER_TIPS",
+    "labelCa": "Puntes dels dits de la mà feble",
+    "labelEn": "Weak Hand Finger Tips",
+    "labelEs": "Puntas de los dedos de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: punta dels dits",
+      "weak hand: finger tips"
+    ],
+    "sortOrder": 64
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_FINGER",
+    "labelCa": "Dit de la mà feble",
+    "labelEn": "Weak Hand Finger",
+    "labelEs": "Dedo de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: dit",
+      "weak hand: finger"
+    ],
+    "sortOrder": 65
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_FRONT",
+    "labelCa": "Front de la mà feble",
+    "labelEn": "Weak Hand Front",
+    "labelEs": "Frente de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: davant",
+      "weak hand: front"
+    ],
+    "sortOrder": 66
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_INDEX_FINGER",
+    "labelCa": "Dit índex de la mà feble",
+    "labelEn": "Weak Hand Index Finger",
+    "labelEs": "Dedo índice de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: dit index",
+      "weak hand: index finger"
+    ],
+    "sortOrder": 67
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_KNUCKLES",
+    "labelCa": "Artells de la mà feble",
+    "labelEn": "Weak Hand Knuckles",
+    "labelEs": "Nudillos de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: artells",
+      "weak hand: knuckles"
+    ],
+    "sortOrder": 68
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_MIDDLE_FINGER",
+    "labelCa": "Dit del mig de la mà feble",
+    "labelEn": "Weak Hand Middle Finger",
+    "labelEs": "Dedo medio de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: dit mig",
+      "weak hand: middle finger"
+    ],
+    "sortOrder": 69
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_PALM",
+    "labelCa": "Palmell de la mà feble",
+    "labelEn": "Weak Hand Palm",
+    "labelEs": "Palma de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: palmell",
+      "weak hand: palm"
+    ],
+    "sortOrder": 70
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_PINKIE",
+    "labelCa": "Dit petit de la mà feble",
+    "labelEn": "Weak Hand Pinkie",
+    "labelEs": "Meñique de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: menovell",
+      "weak hand: pinkie"
+    ],
+    "sortOrder": 71
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_PINKIE_SIDE",
+    "labelCa": "Costat del dit petit de la mà feble",
+    "labelEn": "Weak Hand Pinkie Side",
+    "labelEs": "Lado del meñique de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: costat menovell",
+      "weak hand: pinkie side"
+    ],
+    "sortOrder": 72
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_RING_FINGER",
+    "labelCa": "Dit anular de la mà feble",
+    "labelEn": "Weak Hand Ring Finger",
+    "labelEs": "Dedo anular de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: anular",
+      "weak hand: ring finger"
+    ],
+    "sortOrder": 73
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_THENAR",
+    "labelCa": "Tenar de la mà feble",
+    "labelEn": "Weak Hand Thenar",
+    "labelEs": "Tenar de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: tenar",
+      "weak hand: thenar"
+    ],
+    "sortOrder": 74
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_THUMB",
+    "labelCa": "Polze de la mà feble",
+    "labelEn": "Weak Hand Thumb",
+    "labelEs": "Pulgar de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: polze",
+      "weak hand: thumb"
+    ],
+    "sortOrder": 75
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_THUMB_SIDE",
+    "labelCa": "Costat del polze de la mà feble",
+    "labelEn": "Weak Hand Thumb Side",
+    "labelEs": "Lado del pulgar de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: costat polze",
+      "weak hand: thumb side"
+    ],
+    "sortOrder": 76
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_WEB_SPACE",
+    "labelCa": "Espai interdigital de la mà feble",
+    "labelEn": "Weak Hand Web Space",
+    "labelEs": "Espacio interdigital de la mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: espai web",
+      "weak hand: web space"
+    ],
+    "sortOrder": 77
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BELLY_TO_CHEST",
+    "labelCa": "Ventre > pit",
+    "labelEn": "Belly to Chest",
+    "labelEs": "Del vientre al pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "belly > chest",
+      "belly>chest",
+      "panxa > pit"
+    ],
+    "sortOrder": 78
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEEK_TO_CHEEK",
+    "labelCa": "Galta > galta",
+    "labelEn": "Cheek to Cheek",
+    "labelEs": "De mejilla a mejilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cheek > cheek",
+      "galta > galta"
+    ],
+    "sortOrder": 79
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEEK_TO_CHIN",
+    "labelCa": "Galta > barbeta",
+    "labelEn": "Cheek to Chin",
+    "labelEs": "De mejilla a barbilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cheek > chin",
+      "galta > barbeta"
+    ],
+    "sortOrder": 80
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHIN_TO_CHEST",
+    "labelCa": "Barbeta > pit",
+    "labelEn": "Chin to Chest",
+    "labelEs": "De barbilla a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "barbeta > torax",
+      "chin > chest"
+    ],
+    "sortOrder": 81
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHIN_TO_NEUTRAL_SPACE",
+    "labelCa": "Barbeta > espai neutral",
+    "labelEn": "Chin to Neutral Space",
+    "labelEs": "De barbilla a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "barbeta > espai neutre",
+      "chin > neutral space"
+    ],
+    "sortOrder": 82
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHIN_TO_WEAK_HAND_INDEX",
+    "labelCa": "Barbeta > índex de mà feble",
+    "labelEn": "Chin to Weak Hand Index",
+    "labelEs": "De barbilla a índice de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 83
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHIN_TO_WEAK_HAND_PALM",
+    "labelCa": "Barbeta > palmell de mà feble",
+    "labelEn": "Chin to Weak Hand Palm",
+    "labelEs": "De barbilla a palma de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "barbeta > ma no-dominant: palmell",
+      "chin > weak hand: palm"
+    ],
+    "sortOrder": 84
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHIN_TO_WEAK_HAND_THUMB",
+    "labelCa": "Barbeta > polze de mà feble",
+    "labelEn": "Chin to Weak Hand Thumb",
+    "labelEs": "De barbilla a pulgar de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 85
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EAR_TO_CHEEK",
+    "labelCa": "Orella > galta",
+    "labelEn": "Ear to Cheek",
+    "labelEs": "De oreja a mejilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ear > cheek",
+      "orella > galta"
+    ],
+    "sortOrder": 86
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EAR_TO_CHEST",
+    "labelCa": "Orella > pit",
+    "labelEn": "Ear to Chest",
+    "labelEs": "De oreja a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ear > chest",
+      "orella > torax"
+    ],
+    "sortOrder": 87
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EAR_TO_MOUTH",
+    "labelCa": "Orella > boca",
+    "labelEn": "Ear to Mouth",
+    "labelEs": "De oreja a boca",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ear > mouth",
+      "orella > boca"
+    ],
+    "sortOrder": 88
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "EYE_TO_NEUTRAL_SPACE",
+    "labelCa": "Ull > espai neutral",
+    "labelEn": "Eye to Neutral Space",
+    "labelEs": "De ojo a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "eye > neutral space",
+      "ull > espai neutre"
+    ],
+    "sortOrder": 89
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FACE_TO_HEAD",
+    "labelCa": "Cara > cap",
+    "labelEn": "Face to Head",
+    "labelEs": "De cara a cabeza",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cara > cap",
+      "face > head",
+      "face> head"
+    ],
+    "sortOrder": 90
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FACE_TO_NEUTRAL_SPACE",
+    "labelCa": "Cara > espai neutral",
+    "labelEn": "Face to Neutral Space",
+    "labelEs": "De cara a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cara > espai neutre",
+      "face > neutral space"
+    ],
+    "sortOrder": 91
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FOREHEAD_TO_CHEST",
+    "labelCa": "Front > pit",
+    "labelEn": "Forehead to Chest",
+    "labelEs": "De frente a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "forehead > chest",
+      "front > pit"
+    ],
+    "sortOrder": 92
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FOREHEAD_TO_CHIN",
+    "labelCa": "Front > barbeta",
+    "labelEn": "Forehead to Chin",
+    "labelEs": "De frente a barbilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "forehead > chin",
+      "front > barebeta"
+    ],
+    "sortOrder": 93
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FOREHEAD_TO_NEUTRAL_SPACE",
+    "labelCa": "Front > espai neutral",
+    "labelEn": "Forehead to Neutral Space",
+    "labelEs": "De frente a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "forehead > neutral space",
+      "front > espai neutre"
+    ],
+    "sortOrder": 94
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FOREHEAD_TO_WEAK_HAND_PALM",
+    "labelCa": "Front > palmell de mà feble",
+    "labelEn": "Forehead to Weak Hand Palm",
+    "labelEs": "De frente a palma de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "forehead > weak hand: palm",
+      "front > ma no-dominant: palmell"
+    ],
+    "sortOrder": 95
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_TO_CHEST",
+    "labelCa": "Cap > pit",
+    "labelEn": "Head to Chest",
+    "labelEs": "De cabeza a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap > pit",
+      "head > chest"
+    ],
+    "sortOrder": 96
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_TO_CHEST_TO_SHOULDER",
+    "labelCa": "Cap > pit > espatlla",
+    "labelEn": "Head to Chest to Shoulder",
+    "labelEs": "De cabeza a pecho a hombro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap > pit > espatlla",
+      "head > chest > shoulder"
+    ],
+    "sortOrder": 97
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_TO_NEUTRAL_SPACE",
+    "labelCa": "Cap > espai neutral",
+    "labelEn": "Head to Neutral Space",
+    "labelEs": "De cabeza a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap > espai neutre",
+      "head > neutral space"
+    ],
+    "sortOrder": 98
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_TO_SHOULDER",
+    "labelCa": "Cap > espatlla",
+    "labelEn": "Head to Shoulder",
+    "labelEs": "De cabeza a hombro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap > espatlla",
+      "head > shoulder"
+    ],
+    "sortOrder": 99
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_TO_WEAK_HAND_PALM",
+    "labelCa": "Cap > palmell de mà feble",
+    "labelEn": "Head to Weak Hand Palm",
+    "labelEs": "De cabeza a palma de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap > ma no-dominant: palmell",
+      "head > weak hand: palm"
+    ],
+    "sortOrder": 100
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "LEG_TO_WAIST",
+    "labelCa": "Cama > cintura",
+    "labelEn": "Leg to Waist",
+    "labelEs": "De pierna a cintura",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cama > cintura",
+      "leg > waist"
+    ],
+    "sortOrder": 101
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_TO_CHEEK",
+    "labelCa": "Boca > galta",
+    "labelEn": "Mouth to Cheek",
+    "labelEs": "De boca a mejilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca > galta",
+      "mouth > cheek"
+    ],
+    "sortOrder": 102
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_TO_CHEST",
+    "labelCa": "Boca > pit",
+    "labelEn": "Mouth to Chest",
+    "labelEs": "De boca a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca > pit",
+      "mouth > chest"
+    ],
+    "sortOrder": 103
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_TO_CHIN",
+    "labelCa": "Boca > barbeta",
+    "labelEn": "Mouth to Chin",
+    "labelEs": "De boca a barbilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca > barbeta",
+      "mouth > chin"
+    ],
+    "sortOrder": 104
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_TO_NEUTRAL_SPACE",
+    "labelCa": "Boca > espai neutral",
+    "labelEn": "Mouth to Neutral Space",
+    "labelEs": "De boca a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca > espai neutre",
+      "mouth > neutral space"
+    ],
+    "sortOrder": 105
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_TO_WEAK_HAND",
+    "labelCa": "Boca > mà feble",
+    "labelEn": "Mouth to Weak Hand",
+    "labelEs": "De boca a mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca > ma no-dominant",
+      "mouth > weak hand"
+    ],
+    "sortOrder": 106
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "MOUTH_TO_WEAK_HAND_PALM",
+    "labelCa": "Boca > palmell de mà feble",
+    "labelEn": "Mouth to Weak Hand Palm",
+    "labelEs": "De boca a palma de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "boca > ma no-dominant: palmell",
+      "mouth > weak hand: palm"
+    ],
+    "sortOrder": 107
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NECK_TO_CHEST",
+    "labelCa": "Coll > pit",
+    "labelEn": "Neck to Chest",
+    "labelEs": "De cuello a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "coll > pit",
+      "neck > chest"
+    ],
+    "sortOrder": 108
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NECK_TO_NEUTRAL_SPACE",
+    "labelCa": "Coll > espai neutral",
+    "labelEn": "Neck to Neutral Space",
+    "labelEs": "De cuello a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "coll > espai neutre",
+      "neck > neutral space"
+    ],
+    "sortOrder": 109
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_TO_HEAD",
+    "labelCa": "Espai neutral > cap",
+    "labelEn": "Neutral Space to Head",
+    "labelEs": "De espacio neutral a cabeza",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre > cap",
+      "neutral space > head"
+    ],
+    "sortOrder": 110
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_TO_SHOULDER",
+    "labelCa": "Espai neutral > espatlla",
+    "labelEn": "Neutral Space to Shoulder",
+    "labelEs": "De espacio neutral a hombro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre > espatlla",
+      "neutral space > shoulder"
+    ],
+    "sortOrder": 111
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_TO_NOSE",
+    "labelCa": "Espai neutral > nas",
+    "labelEn": "Neutral Space to Nose",
+    "labelEs": "De espacio neutral a nariz",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre > nas",
+      "neutral space > nose"
+    ],
+    "sortOrder": 112
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_TO_CHEEK",
+    "labelCa": "Espai neutral > galta",
+    "labelEn": "Neutral Space to Cheek",
+    "labelEs": "De espacio neutral a mejilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre > galta",
+      "neutral space > cheek"
+    ],
+    "sortOrder": 113
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_TO_MOUTH",
+    "labelCa": "Espai neutral > boca",
+    "labelEn": "Neutral Space to Mouth",
+    "labelEs": "De espacio neutral a boca",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre > boca",
+      "neutral space > mouth"
+    ],
+    "sortOrder": 114
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_TO_CHEST",
+    "labelCa": "Espai neutral > pit",
+    "labelEn": "Neutral Space to Chest",
+    "labelEs": "De espacio neutral a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 115
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_TO_WEAK_HAND",
+    "labelCa": "Espai neutral > mà feble",
+    "labelEn": "Neutral Space to Weak Hand",
+    "labelEs": "De espacio neutral a mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre > ma no-dominant",
+      "neutral space > weak hand"
+    ],
+    "sortOrder": 116
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NOSE_TO_CHIN",
+    "labelCa": "Nas > barbeta",
+    "labelEn": "Nose to Chin",
+    "labelEs": "De nariz a barbilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "nas > barbeta",
+      "nose > chin"
+    ],
+    "sortOrder": 117
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NOSE_TO_NEUTRAL_SPACE",
+    "labelCa": "Nas > espai neutral",
+    "labelEn": "Nose to Neutral Space",
+    "labelEs": "De nariz a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "nas > espai neutre",
+      "nose > neutral space"
+    ],
+    "sortOrder": 118
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NOSE_TO_WEAK_HAND",
+    "labelCa": "Nas > mà feble",
+    "labelEn": "Nose to Weak Hand",
+    "labelEs": "De nariz a mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "nas > ma no-dominant",
+      "nose > weak hand"
+    ],
+    "sortOrder": 119
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "R_LOC_TO_R_LOC",
+    "labelCa": "Ubicació R > ubicació R",
+    "labelEn": "R Location to R Location",
+    "labelEs": "De ubicación R a ubicación R",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "r-loc > r-loc"
+    ],
+    "sortOrder": 120
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "SHOULDER_TO_CHEST",
+    "labelCa": "Espatlla > pit",
+    "labelEn": "Shoulder to Chest",
+    "labelEs": "De hombro a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espatlla > pit",
+      "shoulder > chest"
+    ],
+    "sortOrder": 121
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "SHOULDER_TO_SHOULDER",
+    "labelCa": "Espatlla > espatlla",
+    "labelEn": "Shoulder to Shoulder",
+    "labelEs": "De hombro a hombro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espatlla > espatlla",
+      "shoulder > shoulder"
+    ],
+    "sortOrder": 122
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "SHOULDER_TO_WEAK_HAND_PALM",
+    "labelCa": "Espatlla > palmell de mà feble",
+    "labelEn": "Shoulder to Weak Hand Palm",
+    "labelEs": "De hombro a palma de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espatlla > ma no-dominant: palmell",
+      "shoulder > weak hand: palm"
+    ],
+    "sortOrder": 123
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "SHOULDER_TO_NEUTRAL_SPACE",
+    "labelCa": "Espatlla > espai neutral",
+    "labelEn": "Shoulder to Neutral Space",
+    "labelEs": "De hombro a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espatlla > espai neutre",
+      "shoulder > neutral space"
+    ],
+    "sortOrder": 124
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "SHOULDER_TO_HIT",
+    "labelCa": "Espatlla > cop",
+    "labelEn": "Shoulder to Hit",
+    "labelEs": "De hombro a golpe",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espatlla > cadera",
+      "shoulder > hit"
+    ],
+    "sortOrder": 125
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TEMPLE_TO_CHEST",
+    "labelCa": "Templa > pit",
+    "labelEn": "Temple to Chest",
+    "labelEs": "De sien a pecho",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "templa > pit",
+      "temple > chest"
+    ],
+    "sortOrder": 126
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TEMPLE_TO_CHEEK",
+    "labelCa": "Templa > galta",
+    "labelEn": "Temple to Cheek",
+    "labelEs": "De sien a mejilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "templa > galta",
+      "temple > cheek"
+    ],
+    "sortOrder": 127
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TEMPLE_TO_SHOULDER",
+    "labelCa": "Templa > espatlla",
+    "labelEn": "Temple to Shoulder",
+    "labelEs": "De sien a hombro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "templa > espatlla",
+      "temple > shoulder"
+    ],
+    "sortOrder": 128
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "TEMPLE_TO_NEUTRAL_SPACE",
+    "labelCa": "Templa > espai neutral",
+    "labelEn": "Temple to Neutral Space",
+    "labelEs": "De sien a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "templa > espai neutre",
+      "temple > neutral space"
+    ],
+    "sortOrder": 129
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_TO_ARM",
+    "labelCa": "Mà feble > braç",
+    "labelEn": "Weak Hand to Arm",
+    "labelEs": "De mano débil a brazo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant > brac",
+      "weak hand > arm"
+    ],
+    "sortOrder": 130
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_TO_NEUTRAL_SPACE",
+    "labelCa": "Mà feble > espai neutral",
+    "labelEn": "Weak Hand to Neutral Space",
+    "labelEs": "De mano débil a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant > espai neutre",
+      "weak hand > neutral space"
+    ],
+    "sortOrder": 131
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "WEAK_HAND_THUMB_SIDE_TO_ARM",
+    "labelCa": "Costat del polze de la mà feble > braç",
+    "labelEn": "Weak Hand Thumb Side to Arm",
+    "labelEs": "Del lado del pulgar de la mano débil al brazo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ma no-dominant: costat polze > brac",
+      "weak hand: thumb side > arm"
+    ],
+    "sortOrder": 132
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "ARMPIT_TO_NEUTRAL_SPACE",
+    "labelCa": "Aixella > espai neutral",
+    "labelEn": "Armpit to Neutral Space",
+    "labelEs": "De axila a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "aixella > espai neutre",
+      "armpit > neutral space"
+    ],
+    "sortOrder": 133
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEST_TO_CHIN",
+    "labelCa": "Pit > barbeta",
+    "labelEn": "Chest to Chin",
+    "labelEs": "De pecho a barbilla",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "chest > chin",
+      "torax > barbeta"
+    ],
+    "sortOrder": 134
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "CHEST_TO_NEUTRAL_SPACE",
+    "labelCa": "Pit > espai neutral",
+    "labelEn": "Chest to Neutral Space",
+    "labelEs": "De pecho a espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "chest > neutral space",
+      "torax > espai neutre"
+    ],
+    "sortOrder": 135
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BELLY_AND_FOREHEAD",
+    "labelCa": "Ventre + front",
+    "labelEn": "Belly and Forehead",
+    "labelEs": "Vientre y frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "belly + forehead",
+      "panxa + front"
+    ],
+    "sortOrder": 136
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "HEAD_AND_NEUTRAL_SPACE",
+    "labelCa": "Cap + espai neutral",
+    "labelEn": "Head and Neutral Space",
+    "labelEs": "Cabeza y espacio neutral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap + espai neutre",
+      "head + neutral space"
+    ],
+    "sortOrder": 137
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "FLANK_OR_HEAD",
+    "labelCa": "Costat | cap",
+    "labelEn": "Flank or Head",
+    "labelEs": "Costado o cabeza",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "flank/head",
+      "templa / cap"
+    ],
+    "sortOrder": 138
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "NEUTRAL_SPACE_OR_WEAK_HAND_FRONT",
+    "labelCa": "Espai neutral | front de mà feble",
+    "labelEn": "Neutral Space or Weak Hand Front",
+    "labelEs": "Espacio neutral o frente de mano débil",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espai neutre / ma no-dominant: davant",
+      "neutral space / weak hand: front"
+    ],
+    "sortOrder": 139
+  },
+  {
+    "dimension": "LOCATION",
+    "code": "BOTTOM_OR_CROTCH",
+    "labelCa": "Cul | entrecuix",
+    "labelEn": "Bottom or Crotch",
+    "labelEs": "Trasero o entrepierna",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "bottom / crotch",
+      "part inferior / entremig"
+    ],
+    "sortOrder": 140
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "EMPTY",
+    "labelCa": "------- BUIT -------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK",
+    "labelCa": "Darrere",
+    "labelEn": "Back",
+    "labelEs": "Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back",
+      "darrere"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE",
+    "labelCa": "Base",
+    "labelEn": "Base",
+    "labelEs": "Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FINGER_TIPS",
+    "labelCa": "Puntes dels dits",
+    "labelEn": "Finger Tips",
+    "labelEs": "Puntas de los dedos",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips",
+      "punta dels dits"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FRONT",
+    "labelCa": "Davant",
+    "labelEn": "Front",
+    "labelEs": "Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "davant",
+      "front"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "PALM",
+    "labelCa": "Palmell",
+    "labelEn": "Palm",
+    "labelEs": "Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm",
+      "palmell"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "RADIAL",
+    "labelCa": "Radial",
+    "labelEn": "Radial",
+    "labelEs": "Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "radial"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "ULNAR",
+    "labelCa": "Ulnar",
+    "labelEn": "Ulnar",
+    "labelEs": "Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital",
+      "ulnar"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "VARIABLE",
+    "labelCa": "Variable",
+    "labelEn": "Variable",
+    "labelEs": "Variable",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "variable"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_AND_BASE",
+    "labelCa": "Darrere + base",
+    "labelEn": "Back and Base",
+    "labelEs": "Atrás y Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back + base",
+      "darrere + base"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_AND_RADIAL",
+    "labelCa": "Darrere + radial",
+    "labelEn": "Back and Radial",
+    "labelEs": "Atrás y Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back + radial",
+      "darrere + radial"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_AND_ULNAR",
+    "labelCa": "Darrere + ulnar",
+    "labelEn": "Back and Ulnar",
+    "labelEs": "Atrás y Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back + ulnar",
+      "darrere + cubital"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_AND_FRONT",
+    "labelCa": "Base + davant",
+    "labelEn": "Base and Front",
+    "labelEs": "Base y Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base + davant",
+      "base + front"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_AND_PALM",
+    "labelCa": "Base + palmell",
+    "labelEn": "Base and Palm",
+    "labelEs": "Base y Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base + palm",
+      "base + palmell"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_AND_ULNAR",
+    "labelCa": "Base + ulnar",
+    "labelEn": "Base and Ulnar",
+    "labelEs": "Base y Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base + cubital",
+      "base + ulnar"
+    ],
+    "sortOrder": 14
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FRONT_AND_ULNAR",
+    "labelCa": "Davant + ulnar",
+    "labelEn": "Front and Ulnar",
+    "labelEs": "Frente y Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "davant + cubital",
+      "front + ulnar"
+    ],
+    "sortOrder": 15
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "PALM_AND_RADIAL",
+    "labelCa": "Palmell + radial",
+    "labelEn": "Palm and Radial",
+    "labelEs": "Palma y Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm + radial",
+      "palmell + radial"
+    ],
+    "sortOrder": 16
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "PALM_AND_ULNAR",
+    "labelCa": "Palmell + ulnar",
+    "labelEn": "Palm and Ulnar",
+    "labelEs": "Palma y Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm + ulnar",
+      "palmell + cubital"
+    ],
+    "sortOrder": 17
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "PALM_AND_RADIAL_OR_ULNAR",
+    "labelCa": "Palmell + radial | ulnar",
+    "labelEn": "Palm and Radial or Ulnar",
+    "labelEs": "Palma y Radial o Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm + radial/ulnar",
+      "palmell + radial/ cubital"
+    ],
+    "sortOrder": 18
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_TO_FINGER_TIPS",
+    "labelCa": "Darrere > puntes dels dits",
+    "labelEn": "Back to Finger Tips",
+    "labelEs": "De Atrás a Puntas de los dedos",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back > finger tips",
+      "darrere + punta dels dits"
+    ],
+    "sortOrder": 19
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_TO_FRONT",
+    "labelCa": "Darrere > davant",
+    "labelEn": "Back to Front",
+    "labelEs": "De Atrás a Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back > front",
+      "darrere > davant"
+    ],
+    "sortOrder": 20
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_TO_PALM",
+    "labelCa": "Darrere > palmell",
+    "labelEn": "Back to Palm",
+    "labelEs": "De Atrás a Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back > palm",
+      "darrere > palmell"
+    ],
+    "sortOrder": 21
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_TO_RADIAL",
+    "labelCa": "Darrere > radial",
+    "labelEn": "Back to Radial",
+    "labelEs": "De Atrás a Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back > radial",
+      "darrere > radial"
+    ],
+    "sortOrder": 22
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_TO_BACK",
+    "labelCa": "Base > darrere",
+    "labelEn": "Base to Back",
+    "labelEs": "De Base a Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base > back",
+      "base > darrere"
+    ],
+    "sortOrder": 23
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_TO_BASE",
+    "labelCa": "Base > base",
+    "labelEn": "Base to Base",
+    "labelEs": "De Base a Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base > base"
+    ],
+    "sortOrder": 24
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_TO_FRONT",
+    "labelCa": "Base > davant",
+    "labelEn": "Base to Front",
+    "labelEs": "De Base a Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base > davant",
+      "base > front"
+    ],
+    "sortOrder": 25
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_TO_PALM",
+    "labelCa": "Base > palmell",
+    "labelEn": "Base to Palm",
+    "labelEs": "De Base a Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base > palm",
+      "base > palmell"
+    ],
+    "sortOrder": 26
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_TO_ULNAR",
+    "labelCa": "Base > ulnar",
+    "labelEn": "Base to Ulnar",
+    "labelEs": "De Base a Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base > cubital",
+      "base > ulnar"
+    ],
+    "sortOrder": 27
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FINGER_TIPS_TO_BACK",
+    "labelCa": "Puntes dels dits > darrere",
+    "labelEn": "Finger Tips to Back",
+    "labelEs": "De Puntas de los dedos a Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips > back",
+      "punta dels dits > darrere"
+    ],
+    "sortOrder": 28
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FINGER_TIPS_TO_BASE",
+    "labelCa": "Puntes dels dits > base",
+    "labelEn": "Finger Tips to Base",
+    "labelEs": "De Puntas de los dedos a Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips > base",
+      "punta dels dits > base"
+    ],
+    "sortOrder": 29
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FINGER_TIPS_TO_PALM",
+    "labelCa": "Puntes dels dits > palmell",
+    "labelEn": "Finger Tips to Palm",
+    "labelEs": "De Puntas de los dedos a Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips > palm",
+      "punta dels dits > palmell"
+    ],
+    "sortOrder": 30
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FRONT_TO_BACK",
+    "labelCa": "Davant > darrere",
+    "labelEn": "Front to Back",
+    "labelEs": "De Frente a Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "davant > darrere",
+      "front > back"
+    ],
+    "sortOrder": 31
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "PALM_TO_BACK",
+    "labelCa": "Palmell > darrere",
+    "labelEn": "Palm to Back",
+    "labelEs": "De Palma a Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm > back",
+      "palmell > darrere"
+    ],
+    "sortOrder": 32
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "PALM_TO_BASE",
+    "labelCa": "Palmell > base",
+    "labelEn": "Palm to Base",
+    "labelEs": "De Palma a Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm > base",
+      "palmell > base"
+    ],
+    "sortOrder": 33
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "RADIAL_TO_ULNAR",
+    "labelCa": "Radial > ulnar",
+    "labelEn": "Radial to Ulnar",
+    "labelEs": "De Radial a Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "radial > cubital",
+      "radial > ulnar"
+    ],
+    "sortOrder": 34
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "ULNAR_TO_BASE",
+    "labelCa": "Ulnar > base",
+    "labelEn": "Ulnar to Base",
+    "labelEs": "De Ulnar a Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital > base",
+      "ulnar > base"
+    ],
+    "sortOrder": 35
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "ULNAR_TO_BASE_TO_RADIAL",
+    "labelCa": "Ulnar > base > radial",
+    "labelEn": "Ulnar to Base to Radial",
+    "labelEs": "De Ulnar a Base a Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital > base > radial",
+      "ulnar > base > radial",
+      "ulnar > base >radial"
+    ],
+    "sortOrder": 36
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "ULNAR_TO_FRONT",
+    "labelCa": "Ulnar > davant",
+    "labelEn": "Ulnar to Front",
+    "labelEs": "De Ulnar a Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital > davant",
+      "ulnar > front"
+    ],
+    "sortOrder": 37
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "ULNAR_TO_PALM",
+    "labelCa": "Ulnar > palmell",
+    "labelEn": "Ulnar to Palm",
+    "labelEs": "De Ulnar a Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital > palmell",
+      "ulnar > palm"
+    ],
+    "sortOrder": 38
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "ULNAR_TO_PALM_TO_RADIAL",
+    "labelCa": "Ulnar > palmell > radial",
+    "labelEn": "Ulnar to Palm to Radial",
+    "labelEs": "De Ulnar a Palma a Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital > palmell > radial",
+      "ulnar > palm > radial"
+    ],
+    "sortOrder": 39
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "ULNAR_TO_RADIAL",
+    "labelCa": "Ulnar > radial",
+    "labelEn": "Ulnar to Radial",
+    "labelEs": "De Ulnar a Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital > radial",
+      "ulnar > radial"
+    ],
+    "sortOrder": 40
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_OR_BASE",
+    "labelCa": "Darrere | base",
+    "labelEn": "Back or Base",
+    "labelEs": "Atrás o Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back / base",
+      "darrere / base"
+    ],
+    "sortOrder": 41
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_OR_FINGER_TIPS",
+    "labelCa": "Darrere | puntes dels dits",
+    "labelEn": "Back or Finger Tips",
+    "labelEs": "Atrás o Puntas de los dedos",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back/finger tips",
+      "darrere / punta dels dits"
+    ],
+    "sortOrder": 42
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BACK_OR_PALM",
+    "labelCa": "Darrere | palmell",
+    "labelEn": "Back or Palm",
+    "labelEs": "Atrás o Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back/palm",
+      "darrere / palmell"
+    ],
+    "sortOrder": 43
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "BASE_OR_FRONT",
+    "labelCa": "Base | davant",
+    "labelEn": "Base or Front",
+    "labelEs": "Base o Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base > davant",
+      "base/front"
+    ],
+    "sortOrder": 44
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FINGER_TIPS_OR_BASE",
+    "labelCa": "Puntes dels dits | base",
+    "labelEn": "Finger Tips or Base",
+    "labelEs": "Puntas de los dedos o Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips/base",
+      "punta dels dits / base"
+    ],
+    "sortOrder": 45
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FINGER_TIPS_OR_ULNAR",
+    "labelCa": "Puntes dels dits | ulnar",
+    "labelEn": "Finger Tips or Ulnar",
+    "labelEs": "Puntas de los dedos o Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips/ulnar",
+      "punta dels dits / cubital"
+    ],
+    "sortOrder": 46
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "FRONT_OR_PALM",
+    "labelCa": "Davant | palmell",
+    "labelEn": "Front or Palm",
+    "labelEs": "Frente o Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "davant / palmell",
+      "front/palm"
+    ],
+    "sortOrder": 47
+  },
+  {
+    "dimension": "MOVEMENT_RELATED_ORIENTATION",
+    "code": "RADIAL_OR_ULNAR",
+    "labelCa": "Radial | ulnar",
+    "labelEn": "Radial or Ulnar",
+    "labelEs": "Radial o Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "radial / cubital",
+      "radial/ulnar"
+    ],
+    "sortOrder": 48
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "EMPTY",
+    "labelCa": "-------------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_FINGERS_CONTRA",
+    "labelCa": "Dits contra",
+    "labelEn": "Fingers Contra",
+    "labelEs": "Dedos Contra",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: dits-contra",
+      "ao: fingers-contra"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_FINGERS_DOWN",
+    "labelCa": "Dits avall",
+    "labelEn": "Fingers Down",
+    "labelEs": "Dedos Abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: dits-avall",
+      "ao: fingers-down"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_FINGERS_UP",
+    "labelCa": "Dits amunt",
+    "labelEn": "Fingers Up",
+    "labelEs": "Dedos Arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: dits-amunt",
+      "ao: fingers-up"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_BACKWARDS",
+    "labelCa": "Palmell cap enrere",
+    "labelEn": "Palm Backwards",
+    "labelEs": "Palma Hacia Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: palm-backwards",
+      "ao: palmell-enrere"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_DOWN",
+    "labelCa": "Palmell avall",
+    "labelEn": "Palm Down",
+    "labelEs": "Palma Abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: palm-down",
+      "ao: palmell-avall"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_DOWN_TO_UP",
+    "labelCa": "Palmell d'avall a amunt",
+    "labelEn": "Palm Down to Up",
+    "labelEs": "Palma de Abajo a Arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_FORWARDS",
+    "labelCa": "Palmell cap endavant",
+    "labelEn": "Palm Forwards",
+    "labelEs": "Palma Hacia Adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: palm-forwards",
+      "ao: palmell-endavant"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_INWARDS",
+    "labelCa": "Palmell cap endins",
+    "labelEn": "Palm Inwards",
+    "labelEs": "Palma Hacia Adentro",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: palm-inwards",
+      "ao: palmell-endins"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_OUTWARDS",
+    "labelCa": "Palmell cap enfora",
+    "labelEn": "Palm Outwards",
+    "labelEs": "Palma Hacia Afuera",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: palm-outwards",
+      "ao: palmell-enfora"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_UP",
+    "labelCa": "Palmell amunt",
+    "labelEn": "Palm Up",
+    "labelEs": "Palma Arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: palm-up",
+      "ao: palmell-amunt"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "AO_PALM_UP_OR_DOWN",
+    "labelCa": "Palmell amunt o avall",
+    "labelEn": "Palm Up or Down",
+    "labelEs": "Palma Arriba o Abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ao: palm-up/down",
+      "ao: palmell-amunt/avall"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "BACK",
+    "labelCa": "Darrere",
+    "labelEn": "Back",
+    "labelEs": "Atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back",
+      "darrere"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "BACK_TO_PALM",
+    "labelCa": "De darrere a palmell",
+    "labelEn": "Back to Palm",
+    "labelEs": "De Atrás a Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back > palm",
+      "darrere > palmell"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "BACK_TO_ULNAR",
+    "labelCa": "De darrere a ulnar",
+    "labelEn": "Back to Ulnar",
+    "labelEs": "De Atrás a Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back > ulnar",
+      "darrere > cubital"
+    ],
+    "sortOrder": 14
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "BACK_OR_PALM",
+    "labelCa": "Darrere o palmell",
+    "labelEn": "Back or Palm",
+    "labelEs": "Atrás o Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back/palm",
+      "darrere / palmell"
+    ],
+    "sortOrder": 15
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "BACK_OR_PALM_TO_PALM",
+    "labelCa": "De darrere o palmell a palmell",
+    "labelEn": "Back or Palm to Palm",
+    "labelEs": "De Atrás o Palma a Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "back/palm > palm",
+      "darrere / palmell > palmell"
+    ],
+    "sortOrder": 16
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "BASE",
+    "labelCa": "Base",
+    "labelEn": "Base",
+    "labelEs": "Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "base"
+    ],
+    "sortOrder": 17
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "COUNTING",
+    "labelCa": "Comptant",
+    "labelEn": "Counting",
+    "labelEs": "Contando",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "comptant",
+      "counting"
+    ],
+    "sortOrder": 18
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "FINGER_TIPS",
+    "labelCa": "Puntes dels dits",
+    "labelEn": "Finger Tips",
+    "labelEs": "Puntas de los dedos",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips",
+      "punta dels dits"
+    ],
+    "sortOrder": 19
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "FINGER_TIPS_OR_BASE",
+    "labelCa": "Puntes dels dits o base",
+    "labelEn": "Finger Tips or Base",
+    "labelEs": "Puntas de los dedos o Base",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "finger tips/base",
+      "punta dels dits / base"
+    ],
+    "sortOrder": 20
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "FINGERSPELLING",
+    "labelCa": "Dactilologia",
+    "labelEn": "Fingerspelling",
+    "labelEs": "Deletreo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "fingerspelling",
+      "lletreig"
+    ],
+    "sortOrder": 21
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "FRONT",
+    "labelCa": "Davant",
+    "labelEn": "Front",
+    "labelEs": "Frente",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "davant",
+      "front"
+    ],
+    "sortOrder": 22
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "PALM",
+    "labelCa": "Palmell",
+    "labelEn": "Palm",
+    "labelEs": "Palma",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm",
+      "palmell"
+    ],
+    "sortOrder": 23
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "PALM_TO_ULNAR",
+    "labelCa": "De palmell a ulnar",
+    "labelEn": "Palm to Ulnar",
+    "labelEs": "De Palma a Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "palm > ulnar",
+      "palmell > cubital"
+    ],
+    "sortOrder": 24
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "RADIAL",
+    "labelCa": "Radial",
+    "labelEn": "Radial",
+    "labelEs": "Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "radial"
+    ],
+    "sortOrder": 25
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "RADIAL_OR_ULNAR",
+    "labelCa": "Radial o ulnar",
+    "labelEn": "Radial or Ulnar",
+    "labelEs": "Radial o Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "radial / cubital",
+      "radial /ulnar"
+    ],
+    "sortOrder": 26
+  },
+  {
+    "dimension": "ORIENTATION_RELATED_TO_LOCATION",
+    "code": "ULNAR",
+    "labelCa": "Ulnar",
+    "labelEn": "Ulnar",
+    "labelEs": "Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cubital",
+      "ulnar"
+    ],
+    "sortOrder": 27
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "EMPTY",
+    "labelCa": "-------------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "EXTENSION",
+    "labelCa": "Extensió",
+    "labelEn": "Extension",
+    "labelEs": "Extensión",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "extensio",
+      "extension"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "EXTENSION_AND_PRONATION",
+    "labelCa": "Extensió + pronació",
+    "labelEn": "Extension and Pronation",
+    "labelEs": "Extensión y Pronación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "extensio + pronacio",
+      "extension + pronation"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "EXTENSION_TO_FLEXION",
+    "labelCa": "Extensió > flexió",
+    "labelEn": "Extension to Flexion",
+    "labelEs": "De Extensión a Flexión",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "extensio > flexio",
+      "extension > flexion"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "EXTENSION_OR_FLEXION",
+    "labelCa": "Extensió | flexió",
+    "labelEn": "Extension or Flexion",
+    "labelEs": "Extensión o Flexión",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "extensio / flexio",
+      "extension/flexion"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "FLEXION",
+    "labelCa": "Flexió",
+    "labelEn": "Flexion",
+    "labelEs": "Flexión",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "flexio",
+      "flexion"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "FLEXION_TO_EXTENSION",
+    "labelCa": "Flexió > extensió",
+    "labelEn": "Flexion to Extension",
+    "labelEs": "De Flexión a Extensión",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "flexio > extensio",
+      "flexion > extension"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "PRONATION",
+    "labelCa": "Pronació",
+    "labelEn": "Pronation",
+    "labelEs": "Pronación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "pronacio",
+      "pronation"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "PRONATION_OR_SUPINATION",
+    "labelCa": "Pronació | supinació",
+    "labelEn": "Pronation or Supination",
+    "labelEs": "Pronación o Supinación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "pronacio / supinacio",
+      "pronation/supination"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "RADIAL_AND_ULNAR_FLEXION",
+    "labelCa": "Flexió radial + ulnar",
+    "labelEn": "Radial and Ulnar Flexion",
+    "labelEs": "Flexión Radial y Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "flexio radial i cubital",
+      "radial and ulnar flexion"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "RADIAL_FLEXION",
+    "labelCa": "Flexió radial",
+    "labelEn": "Radial Flexion",
+    "labelEs": "Flexión Radial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "flexio radial",
+      "radial flexion"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "ROTATION",
+    "labelCa": "Rotació",
+    "labelEn": "Rotation",
+    "labelEs": "Rotación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "rotacio",
+      "rotation"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "SUPINATION",
+    "labelCa": "Supinació",
+    "labelEn": "Supination",
+    "labelEs": "Supinación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "supinacio",
+      "supination"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "SUPINATION_TO_PRONATION",
+    "labelCa": "Supinació > pronació",
+    "labelEn": "Supination to Pronation",
+    "labelEs": "De Supinación a Pronación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "supinacio > pronacio",
+      "supination > pronation"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "ULNAR_FLEXION",
+    "labelCa": "Flexió ulnar",
+    "labelEn": "Ulnar Flexion",
+    "labelEs": "Flexión Ulnar",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "flexio cubital",
+      "ulnar flexion"
+    ],
+    "sortOrder": 14
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "PRONATION_TO_FLEXION",
+    "labelCa": "Pronació > flexió",
+    "labelEn": "Pronation to Flexion",
+    "labelEs": "De Pronación a Flexión",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "pronacio > flexio",
+      "pronation > flexion"
+    ],
+    "sortOrder": 15
+  },
+  {
+    "dimension": "ORIENTATION_CHANGE",
+    "code": "SUPINATION_TO_EXTENSION",
+    "labelCa": "Supinació > extensió",
+    "labelEn": "Supination to Extension",
+    "labelEs": "De Supinación a Extensión",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "supinacio > extensio",
+      "supination > extension"
+    ],
+    "sortOrder": 16
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "EMPTY",
+    "labelCa": "-------------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "BRUSH",
+    "labelCa": "Fregament",
+    "labelEn": "Brush",
+    "labelEs": "Roce",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "brush",
+      "frec"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "CONTINUOUS",
+    "labelCa": "Continu",
+    "labelEn": "Continuous",
+    "labelEs": "Continuo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "continu",
+      "continuous"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "CONTINUOUS_TO_CONTINUOUS",
+    "labelCa": "Continu > continu",
+    "labelEn": "Continuous to Continuous",
+    "labelEs": "De Continuo a Continuo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "continu > continu",
+      "continuous > continuous"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "CONTINUOUS_TO_FINAL",
+    "labelCa": "Continu > final",
+    "labelEn": "Continuous to Final",
+    "labelEs": "De Continuo a Final",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "continu > final",
+      "continuous > final"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "CONTINUOUS_TO_NONE",
+    "labelCa": "Continu > cap",
+    "labelEn": "Continuous to None",
+    "labelEs": "De Continuo a Ninguno",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "continu > res",
+      "continuous > none"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "DOUBLE",
+    "labelCa": "Doble",
+    "labelEn": "Double",
+    "labelEs": "Doble",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "doble",
+      "double"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "FINAL",
+    "labelCa": "Final",
+    "labelEn": "Final",
+    "labelEs": "Final",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "final"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "FINAL_TO_CONTINUOUS",
+    "labelCa": "Final > continu",
+    "labelEn": "Final to Continuous",
+    "labelEs": "De Final a Continuo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "final > continu",
+      "final > continuous"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "FINAL_TO_NONE",
+    "labelCa": "Final > cap",
+    "labelEn": "Final to None",
+    "labelEs": "De Final a Ninguno",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "final > none",
+      "final > res"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "INITIAL",
+    "labelCa": "Inicial",
+    "labelEn": "Initial",
+    "labelEs": "Inicial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "inicial",
+      "initial"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "NONE_TO_FINAL",
+    "labelCa": "Cap > final",
+    "labelEn": "None to Final",
+    "labelEs": "De Ninguno a Final",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "none > final",
+      "res > final"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "NONE_TO_INITIAL",
+    "labelCa": "Cap > inicial",
+    "labelEn": "None to Initial",
+    "labelEs": "De Ninguno a Inicial",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "none > initial",
+      "res > inicial"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "CONTACT_TYPE",
+    "code": "INITIAL_TO_FINAL",
+    "labelCa": "Inicial > final",
+    "labelEn": "Initial to Final",
+    "labelEs": "De Inicial a Final",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "inicial > final",
+      "initial > final"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "EMPTY",
+    "labelCa": "-------------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "ARC",
+    "labelCa": "Arc",
+    "labelEn": "Arc",
+    "labelEs": "Arco",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "arc"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "CIRCLE",
+    "labelCa": "Cercle",
+    "labelEn": "Circle",
+    "labelEs": "Círculo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "circle",
+      "circular"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "CROSS",
+    "labelCa": "Creu",
+    "labelEn": "Cross",
+    "labelEs": "Cruz",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "creuat",
+      "cross"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "MOTIVATED_SHAPE",
+    "labelCa": "Forma motivada",
+    "labelEn": "Motivated Shape",
+    "labelEs": "Forma Motivada",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "forma motivada",
+      "motivated shape"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "SPIRAL",
+    "labelCa": "Espiral",
+    "labelEn": "Spiral",
+    "labelEs": "Espiral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "espiral",
+      "spiral"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "STRAIGHT",
+    "labelCa": "Recte",
+    "labelEn": "Straight",
+    "labelEs": "Recto",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "recte",
+      "straight"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "ZIGZAG",
+    "labelCa": "Ziga-zaga",
+    "labelEn": "Zigzag",
+    "labelEs": "Zigzag",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ziga-zaga",
+      "zigzag"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "MOVEMENT_TYPE",
+    "code": "STRAIGHT_TO_CIRCLE",
+    "labelCa": "Recte > cercle",
+    "labelEn": "Straight to Circle",
+    "labelEs": "De Recto a Círculo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "recte > cercle",
+      "straight > circle"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "EMPTY",
+    "labelCa": "-------------",
+    "labelEn": "Empty",
+    "labelEs": "Vacío",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 0
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS",
+    "labelCa": "Enrere",
+    "labelEn": "Backwards",
+    "labelEs": "Hacia atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards",
+      "enrere"
+    ],
+    "sortOrder": 1
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS_AND_CONTRALATERAL",
+    "labelCa": "Enrere i contralateral",
+    "labelEn": "Backwards and contralateral",
+    "labelEs": "Hacia atrás y contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards + contralateral",
+      "enrere + contralateral"
+    ],
+    "sortOrder": 2
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS_AND_DOWNWARDS",
+    "labelCa": "Enrere i avall",
+    "labelEn": "Backwards and downwards",
+    "labelEs": "Hacia atrás y hacia abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards + downwards",
+      "enrere + avall"
+    ],
+    "sortOrder": 3
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS_AND_IPSILATERAL",
+    "labelCa": "Enrere i ipsilateral",
+    "labelEn": "Backwards and ipsilateral",
+    "labelEs": "Hacia atrás y ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards + ipsilateral",
+      "enrere + ipsilateral"
+    ],
+    "sortOrder": 4
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS_AND_UPWARDS",
+    "labelCa": "Enrere i amunt",
+    "labelEn": "Backwards and upwards",
+    "labelEs": "Hacia atrás y hacia arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards + upwards",
+      "enrere + amunt"
+    ],
+    "sortOrder": 5
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS_TO_DOWNWARDS",
+    "labelCa": "Enrere a avall",
+    "labelEn": "Backwards to downwards",
+    "labelEs": "Hacia atrás a abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards > downwards",
+      "enrere > avall"
+    ],
+    "sortOrder": 6
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS_TO_FORWARDS",
+    "labelCa": "Enrere a endavant",
+    "labelEn": "Backwards to forwards",
+    "labelEs": "Hacia atrás a adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards > forwards",
+      "enrere > endavant"
+    ],
+    "sortOrder": 7
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "BACKWARDS_OR_FORWARDS",
+    "labelCa": "Enrere o endavant",
+    "labelEn": "Backwards or forwards",
+    "labelEs": "Hacia atrás o adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "backwards/forwards",
+      "enrere / endavant"
+    ],
+    "sortOrder": 8
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "CONTRALATERAL",
+    "labelCa": "Contralateral",
+    "labelEn": "Contralateral",
+    "labelEs": "Contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "contralateral"
+    ],
+    "sortOrder": 9
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "CONTRALATERAL_AND_DOWNWARDS",
+    "labelCa": "Contralateral i avall",
+    "labelEn": "Contralateral and downwards",
+    "labelEs": "Contralateral y hacia abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "contralateral + avall",
+      "contralateral + downwards"
+    ],
+    "sortOrder": 10
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "CONTRALATERAL_AND_FORWARDS",
+    "labelCa": "Contralateral i endavant",
+    "labelEn": "Contralateral and forwards",
+    "labelEs": "Contralateral y hacia adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "contralateral + endavant",
+      "contralateral + forwards"
+    ],
+    "sortOrder": 11
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "CONTRALATERAL_AND_UPWARDS",
+    "labelCa": "Contralateral i amunt",
+    "labelEn": "Contralateral and upwards",
+    "labelEs": "Contralateral y hacia arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "contralateral + amunt",
+      "contralateral + upwards"
+    ],
+    "sortOrder": 12
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "CONTRALATERAL_TO_FORWARDS",
+    "labelCa": "Contralateral a endavant",
+    "labelEn": "Contralateral to forwards",
+    "labelEs": "Contralateral a adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "contralateral > endavant",
+      "contralateral > forwards"
+    ],
+    "sortOrder": 13
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "CONTRALATERAL_TO_IPSILATERAL",
+    "labelCa": "Contralateral a ipsilateral",
+    "labelEn": "Contralateral to ipsilateral",
+    "labelEs": "Contralateral a ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "contralateral > ipsilateral"
+    ],
+    "sortOrder": 14
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DISTAL",
+    "labelCa": "Distal",
+    "labelEn": "Distal",
+    "labelEs": "Distal",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "distal"
+    ],
+    "sortOrder": 15
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS",
+    "labelCa": "Avall",
+    "labelEn": "Downwards",
+    "labelEs": "Hacia abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall",
+      "downwards"
+    ],
+    "sortOrder": 16
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_AND_CONTRALATERAL_OR_IPSILATERAL",
+    "labelCa": "Avall i contralateral o ipsilateral",
+    "labelEn": "Downwards and contralateral or ipsilateral",
+    "labelEs": "Hacia abajo y contralateral o ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall + contralateral / ipsilateral",
+      "downwards + contralateral/ipsilateral"
+    ],
+    "sortOrder": 17
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_AND_FORWARDS",
+    "labelCa": "Avall i endavant",
+    "labelEn": "Downwards and forwards",
+    "labelEs": "Hacia abajo y adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall + endavant",
+      "downwards + forwards"
+    ],
+    "sortOrder": 18
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_AND_IPSILATERAL",
+    "labelCa": "Avall i ipsilateral",
+    "labelEn": "Downwards and ipsilateral",
+    "labelEs": "Hacia abajo y ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall + ipsilateral",
+      "downwards + ipsilateral"
+    ],
+    "sortOrder": 19
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_AND_IPSILATERAL_TO_DOWNWARDS",
+    "labelCa": "Avall i ipsilateral a avall",
+    "labelEn": "Downwards and ipsilateral to downwards",
+    "labelEs": "Hacia abajo y ipsilateral a abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall + ipsilateral > avall",
+      "downwards + ipsilateral > downwards"
+    ],
+    "sortOrder": 20
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_AND_TOWARDS",
+    "labelCa": "Avall i cap a",
+    "labelEn": "Downwards and towards",
+    "labelEs": "Hacia abajo y hacia",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall + cap a",
+      "downwards + towards"
+    ],
+    "sortOrder": 21
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_TO_CONTRALATERAL",
+    "labelCa": "Avall a contralateral",
+    "labelEn": "Downwards to contralateral",
+    "labelEs": "Hacia abajo a contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall > contralateral",
+      "downwards > contralateral"
+    ],
+    "sortOrder": 22
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_TO_FORWARDS",
+    "labelCa": "Avall a endavant",
+    "labelEn": "Downwards to forwards",
+    "labelEs": "Hacia abajo a adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall > endavant",
+      "downwards > forwards"
+    ],
+    "sortOrder": 23
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_TO_IPSILATERAL",
+    "labelCa": "Avall a ipsilateral",
+    "labelEn": "Downwards to ipsilateral",
+    "labelEs": "Hacia abajo a ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall > ipsilateral",
+      "downwards > ipsilateral"
+    ],
+    "sortOrder": 24
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_TO_UPWARDS",
+    "labelCa": "Avall a amunt",
+    "labelEn": "Downwards to upwards",
+    "labelEs": "Hacia abajo a arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall > amunt",
+      "downwards > upwards"
+    ],
+    "sortOrder": 25
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_OR_UPWARDS",
+    "labelCa": "Avall o amunt",
+    "labelEn": "Downwards or upwards",
+    "labelEs": "Hacia abajo o arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall / amunt",
+      "downwards/upwards"
+    ],
+    "sortOrder": 26
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_OR_UPWARDS_AND_IPSILATERAL",
+    "labelCa": "Avall o amunt i ipsilateral",
+    "labelEn": "Downwards or upwards and ipsilateral",
+    "labelEs": "Hacia abajo o arriba y ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall / amunt + ipsilateral",
+      "downwards/upwards + ipsilateral"
+    ],
+    "sortOrder": 27
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS",
+    "labelCa": "Endavant",
+    "labelEn": "Forwards",
+    "labelEs": "Hacia adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant",
+      "forwards"
+    ],
+    "sortOrder": 28
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_AND_IPSILATERAL",
+    "labelCa": "Endavant i ipsilateral",
+    "labelEn": "Forwards and ipsilateral",
+    "labelEs": "Hacia adelante y ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant + ipsilateral",
+      "forwards + ipsilateral"
+    ],
+    "sortOrder": 29
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_AND_UPWARDS",
+    "labelCa": "Endavant i amunt",
+    "labelEn": "Forwards and upwards",
+    "labelEs": "Hacia adelante y arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant + amunt",
+      "forwards + upwards"
+    ],
+    "sortOrder": 30
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_TO_BACKWARDS",
+    "labelCa": "Endavant a enrere",
+    "labelEn": "Forwards to backwards",
+    "labelEs": "Hacia adelante a atrás",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant > enrere",
+      "forwards > backwards"
+    ],
+    "sortOrder": 31
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_TO_CONTRALATERAL",
+    "labelCa": "Endavant a contralateral",
+    "labelEn": "Forwards to contralateral",
+    "labelEs": "Hacia adelante a contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant > contralateral",
+      "forwards > contralateral"
+    ],
+    "sortOrder": 32
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_TO_DOWNWARDS",
+    "labelCa": "Endavant a avall",
+    "labelEn": "Forwards to downwards",
+    "labelEs": "Hacia adelante a abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant > avall",
+      "forwards > downwards"
+    ],
+    "sortOrder": 33
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_TO_IPSILATERAL",
+    "labelCa": "Endavant a ipsilateral",
+    "labelEn": "Forwards to ipsilateral",
+    "labelEs": "Hacia adelante a ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant > ipsilateral",
+      "forwards > ipsilateral"
+    ],
+    "sortOrder": 34
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_TO_IPSILATERAL_TO_FORWARDS",
+    "labelCa": "Endavant a ipsilateral a endavant",
+    "labelEn": "Forwards to ipsilateral to forwards",
+    "labelEs": "Hacia adelante a ipsilateral a adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant > ipsilateral > endavant",
+      "forwards > ipsilateral > forwards"
+    ],
+    "sortOrder": 35
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_TO_UPWARDS",
+    "labelCa": "Endavant a amunt",
+    "labelEn": "Forwards to upwards",
+    "labelEs": "Hacia adelante a arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "endavant > amunt",
+      "forwards > upwards"
+    ],
+    "sortOrder": 36
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FROM_LOCATION",
+    "labelCa": "Des de la ubicació",
+    "labelEn": "From location",
+    "labelEs": "Desde la ubicación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "des de la localitzacio",
+      "from location"
+    ],
+    "sortOrder": 37
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL",
+    "labelCa": "Ipsilateral",
+    "labelEn": "Ipsilateral",
+    "labelEs": "Ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral"
+    ],
+    "sortOrder": 38
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_AND_UP_AND_DOWN",
+    "labelCa": "Ipsilateral i amunt i avall",
+    "labelEn": "Ipsilateral and up and down",
+    "labelEs": "Ipsilateral y arriba y abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral + amunt i avall",
+      "ipsilateral + up and down"
+    ],
+    "sortOrder": 39
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_AND_UPWARDS",
+    "labelCa": "Ipsilateral i amunt",
+    "labelEn": "Ipsilateral and upwards",
+    "labelEs": "Ipsilateral y arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral + amunt",
+      "ipsilateral + upwards"
+    ],
+    "sortOrder": 40
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_TO_CONTRALATERAL",
+    "labelCa": "Ipsilateral a contralateral",
+    "labelEn": "Ipsilateral to contralateral",
+    "labelEs": "Ipsilateral a contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral > contralateral"
+    ],
+    "sortOrder": 41
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_TO_DOWNWARDS",
+    "labelCa": "Ipsilateral a avall",
+    "labelEn": "Ipsilateral to downwards",
+    "labelEs": "Ipsilateral a abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral > avall",
+      "ipsilateral > downwards"
+    ],
+    "sortOrder": 42
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_TO_DOWNWARDS_TO_CONTRALATERAL",
+    "labelCa": "Ipsilateral a avall a contralateral",
+    "labelEn": "Ipsilateral to downwards to contralateral",
+    "labelEs": "Ipsilateral a abajo a contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral > avall > contralateral",
+      "ipsilateral > downwards > contralateral"
+    ],
+    "sortOrder": 43
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_TO_UPWARDS",
+    "labelCa": "Ipsilateral a amunt",
+    "labelEn": "Ipsilateral to upwards",
+    "labelEs": "Ipsilateral a arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral > amunt",
+      "ipsilateral > upwards"
+    ],
+    "sortOrder": 44
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_AND_CONTRALATERAL",
+    "labelCa": "Ipsilateral i contralateral",
+    "labelEn": "Ipsilateral and contralateral",
+    "labelEs": "Ipsilateral y contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral and contralateral",
+      "ipsilateral i contralateral"
+    ],
+    "sortOrder": 45
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_OR_CONTRALATERAL",
+    "labelCa": "Ipsilateral o contralateral",
+    "labelEn": "Ipsilateral or contralateral",
+    "labelEs": "Ipsilateral o contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral / contralateral",
+      "ipsilateral/contralateral"
+    ],
+    "sortOrder": 46
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "LATERAL",
+    "labelCa": "Lateral",
+    "labelEn": "Lateral",
+    "labelEs": "Lateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "lateral"
+    ],
+    "sortOrder": 47
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "PROXIMAL",
+    "labelCa": "Proximal",
+    "labelEn": "Proximal",
+    "labelEs": "Proximal",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "proximal"
+    ],
+    "sortOrder": 48
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "TO_AND_FRO",
+    "labelCa": "Anada i tornada",
+    "labelEn": "To and fro",
+    "labelEs": "Ida y vuelta",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "to and fro",
+      "vaive"
+    ],
+    "sortOrder": 49
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "TOWARDS_LOCATION",
+    "labelCa": "Cap a la ubicació",
+    "labelEn": "Towards location",
+    "labelEs": "Hacia la ubicación",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "cap a la localitzacio",
+      "towards location"
+    ],
+    "sortOrder": 50
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "UP_AND_DOWN",
+    "labelCa": "Amunt i avall",
+    "labelEn": "Up and down",
+    "labelEs": "Arriba y abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "amunt i avall",
+      "up and down"
+    ],
+    "sortOrder": 51
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "UPWARDS",
+    "labelCa": "Amunt",
+    "labelEn": "Upwards",
+    "labelEs": "Hacia arriba",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "amunt",
+      "upwards"
+    ],
+    "sortOrder": 52
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "UPWARDS_TO_DOWNWARDS",
+    "labelCa": "Amunt a avall",
+    "labelEn": "Upwards to downwards",
+    "labelEs": "Hacia arriba a abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "amunt > avall",
+      "upwards > downwards"
+    ],
+    "sortOrder": 53
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "UPWARDS_TO_FORWARDS_TO_DOWNWARDS",
+    "labelCa": "Amunt a endavant a avall",
+    "labelEn": "Upwards to forwards to downwards",
+    "labelEs": "Hacia arriba a adelante a abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "amunt > endavant > avall",
+      "upwards > forwards > downwards"
+    ],
+    "sortOrder": 54
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "UPWARDS_TO_IPSILATERAL",
+    "labelCa": "Amunt a ipsilateral",
+    "labelEn": "Upwards to ipsilateral",
+    "labelEs": "Hacia arriba a ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "amunt > ipsilateral",
+      "upwards > ipsilateral"
+    ],
+    "sortOrder": 55
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "VARIABLE",
+    "labelCa": "Variable",
+    "labelEn": "Variable",
+    "labelEs": "Variable",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "variable"
+    ],
+    "sortOrder": 56
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "FORWARDS_AND_DOWNWARDS",
+    "labelCa": "Endavant i avall",
+    "labelEn": "Forwards and downwards",
+    "labelEs": "Hacia adelante y abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [],
+    "sortOrder": 57
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "CONTRALATERAL_TO_DOWNWARDS",
+    "labelCa": "Contralateral a avall",
+    "labelEn": "Contralateral to downwards",
+    "labelEs": "Contralateral a abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "contralateral > avall",
+      "contralateral > downwards"
+    ],
+    "sortOrder": 58
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "DOWNWARDS_TO_CONTRALATERAL_TO_IPSILATERAL",
+    "labelCa": "Avall a contralateral a ipsilateral",
+    "labelEn": "Downwards to contralateral to ipsilateral",
+    "labelEs": "Hacia abajo a contralateral a ipsilateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "avall > contralateral > ipsilateral",
+      "downwards > contralateral > ipsilateral"
+    ],
+    "sortOrder": 59
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "UPWARDS_AND_FORWARDS",
+    "labelCa": "Amunt i endavant",
+    "labelEn": "Upwards and forwards",
+    "labelEs": "Hacia arriba y adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "amunt + endavant",
+      "upwards + forwards"
+    ],
+    "sortOrder": 60
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_TO_FORWARDS",
+    "labelCa": "Ipsilateral a endavant",
+    "labelEn": "Ipsilateral to forwards",
+    "labelEs": "Ipsilateral a adelante",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral > endavant",
+      "ipsilateral > forwards"
+    ],
+    "sortOrder": 61
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_TO_BACKWARDS_TO_CONTRALATERAL",
+    "labelCa": "Ipsilateral a enrere a contralateral",
+    "labelEn": "Ipsilateral to backwards to contralateral",
+    "labelEs": "Ipsilateral a atrás a contralateral",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral > backwards > contralateral",
+      "ipsilateral > enrere > contralateral"
+    ],
+    "sortOrder": 62
+  },
+  {
+    "dimension": "MOVEMENT_DIRECTION",
+    "code": "IPSILATERAL_AND_DOWNWARDS",
+    "labelCa": "Ipsilateral i avall",
+    "labelEn": "Ipsilateral and downwards",
+    "labelEs": "Ipsilateral y abajo",
+    "descriptionCa": null,
+    "descriptionEn": null,
+    "descriptionEs": null,
+    "aliases": [
+      "ipsilateral + downwards",
+      "ispilateral + avall"
+    ],
+    "sortOrder": 63
+  }
+]
diff --git a/backend/src/phonology-values/phonology-catalog.seed.ts b/backend/src/phonology-values/phonology-catalog.seed.ts
new file mode 100644
index 0000000..0832ad3
--- /dev/null
+++ b/backend/src/phonology-values/phonology-catalog.seed.ts
@@ -0,0 +1,46 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { PhonologyDimension, PrismaClient } from '@prisma/client';
+import { PrismaService } from '../prisma/prisma.service';
+
+export type PhonologyCatalogDefault = {
+  dimension: PhonologyDimension;
+  code: string;
+  labelCa: string;
+  labelEn: string | null;
+  labelEs: string | null;
+  descriptionCa: string | null;
+  descriptionEn: string | null;
+  descriptionEs: string | null;
+  aliases: string[];
+  sortOrder: number;
+};
+
+function loadDefaults(): PhonologyCatalogDefault[] {
+  const candidates = [
+    path.join(__dirname, 'phonology-catalog.defaults.json'),
+    path.join(process.cwd(), 'src/phonology-values/phonology-catalog.defaults.json'),
+    path.join(process.cwd(), 'dist/phonology-values/phonology-catalog.defaults.json'),
+  ];
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) {
+      return JSON.parse(fs.readFileSync(candidate, 'utf8')) as PhonologyCatalogDefault[];
+    }
+  }
+  throw new Error(`phonology-catalog.defaults.json not found. Tried: ${candidates.join(', ')}`);
+}
+
+export async function ensurePhonologyCatalog(
+  prisma: PrismaClient | PrismaService,
+): Promise<number> {
+  const defaults = loadDefaults();
+  const existing = await prisma.phonologyValue.findMany({
+    select: { dimension: true, code: true },
+  });
+  const have = new Set(existing.map((row) => `${row.dimension}:${row.code}`));
+  const missing = defaults.filter((row) => !have.has(`${row.dimension}:${row.code}`));
+  if (missing.length === 0) return 0;
+
+  await prisma.phonologyValue.createMany({ data: missing });
+  return missing.length;
+}
diff --git a/backend/src/phonology-values/phonology-fields.ts b/backend/src/phonology-values/phonology-fields.ts
new file mode 100644
index 0000000..d7b5d48
--- /dev/null
+++ b/backend/src/phonology-values/phonology-fields.ts
@@ -0,0 +1,59 @@
+import { PhonologyDimension } from '@prisma/client';
+
+export const PHONOLOGY_CODE_PATTERN = /^[A-Z0-9][A-Z0-9_]*$/;
+
+export type VideoDataPhonologyInput = {
+  handedness?: string | null;
+  dominantConfiguration?: string | null;
+  nonDominantConfiguration?: string | null;
+  dominantRelationBetweenArticulators?: string | null;
+  nonDominantRelationBetweenArticulators?: string | null;
+  configurationChanges?: string | null;
+  location?: string | null;
+  movementRelatedOrientation?: string | null;
+  orientationRelatedToLocation?: string | null;
+  orientationChange?: string | null;
+  contactType?: string | null;
+  movementType?: string | null;
+  movementDirection?: string | null;
+};
+
+export const VIDEO_DATA_ID_FIELDS_BY_DIMENSION: Record<
+  PhonologyDimension,
+  string[]
+> = {
+  HANDEDNESS: ['handednessId'],
+  HAND_CONFIGURATION: ['dominantConfigurationId', 'nonDominantConfigurationId'],
+  CONFIGURATION_CHANGE: ['configurationChangesId'],
+  RELATION_BETWEEN_ARTICULATORS: [
+    'dominantRelationBetweenArticulatorsId',
+    'nonDominantRelationBetweenArticulatorsId',
+  ],
+  LOCATION: ['locationId'],
+  MOVEMENT_RELATED_ORIENTATION: ['movementRelatedOrientationId'],
+  ORIENTATION_RELATED_TO_LOCATION: ['orientationRelatedToLocationId'],
+  ORIENTATION_CHANGE: ['orientationChangeId'],
+  CONTACT_TYPE: ['contactTypeId'],
+  MOVEMENT_TYPE: ['movementTypeId'],
+  MOVEMENT_DIRECTION: ['movementDirectionId'],
+};
+
+export const FIELD_TO_DIMENSION: Record<keyof VideoDataPhonologyInput, PhonologyDimension> = {
+  handedness: PhonologyDimension.HANDEDNESS,
+  dominantConfiguration: PhonologyDimension.HAND_CONFIGURATION,
+  nonDominantConfiguration: PhonologyDimension.HAND_CONFIGURATION,
+  dominantRelationBetweenArticulators: PhonologyDimension.RELATION_BETWEEN_ARTICULATORS,
+  nonDominantRelationBetweenArticulators: PhonologyDimension.RELATION_BETWEEN_ARTICULATORS,
+  configurationChanges: PhonologyDimension.CONFIGURATION_CHANGE,
+  location: PhonologyDimension.LOCATION,
+  movementRelatedOrientation: PhonologyDimension.MOVEMENT_RELATED_ORIENTATION,
+  orientationRelatedToLocation: PhonologyDimension.ORIENTATION_RELATED_TO_LOCATION,
+  orientationChange: PhonologyDimension.ORIENTATION_CHANGE,
+  contactType: PhonologyDimension.CONTACT_TYPE,
+  movementType: PhonologyDimension.MOVEMENT_TYPE,
+  movementDirection: PhonologyDimension.MOVEMENT_DIRECTION,
+};
+
+export function normalizePhonologyCode(code: string): string {
+  return code.trim().replace(/[\s-]+/g, '_').toUpperCase();
+}
diff --git a/backend/src/phonology-values/phonology-values.controller.ts b/backend/src/phonology-values/phonology-values.controller.ts
new file mode 100644
index 0000000..f59e8a8
--- /dev/null
+++ b/backend/src/phonology-values/phonology-values.controller.ts
@@ -0,0 +1,40 @@
+import { Body, Controller, Delete, Get, Param, Patch, Post, Query, UseGuards } from '@nestjs/common';
+import { Role } from '@prisma/client';
+import { JwtGuard } from '../auth/guard/jwt.guard';
+import { RolesGuard } from '../auth/guard/roles.guard';
+import { Roles } from '../auth/decorator/roles.decorator';
+import { PhonologyValuesService } from './phonology-values.service';
+import { CreatePhonologyValueDto } from './dto/create-phonology-value.dto';
+import { UpdatePhonologyValueDto } from './dto/update-phonology-value.dto';
+import { QueryPhonologyValuesDto } from './dto/query-phonology-values.dto';
+
+@Controller('phonology-values')
+export class PhonologyValuesController {
+  constructor(private readonly phonologyValuesService: PhonologyValuesService) {}
+
+  @Get()
+  findAll(@Query() query: QueryPhonologyValuesDto) {
+    return this.phonologyValuesService.findAll(query);
+  }
+
+  @Post()
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(Role.ADMIN)
+  create(@Body() dto: CreatePhonologyValueDto) {
+    return this.phonologyValuesService.create(dto);
+  }
+
+  @Patch(':id')
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(Role.ADMIN)
+  update(@Param('id') id: string, @Body() dto: UpdatePhonologyValueDto) {
+    return this.phonologyValuesService.update(id, dto);
+  }
+
+  @Delete(':id')
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(Role.ADMIN)
+  remove(@Param('id') id: string, @Query('confirmCode') confirmCode?: string) {
+    return this.phonologyValuesService.remove(id, confirmCode);
+  }
+}
diff --git a/backend/src/phonology-values/phonology-values.module.ts b/backend/src/phonology-values/phonology-values.module.ts
new file mode 100644
index 0000000..2ede59b
--- /dev/null
+++ b/backend/src/phonology-values/phonology-values.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { EventEmitterModule } from '@nestjs/event-emitter';
+import { PhonologyValuesController } from './phonology-values.controller';
+import { PhonologyValuesService } from './phonology-values.service';
+
+@Module({
+  imports: [EventEmitterModule],
+  controllers: [PhonologyValuesController],
+  providers: [PhonologyValuesService],
+  exports: [PhonologyValuesService],
+})
+export class PhonologyValuesModule {}
diff --git a/backend/src/phonology-values/phonology-values.service.ts b/backend/src/phonology-values/phonology-values.service.ts
new file mode 100644
index 0000000..17fe51d
--- /dev/null
+++ b/backend/src/phonology-values/phonology-values.service.ts
@@ -0,0 +1,327 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  Logger,
+  NotFoundException,
+  OnModuleInit,
+} from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { PhonologyDimension, Prisma } from '@prisma/client';
+import { PrismaService } from '../prisma/prisma.service';
+import { ensurePhonologyCatalog } from './phonology-catalog.seed';
+import { CreatePhonologyValueDto } from './dto/create-phonology-value.dto';
+import { UpdatePhonologyValueDto } from './dto/update-phonology-value.dto';
+import { QueryPhonologyValuesDto } from './dto/query-phonology-values.dto';
+import {
+  FIELD_TO_DIMENSION,
+  normalizePhonologyCode,
+  PHONOLOGY_CODE_PATTERN,
+  VIDEO_DATA_ID_FIELDS_BY_DIMENSION,
+  VideoDataPhonologyInput,
+} from './phonology-fields';
+import { GLOSS_SEARCH_SYNC_EVENT } from '../typesense/types/gloss-index.type';
+
+@Injectable()
+export class PhonologyValuesService implements OnModuleInit {
+  private readonly logger = new Logger(PhonologyValuesService.name);
+
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly eventEmitter: EventEmitter2,
+  ) {}
+
+  async onModuleInit() {
+    const created = await ensurePhonologyCatalog(this.prisma);
+    if (created > 0) {
+      this.logger.log(`Seeded ${created} phonology catalog values`);
+    }
+  }
+
+  async findAll(query: QueryPhonologyValuesDto) {
+    const values = await this.prisma.phonologyValue.findMany({
+      where: {
+        ...(query.dimension ? { dimension: query.dimension } : {}),
+        ...(query.includeInactive ? {} : { active: true }),
+      },
+      orderBy: [{ dimension: 'asc' }, { sortOrder: 'asc' }, { code: 'asc' }],
+    });
+
+    if (!query.withUsage) return values;
+
+    const usage = await this.usageByDimensionAndCode();
+    return values.map((value) => ({
+      ...value,
+      usageCount: usage.get(`${value.dimension}:${value.code}`) ?? 0,
+    }));
+  }
+
+  async create(dto: CreatePhonologyValueDto) {
+    const code = this.requireValidCode(dto.code);
+    await this.assertCodeAvailable(dto.dimension, code);
+    const labelCa = dto.labelCa.trim();
+    if (!labelCa) {
+      throw new BadRequestException('Catalan label is required');
+    }
+    try {
+      return await this.prisma.phonologyValue.create({
+        data: {
+          dimension: dto.dimension,
+          code,
+          labelCa,
+          labelEn: dto.labelEn?.trim() || null,
+          labelEs: dto.labelEs?.trim() || null,
+          descriptionCa: dto.descriptionCa?.trim() || null,
+          descriptionEn: dto.descriptionEn?.trim() || null,
+          descriptionEs: dto.descriptionEs?.trim() || null,
+          aliases: this.normalizeAliases(dto.aliases),
+          sortOrder: dto.sortOrder ?? (await this.nextSortOrder(dto.dimension)),
+          active: dto.active ?? true,
+        },
+      });
+    } catch (error) {
+      this.rethrowUnique(error);
+    }
+  }
+
+  async update(id: string, dto: UpdatePhonologyValueDto) {
+    const existing = await this.prisma.phonologyValue.findUnique({ where: { id } });
+    if (!existing) {
+      throw new NotFoundException(`Phonology value ${id} not found`);
+    }
+
+    const data: Prisma.PhonologyValueUpdateInput = {};
+    if (dto.labelCa !== undefined) {
+      const labelCa = dto.labelCa.trim();
+      if (!labelCa) {
+        throw new BadRequestException('Catalan label is required');
+      }
+      data.labelCa = labelCa;
+    }
+    if (dto.labelEn !== undefined) data.labelEn = dto.labelEn.trim() || null;
+    if (dto.labelEs !== undefined) data.labelEs = dto.labelEs.trim() || null;
+    if (dto.descriptionCa !== undefined) data.descriptionCa = dto.descriptionCa.trim() || null;
+    if (dto.descriptionEn !== undefined) data.descriptionEn = dto.descriptionEn.trim() || null;
+    if (dto.descriptionEs !== undefined) data.descriptionEs = dto.descriptionEs.trim() || null;
+    if (dto.aliases !== undefined) data.aliases = this.normalizeAliases(dto.aliases);
+    if (dto.sortOrder !== undefined) data.sortOrder = dto.sortOrder;
+    if (dto.active !== undefined) data.active = dto.active;
+
+    if (dto.code !== undefined) {
+      const code = this.requireValidCode(dto.code);
+      if (code !== existing.code) {
+        await this.assertCodeAvailable(existing.dimension, code, existing.id);
+        data.code = code;
+      }
+    }
+
+    try {
+      return await this.prisma.phonologyValue.update({ where: { id }, data });
+    } catch (error) {
+      this.rethrowUnique(error);
+    }
+  }
+
+  async remove(id: string, confirmCode?: string) {
+    const existing = await this.prisma.phonologyValue.findUnique({ where: { id } });
+    if (!existing) {
+      throw new NotFoundException(`Phonology value ${id} not found`);
+    }
+
+    const usageCount = await this.countUsage(existing.dimension, existing.code);
+    if (usageCount > 0) {
+      const expected = existing.code;
+      const provided = confirmCode ? normalizePhonologyCode(confirmCode) : '';
+      if (provided !== expected) {
+        throw new BadRequestException(
+          `This value is used by ${usageCount} phonology record(s). Confirm deletion by sending confirmCode=${expected}`,
+        );
+      }
+    }
+
+    const glossDataIds = await this.prisma.$transaction(async (tx) => {
+      const affectedIds = usageCount > 0 ? await this.findAffectedGlossIds(tx, existing) : [];
+      if (usageCount > 0) {
+        await this.clearUsages(tx, existing);
+      }
+      await tx.phonologyValue.delete({ where: { id } });
+      return affectedIds;
+    });
+
+    for (const glossDataId of glossDataIds) {
+      this.eventEmitter.emit(GLOSS_SEARCH_SYNC_EVENT, { glossDataId });
+    }
+
+    return { id, deleted: true, clearedUsage: usageCount };
+  }
+
+  async assertVideoDataCodes(videoData: VideoDataPhonologyInput) {
+    const required: Array<[keyof VideoDataPhonologyInput, string]> = [];
+    for (const [field, dimension] of Object.entries(FIELD_TO_DIMENSION) as Array<
+      [keyof VideoDataPhonologyInput, PhonologyDimension]
+    >) {
+      const value = videoData[field];
+      if (value == null || value === '') continue;
+      required.push([field, value]);
+      void dimension;
+    }
+    if (required.length === 0) return;
+
+    const codesByDimension = new Map<PhonologyDimension, Set<string>>();
+    for (const [field, code] of required) {
+      const dimension = FIELD_TO_DIMENSION[field];
+      if (!codesByDimension.has(dimension)) codesByDimension.set(dimension, new Set());
+      codesByDimension.get(dimension)!.add(code);
+    }
+
+    const found = await this.prisma.phonologyValue.findMany({
+      where: {
+        OR: [...codesByDimension.entries()].map(([dimension, codes]) => ({
+          dimension,
+          code: { in: [...codes] },
+        })),
+      },
+      select: { dimension: true, code: true, active: true },
+    });
+    const foundSet = new Set(found.map((row) => `${row.dimension}:${row.code}`));
+
+    for (const [field, code] of required) {
+      const dimension = FIELD_TO_DIMENSION[field];
+      if (!foundSet.has(`${dimension}:${code}`)) {
+        throw new BadRequestException(`Unknown ${field} value: ${code}`);
+      }
+    }
+  }
+
+  async countUsage(dimension: PhonologyDimension, code: string): Promise<number> {
+    const value = await this.prisma.phonologyValue.findUnique({
+      where: { dimension_code: { dimension, code } },
+      select: { id: true },
+    });
+    if (!value) return 0;
+
+    const fields = VIDEO_DATA_ID_FIELDS_BY_DIMENSION[dimension];
+    const counts = await Promise.all(
+      fields.map((field) =>
+        this.prisma.videoData.count({
+          where: { [field]: value.id },
+        }),
+      ),
+    );
+    return counts.reduce((sum, count) => sum + count, 0);
+  }
+
+  private async usageByDimensionAndCode(): Promise<Map<string, number>> {
+    const usage = new Map<string, number>();
+    const values = await this.prisma.phonologyValue.findMany({
+      select: { id: true, dimension: true, code: true },
+    });
+    const byId = new Map(values.map((value) => [value.id, value]));
+
+    await Promise.all(
+      (Object.entries(VIDEO_DATA_ID_FIELDS_BY_DIMENSION) as Array<
+        [PhonologyDimension, string[]]
+      >).map(async ([, fields]) => {
+        for (const field of fields) {
+          const groups = await this.prisma.videoData.groupBy({
+            by: [field as Prisma.VideoDataScalarFieldEnum],
+            _count: { _all: true },
+          });
+          for (const group of groups) {
+            const id = group[field as keyof typeof group] as string | null;
+            if (!id) continue;
+            const value = byId.get(id);
+            if (!value) continue;
+            const key = `${value.dimension}:${value.code}`;
+            usage.set(key, (usage.get(key) ?? 0) + group._count._all);
+          }
+        }
+      }),
+    );
+
+    return usage;
+  }
+
+  private async assertCodeAvailable(
+    dimension: PhonologyDimension,
+    code: string,
+    excludeId?: string,
+  ) {
+    const existing = await this.prisma.phonologyValue.findUnique({
+      where: { dimension_code: { dimension, code } },
+      select: { id: true },
+    });
+    if (existing && existing.id !== excludeId) {
+      throw new ConflictException(`A value with code ${code} already exists in this dimension`);
+    }
+  }
+
+  private async clearUsages(
+    tx: Prisma.TransactionClient,
+    value: { id: string; dimension: PhonologyDimension },
+  ) {
+    const fields = VIDEO_DATA_ID_FIELDS_BY_DIMENSION[value.dimension];
+    for (const field of fields) {
+      await tx.videoData.updateMany({
+        where: { [field]: value.id },
+        data: { [field]: null },
+      });
+    }
+  }
+
+  private async findAffectedGlossIds(
+    tx: Prisma.TransactionClient,
+    value: { id: string; dimension: PhonologyDimension },
+  ): Promise<string[]> {
+    const fields = VIDEO_DATA_ID_FIELDS_BY_DIMENSION[value.dimension];
+    const or = fields.map((field) => ({ [field]: value.id }));
+    const [signVideos, compoundParts] = await Promise.all([
+      tx.signVideo.findMany({
+        where: { videoData: { OR: or } },
+        select: { glossDataId: true },
+      }),
+      tx.compoundPart.findMany({
+        where: { inlinePhonology: { OR: or } },
+        select: { glossDataId: true },
+      }),
+    ]);
+    return [
+      ...new Set(
+        [...signVideos, ...compoundParts]
+          .map((row) => row.glossDataId)
+          .filter((id): id is string => Boolean(id)),
+      ),
+    ];
+  }
+
+  private async nextSortOrder(dimension: PhonologyDimension): Promise<number> {
+    const last = await this.prisma.phonologyValue.findFirst({
+      where: { dimension },
+      orderBy: { sortOrder: 'desc' },
+      select: { sortOrder: true },
+    });
+    return (last?.sortOrder ?? -1) + 1;
+  }
+
+  private requireValidCode(code: string): string {
+    const normalized = normalizePhonologyCode(code);
+    if (!PHONOLOGY_CODE_PATTERN.test(normalized)) {
+      throw new BadRequestException(
+        'Code must start with a letter or digit and contain only A-Z, 0-9 and underscore',
+      );
+    }
+    return normalized;
+  }
+
+  private normalizeAliases(aliases?: string[]): string[] {
+    if (!aliases) return [];
+    return [...new Set(aliases.map((alias) => alias.trim()).filter(Boolean))];
+  }
+
+  private rethrowUnique(error: unknown): never {
+    if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === 'P2002') {
+      throw new ConflictException('A value with this code already exists in this dimension');
+    }
+    throw error;
+  }
+}
diff --git a/backend/src/phonology-values/phonology-video-data.ts b/backend/src/phonology-values/phonology-video-data.ts
new file mode 100644
index 0000000..e02703e
--- /dev/null
+++ b/backend/src/phonology-values/phonology-video-data.ts
@@ -0,0 +1,220 @@
+import { PhonologyDimension, Prisma } from '@prisma/client';
+import { VideoDataPhonologyInput } from './phonology-fields';
+
+export const VIDEO_DATA_PHONOLOGY_RELATIONS = [
+  { field: 'handedness', idField: 'handednessId', dimension: PhonologyDimension.HANDEDNESS, required: true, defaultCode: 'ONE' },
+  { field: 'dominantConfiguration', idField: 'dominantConfigurationId', dimension: PhonologyDimension.HAND_CONFIGURATION, required: false },
+  { field: 'nonDominantConfiguration', idField: 'nonDominantConfigurationId', dimension: PhonologyDimension.HAND_CONFIGURATION, required: false },
+  { field: 'dominantRelationBetweenArticulators', idField: 'dominantRelationBetweenArticulatorsId', dimension: PhonologyDimension.RELATION_BETWEEN_ARTICULATORS, required: false },
+  { field: 'nonDominantRelationBetweenArticulators', idField: 'nonDominantRelationBetweenArticulatorsId', dimension: PhonologyDimension.RELATION_BETWEEN_ARTICULATORS, required: false },
+  { field: 'configurationChanges', idField: 'configurationChangesId', dimension: PhonologyDimension.CONFIGURATION_CHANGE, required: true, defaultCode: 'EMPTY' },
+  { field: 'location', idField: 'locationId', dimension: PhonologyDimension.LOCATION, required: true, defaultCode: 'EMPTY' },
+  { field: 'movementRelatedOrientation', idField: 'movementRelatedOrientationId', dimension: PhonologyDimension.MOVEMENT_RELATED_ORIENTATION, required: true, defaultCode: 'EMPTY' },
+  { field: 'orientationRelatedToLocation', idField: 'orientationRelatedToLocationId', dimension: PhonologyDimension.ORIENTATION_RELATED_TO_LOCATION, required: true, defaultCode: 'EMPTY' },
+  { field: 'orientationChange', idField: 'orientationChangeId', dimension: PhonologyDimension.ORIENTATION_CHANGE, required: true, defaultCode: 'EMPTY' },
+  { field: 'contactType', idField: 'contactTypeId', dimension: PhonologyDimension.CONTACT_TYPE, required: true, defaultCode: 'EMPTY' },
+  { field: 'movementType', idField: 'movementTypeId', dimension: PhonologyDimension.MOVEMENT_TYPE, required: true, defaultCode: 'EMPTY' },
+  { field: 'movementDirection', idField: 'movementDirectionId', dimension: PhonologyDimension.MOVEMENT_DIRECTION, required: true, defaultCode: 'EMPTY' },
+] as const;
+
+export const VIDEO_DATA_ID_FIELDS = VIDEO_DATA_PHONOLOGY_RELATIONS.map((rel) => rel.idField);
+
+export const videoDataPhonologyInclude = Object.fromEntries(
+  VIDEO_DATA_PHONOLOGY_RELATIONS.map((rel) => [rel.field, true]),
+) as Prisma.VideoDataInclude;
+
+export function flattenVideoData<T extends Record<string, unknown>>(videoData: T): T {
+  const result = { ...videoData };
+  for (const rel of VIDEO_DATA_PHONOLOGY_RELATIONS) {
+    const nested = result[rel.field];
+    if (nested && typeof nested === 'object' && 'code' in nested) {
+      (result as Record<string, unknown>)[rel.field] = (nested as { code: string }).code;
+    }
+    delete result[rel.idField];
+  }
+  return result;
+}
+
+export function flattenPhonologyInTree<T>(value: T): T {
+  if (Array.isArray(value)) {
+    return value.map((item) => flattenPhonologyInTree(item)) as T;
+  }
+  if (!value || typeof value !== 'object') {
+    return value;
+  }
+
+  const obj = value as Record<string, unknown>;
+  const looksLikeVideoData =
+    'vocalization' in obj && ('handedness' in obj || 'handednessId' in obj);
+  const next = looksLikeVideoData ? flattenVideoData(obj) : { ...obj };
+
+  for (const [key, nested] of Object.entries(next)) {
+    if (nested && typeof nested === 'object') {
+      next[key] = flattenPhonologyInTree(nested);
+    }
+  }
+  return next as T;
+}
+
+export function phonologyCode(value: unknown, fallback = ''): string {
+  if (value == null || value === '') return fallback;
+  if (typeof value === 'string') return value;
+  if (typeof value === 'object' && 'code' in value) {
+    const code = (value as { code: unknown }).code;
+    return typeof code === 'string' ? code : fallback;
+  }
+  return fallback;
+}
+
+export function toSearchPhonology(videoData: unknown) {
+  const data = (videoData ?? {}) as Record<string, unknown>;
+  return {
+    handedness: phonologyCode(data.handedness, 'ONE'),
+    dominantConfiguration: phonologyCode(data.dominantConfiguration),
+    nonDominantConfiguration: phonologyCode(data.nonDominantConfiguration),
+    dominantRelationBetweenArticulators: phonologyCode(data.dominantRelationBetweenArticulators),
+    nonDominantRelationBetweenArticulators: phonologyCode(
+      data.nonDominantRelationBetweenArticulators,
+    ),
+    configurationChanges: phonologyCode(data.configurationChanges),
+    location: phonologyCode(data.location),
+    movementRelatedOrientation: phonologyCode(data.movementRelatedOrientation),
+    orientationRelatedToLocation: phonologyCode(data.orientationRelatedToLocation),
+    orientationChange: phonologyCode(data.orientationChange),
+    contactType: phonologyCode(data.contactType),
+    movementType: phonologyCode(data.movementType),
+    movementDirection: phonologyCode(data.movementDirection),
+    vocalization: typeof data.vocalization === 'string' ? data.vocalization : '',
+    nonManualComponent: typeof data.nonManualComponent === 'string' ? data.nonManualComponent : '',
+    inicialization: typeof data.inicialization === 'string' ? data.inicialization : '',
+    repeatedMovement: Boolean(data.repeatedMovement),
+  };
+}
+
+export function videoDataFromCodes(
+  data: VideoDataPhonologyInput & {
+    vocalization?: string;
+    nonManualComponent?: string;
+    inicialization?: string;
+    repeatedMovement?: boolean;
+    id?: string;
+  },
+): Prisma.VideoDataCreateInput {
+  const create: Prisma.VideoDataCreateInput = {
+    vocalization: data.vocalization ?? '',
+    nonManualComponent: data.nonManualComponent ?? '',
+    inicialization: data.inicialization ?? '',
+    repeatedMovement: data.repeatedMovement ?? false,
+    handedness: connectRequired('HANDEDNESS', data.handedness, 'ONE'),
+    configurationChanges: connectRequired('CONFIGURATION_CHANGE', data.configurationChanges, 'EMPTY'),
+    location: connectRequired('LOCATION', data.location, 'EMPTY'),
+    movementRelatedOrientation: connectRequired(
+      'MOVEMENT_RELATED_ORIENTATION',
+      data.movementRelatedOrientation,
+      'EMPTY',
+    ),
+    orientationRelatedToLocation: connectRequired(
+      'ORIENTATION_RELATED_TO_LOCATION',
+      data.orientationRelatedToLocation,
+      'EMPTY',
+    ),
+    orientationChange: connectRequired('ORIENTATION_CHANGE', data.orientationChange, 'EMPTY'),
+    contactType: connectRequired('CONTACT_TYPE', data.contactType, 'EMPTY'),
+    movementType: connectRequired('MOVEMENT_TYPE', data.movementType, 'EMPTY'),
+    movementDirection: connectRequired('MOVEMENT_DIRECTION', data.movementDirection, 'EMPTY'),
+  };
+
+  const optional = connectOptional('HAND_CONFIGURATION', data.dominantConfiguration);
+  if (optional) create.dominantConfiguration = optional;
+  const optionalNonDom = connectOptional('HAND_CONFIGURATION', data.nonDominantConfiguration);
+  if (optionalNonDom) create.nonDominantConfiguration = optionalNonDom;
+  const optionalDomRel = connectOptional(
+    'RELATION_BETWEEN_ARTICULATORS',
+    data.dominantRelationBetweenArticulators,
+  );
+  if (optionalDomRel) create.dominantRelationBetweenArticulators = optionalDomRel;
+  const optionalNonDomRel = connectOptional(
+    'RELATION_BETWEEN_ARTICULATORS',
+    data.nonDominantRelationBetweenArticulators,
+  );
+  if (optionalNonDomRel) create.nonDominantRelationBetweenArticulators = optionalNonDomRel;
+
+  if (data.id) create.id = data.id;
+  return create;
+}
+
+export function videoDataUpdateFromCodes(
+  data: VideoDataPhonologyInput & {
+    vocalization?: string;
+    nonManualComponent?: string;
+    inicialization?: string;
+    repeatedMovement?: boolean;
+  },
+): Prisma.VideoDataUpdateInput {
+  const optionalField = (
+    dimension: PhonologyDimension,
+    code: string | null | undefined,
+  ) =>
+    code
+      ? { connect: { dimension_code: { dimension, code } } }
+      : { disconnect: true };
+
+  return {
+    vocalization: data.vocalization ?? '',
+    nonManualComponent: data.nonManualComponent ?? '',
+    inicialization: data.inicialization ?? '',
+    repeatedMovement: data.repeatedMovement ?? false,
+    handedness: optionalField('HANDEDNESS', data.handedness),
+    configurationChanges: optionalField('CONFIGURATION_CHANGE', data.configurationChanges),
+    location: optionalField('LOCATION', data.location),
+    movementRelatedOrientation: optionalField(
+      'MOVEMENT_RELATED_ORIENTATION',
+      data.movementRelatedOrientation,
+    ),
+    orientationRelatedToLocation: optionalField(
+      'ORIENTATION_RELATED_TO_LOCATION',
+      data.orientationRelatedToLocation,
+    ),
+    orientationChange: optionalField('ORIENTATION_CHANGE', data.orientationChange),
+    contactType: optionalField('CONTACT_TYPE', data.contactType),
+    movementType: optionalField('MOVEMENT_TYPE', data.movementType),
+    movementDirection: optionalField('MOVEMENT_DIRECTION', data.movementDirection),
+    dominantConfiguration: optionalField('HAND_CONFIGURATION', data.dominantConfiguration),
+    nonDominantConfiguration: optionalField('HAND_CONFIGURATION', data.nonDominantConfiguration),
+    dominantRelationBetweenArticulators: optionalField(
+      'RELATION_BETWEEN_ARTICULATORS',
+      data.dominantRelationBetweenArticulators,
+    ),
+    nonDominantRelationBetweenArticulators: optionalField(
+      'RELATION_BETWEEN_ARTICULATORS',
+      data.nonDominantRelationBetweenArticulators,
+    ),
+  };
+}
+
+function connectRequired(
+  dimension: PhonologyDimension,
+  code: string | null | undefined,
+  fallback: string,
+) {
+  return {
+    connect: {
+      dimension_code: {
+        dimension,
+        code: code || fallback,
+      },
+    },
+  };
+}
+
+function connectOptional(
+  dimension: PhonologyDimension,
+  code: string | null | undefined,
+) {
+  if (!code) return undefined;
+  return {
+    connect: {
+      dimension_code: { dimension, code },
+    },
+  };
+}
diff --git a/backend/src/sign-videos/dto/create-sign-video.dto.ts b/backend/src/sign-videos/dto/create-sign-video.dto.ts
index b5f48fa..f341630 100644
--- a/backend/src/sign-videos/dto/create-sign-video.dto.ts
+++ b/backend/src/sign-videos/dto/create-sign-video.dto.ts
@@ -1,6 +1,6 @@
-import { IsString, IsNotEmpty, IsArray, ValidateNested, IsOptional, IsNumber, IsEnum } from 'class-validator';
+import { IsString, IsNotEmpty, IsArray, ValidateNested, IsOptional, IsNumber } from 'class-validator';
 import { Type } from 'class-transformer';
-import { Handedness, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from '@prisma/client';
+import { VideoDataDto } from './video-data.dto';
 
 class VideoDto {
   @IsString()
@@ -19,73 +19,10 @@ class VideoDto {
   priority: number;
 }
 
-class VideoDataDto {
+class SignVideoPhonologyDto extends VideoDataDto {
   @IsString()
   @IsNotEmpty()
   id: string;
-
-  @IsEnum(Handedness)
-  handedness: Handedness;
-
-  @IsEnum(HandConfiguration)
-  @IsOptional()
-  dominantConfiguration?: HandConfiguration;
-
-  @IsEnum(HandConfiguration)
-  @IsOptional()
-  nonDominantConfiguration?: HandConfiguration;
-
-  @IsEnum(RelationBetweenArticulators)
-  @IsOptional()
-  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
-
-  @IsEnum(RelationBetweenArticulators)
-  @IsOptional()
-  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
-
-  @IsEnum(ConfigurationChange)
-  @IsOptional()
-  configurationChanges?: ConfigurationChange;
-
-  @IsEnum(Location)
-  @IsOptional()
-  location?: Location;
-
-  @IsEnum(MovementRelatedOrientation)
-  @IsOptional()
-  movementRelatedOrientation?: MovementRelatedOrientation;
-
-  @IsEnum(OrientationRelatedToLocation)
-  @IsOptional()
-  orientationRelatedToLocation?: OrientationRelatedToLocation;
-
-  @IsEnum(OrientationChange)
-  @IsOptional()
-  orientationChange?: OrientationChange;
-
-  @IsEnum(ContactType)
-  @IsOptional()
-  contactType?: ContactType;
-
-  @IsEnum(MovementType)
-  @IsOptional()
-  movementType?: MovementType;
-
-  @IsEnum(MovementDirection)
-  @IsOptional()
-  movementDirection?: MovementDirection;
-
-  @IsString()
-  @IsOptional()
-  vocalization?: string;
-
-  @IsString()
-  @IsOptional()
-  nonManualComponent?: string;
-
-  @IsString()
-  @IsOptional()
-  inicialization?: string;
 }
 
 export class CreateSignVideoDto {
@@ -108,9 +45,9 @@ export class CreateSignVideoDto {
   videos: VideoDto[];
 
   @ValidateNested()
-  @Type(() => VideoDataDto)
-  videoData: VideoDataDto;
+  @Type(() => SignVideoPhonologyDto)
+  videoData: SignVideoPhonologyDto;
 
   @IsArray()
   minimalPairs: any[];
-} 
\ No newline at end of file
+}
diff --git a/backend/src/sign-videos/dto/update-sign-video.dto.ts b/backend/src/sign-videos/dto/update-sign-video.dto.ts
index 5f7bdc0..281d339 100644
--- a/backend/src/sign-videos/dto/update-sign-video.dto.ts
+++ b/backend/src/sign-videos/dto/update-sign-video.dto.ts
@@ -1,6 +1,6 @@
-import { IsString, IsNotEmpty, IsArray, ValidateNested, IsOptional, IsNumber, IsEnum } from 'class-validator';
+import { IsString, IsNotEmpty, IsArray, ValidateNested, IsOptional, IsNumber } from 'class-validator';
 import { Type } from 'class-transformer';
-import { Handedness, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from '@prisma/client';
+import { VideoDataDto } from './video-data.dto';
 
 class VideoDto {
   @IsString()
@@ -19,73 +19,10 @@ class VideoDto {
   priority: number;
 }
 
-class VideoDataDto {
+class SignVideoPhonologyDto extends VideoDataDto {
   @IsString()
   @IsNotEmpty()
   id: string;
-
-  @IsEnum(Handedness)
-  handedness: Handedness;
-
-  @IsEnum(HandConfiguration)
-  @IsOptional()
-  dominantConfiguration?: HandConfiguration;
-
-  @IsEnum(HandConfiguration)
-  @IsOptional()
-  nonDominantConfiguration?: HandConfiguration;
-
-  @IsEnum(RelationBetweenArticulators)
-  @IsOptional()
-  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
-
-  @IsEnum(RelationBetweenArticulators)
-  @IsOptional()
-  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
-
-  @IsEnum(ConfigurationChange)
-  @IsOptional()
-  configurationChanges?: ConfigurationChange;
-
-  @IsEnum(Location)
-  @IsOptional()
-  location?: Location;
-
-  @IsEnum(MovementRelatedOrientation)
-  @IsOptional()
-  movementRelatedOrientation?: MovementRelatedOrientation;
-
-  @IsEnum(OrientationRelatedToLocation)
-  @IsOptional()
-  orientationRelatedToLocation?: OrientationRelatedToLocation;
-
-  @IsEnum(OrientationChange)
-  @IsOptional()
-  orientationChange?: OrientationChange;
-
-  @IsEnum(ContactType)
-  @IsOptional()
-  contactType?: ContactType;
-
-  @IsEnum(MovementType)
-  @IsOptional()
-  movementType?: MovementType;
-
-  @IsEnum(MovementDirection)
-  @IsOptional()
-  movementDirection?: MovementDirection;
-
-  @IsString()
-  @IsOptional()
-  vocalization?: string;
-
-  @IsString()
-  @IsOptional()
-  nonManualComponent?: string;
-
-  @IsString()
-  @IsOptional()
-  inicialization?: string;
 }
 
 export class UpdateSignVideoDto {
@@ -110,7 +47,7 @@ export class UpdateSignVideoDto {
   @Type(() => VideoDto)
   videos: VideoDto[];
 
-  @ValidateNested() 
-  @Type(() => VideoDataDto)
-  videoData: VideoDataDto;
-} 
\ No newline at end of file
+  @ValidateNested()
+  @Type(() => SignVideoPhonologyDto)
+  videoData: SignVideoPhonologyDto;
+}
diff --git a/backend/src/sign-videos/dto/video-data.dto.ts b/backend/src/sign-videos/dto/video-data.dto.ts
index 23afcf2..e4b0523 100644
--- a/backend/src/sign-videos/dto/video-data.dto.ts
+++ b/backend/src/sign-videos/dto/video-data.dto.ts
@@ -1,69 +1,56 @@
-import { IsEnum, IsBoolean, IsOptional, IsString } from 'class-validator';
-import {
-  Handedness,
-  HandConfiguration,
-  ConfigurationChange,
-  RelationBetweenArticulators,
-  Location,
-  MovementRelatedOrientation,
-  OrientationRelatedToLocation,
-  OrientationChange,
-  ContactType,
-  MovementType,
-  MovementDirection,
-} from '@prisma/client';
+import { IsBoolean, IsOptional, IsString } from 'class-validator';
 
 export class VideoDataDto {
-  @IsEnum(Handedness)
-  handedness: Handedness;
+  @IsString()
+  handedness: string;
 
-  @IsEnum(HandConfiguration)
+  @IsString()
   @IsOptional()
-  dominantConfiguration?: HandConfiguration;
+  dominantConfiguration?: string;
 
-  @IsEnum(HandConfiguration)
+  @IsString()
   @IsOptional()
-  nonDominantConfiguration?: HandConfiguration;
+  nonDominantConfiguration?: string;
 
-  @IsEnum(RelationBetweenArticulators)
+  @IsString()
   @IsOptional()
-  dominantRelationBetweenArticulators?: RelationBetweenArticulators;
+  dominantRelationBetweenArticulators?: string;
 
-  @IsEnum(RelationBetweenArticulators)
+  @IsString()
   @IsOptional()
-  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators;
+  nonDominantRelationBetweenArticulators?: string;
 
-  @IsEnum(ConfigurationChange)
+  @IsString()
   @IsOptional()
-  configurationChanges?: ConfigurationChange;
+  configurationChanges?: string;
 
-  @IsEnum(Location)
+  @IsString()
   @IsOptional()
-  location?: Location;
+  location?: string;
 
-  @IsEnum(MovementRelatedOrientation)
+  @IsString()
   @IsOptional()
-  movementRelatedOrientation?: MovementRelatedOrientation;
+  movementRelatedOrientation?: string;
 
-  @IsEnum(OrientationRelatedToLocation)
+  @IsString()
   @IsOptional()
-  orientationRelatedToLocation?: OrientationRelatedToLocation;
+  orientationRelatedToLocation?: string;
 
-  @IsEnum(OrientationChange)
+  @IsString()
   @IsOptional()
-  orientationChange?: OrientationChange;
+  orientationChange?: string;
 
-  @IsEnum(ContactType)
+  @IsString()
   @IsOptional()
-  contactType?: ContactType;
+  contactType?: string;
 
-  @IsEnum(MovementType)
+  @IsString()
   @IsOptional()
-  movementType?: MovementType;
+  movementType?: string;
 
-  @IsEnum(MovementDirection)
+  @IsString()
   @IsOptional()
-  movementDirection?: MovementDirection;
+  movementDirection?: string;
 
   @IsString()
   @IsOptional()
diff --git a/backend/src/sign-videos/sign-videos.module.ts b/backend/src/sign-videos/sign-videos.module.ts
index 67062be..e1027e7 100644
--- a/backend/src/sign-videos/sign-videos.module.ts
+++ b/backend/src/sign-videos/sign-videos.module.ts
@@ -3,9 +3,10 @@ import { SignVideosController } from './sign-videos.controller';
 import { SignVideosService } from './sign-videos.service';
 import { GlossDataModule } from '../gloss-data/gloss-data.module';
 import { PrismaModule } from '../prisma/prisma.module';
+import { PhonologyValuesModule } from '../phonology-values/phonology-values.module';
 
 @Module({
-  imports: [PrismaModule, GlossDataModule],
+  imports: [PrismaModule, GlossDataModule, PhonologyValuesModule],
   controllers: [SignVideosController],
   providers: [SignVideosService],
   exports: [SignVideosService],
diff --git a/backend/src/sign-videos/sign-videos.service.ts b/backend/src/sign-videos/sign-videos.service.ts
index dd1a9c1..990fd85 100644
--- a/backend/src/sign-videos/sign-videos.service.ts
+++ b/backend/src/sign-videos/sign-videos.service.ts
@@ -2,32 +2,14 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CreateSignVideoDto, UpdateSignVideoDto } from './dto/index';
 import { PrismaService } from 'src/prisma/prisma.service'
-import { GlossData, Handedness, Prisma } from '@prisma/client'
+import { GlossData, Prisma } from '@prisma/client'
 import { GlossDataService } from 'src/gloss-data/gloss-data.service'
 import { GLOSS_SEARCH_SYNC_EVENT } from '../typesense/types/gloss-index.type';
-
-function buildVideoDataFields(
-  videoData: CreateSignVideoDto['videoData'] | UpdateSignVideoDto['videoData'],
-) {
-  return {
-    handedness: videoData.handedness || Handedness.ONE,
-    dominantConfiguration: videoData.dominantConfiguration ?? null,
-    nonDominantConfiguration: videoData.nonDominantConfiguration ?? null,
-    dominantRelationBetweenArticulators: videoData.dominantRelationBetweenArticulators ?? null,
-    nonDominantRelationBetweenArticulators: videoData.nonDominantRelationBetweenArticulators ?? null,
-    configurationChanges: videoData.configurationChanges || 'EMPTY',
-    location: videoData.location || 'EMPTY',
-    movementRelatedOrientation: videoData.movementRelatedOrientation || 'EMPTY',
-    orientationRelatedToLocation: videoData.orientationRelatedToLocation || 'EMPTY',
-    orientationChange: videoData.orientationChange || 'EMPTY',
-    contactType: videoData.contactType || 'EMPTY',
-    movementType: videoData.movementType || 'EMPTY',
-    movementDirection: videoData.movementDirection || 'EMPTY',
-    vocalization: videoData.vocalization || '',
-    nonManualComponent: videoData.nonManualComponent || '',
-    inicialization: videoData.inicialization || '',
-  };
-}
+import { PhonologyValuesService } from '../phonology-values/phonology-values.service';
+import {
+  videoDataFromCodes,
+  videoDataUpdateFromCodes,
+} from '../phonology-values/phonology-video-data';
 
 @Injectable()
 export class SignVideosService {    
@@ -35,6 +17,7 @@ export class SignVideosService {
     private prisma: PrismaService,
     private glossDataService: GlossDataService,
     private eventEmitter: EventEmitter2,
+    private phonologyValuesService: PhonologyValuesService,
   ) {}
 
   private notifySearchIndex(glossDataId: string) {
@@ -42,13 +25,11 @@ export class SignVideosService {
   }
 
   async create(createSignVideoDto: CreateSignVideoDto): Promise<GlossData> {
+    await this.phonologyValuesService.assertVideoDataCodes(createSignVideoDto.videoData);
 
     // Create the video data first
     const videoData = await this.prisma.videoData.create({
-      data: {
-        id: createSignVideoDto.videoData.id,
-        ...buildVideoDataFields(createSignVideoDto.videoData),
-      }
+      data: videoDataFromCodes(createSignVideoDto.videoData),
     });
 
     // Create the sign video with the video data
@@ -83,6 +64,8 @@ export class SignVideosService {
   }
 
   async update(id: string, updateSignVideoDto: UpdateSignVideoDto): Promise<GlossData> {
+    await this.phonologyValuesService.assertVideoDataCodes(updateSignVideoDto.videoData);
+
     const signVideo = await this.prisma.signVideo.findUnique({
       where: { id },
       include: {
@@ -100,9 +83,11 @@ export class SignVideosService {
     await this.prisma.videoData.update({
       where: { id: signVideo.videoDataId },
       data: {
-        id: updateSignVideoDto.videoData.id,
-        ...buildVideoDataFields(updateSignVideoDto.videoData),
-      }
+        ...(updateSignVideoDto.videoData.id
+          ? { id: updateSignVideoDto.videoData.id }
+          : {}),
+        ...videoDataUpdateFromCodes(updateSignVideoDto.videoData),
+      },
     });
 
     // Delete existing videos and create new ones
diff --git a/backend/src/typesense/types/gloss-index.type.ts b/backend/src/typesense/types/gloss-index.type.ts
index f5e65a7..fc49f67 100644
--- a/backend/src/typesense/types/gloss-index.type.ts
+++ b/backend/src/typesense/types/gloss-index.type.ts
@@ -1,17 +1,4 @@
-import {
-  Handedness,
-  HandConfiguration,
-  ConfigurationChange,
-  RelationBetweenArticulators,
-  Location,
-  MovementRelatedOrientation,
-  OrientationRelatedToLocation,
-  OrientationChange,
-  ContactType,
-  MovementType,
-  MovementDirection,
-  LexicalCategory,
-} from '@prisma/client';
+import { LexicalCategory } from '@prisma/client';
 
 /** One Typesense document per published gloss (document id = glossData.id). */
 export interface GlossIndex {
@@ -24,19 +11,19 @@ export interface GlossIndex {
   lexicalCategory: LexicalCategory | string;
   lexicalCategories: (LexicalCategory | string)[];
   description: string;
-  handedness: Handedness;
-  dominantConfiguration: HandConfiguration | '';
-  nonDominantConfiguration: HandConfiguration | '';
-  dominantRelationBetweenArticulators: RelationBetweenArticulators | '';
-  nonDominantRelationBetweenArticulators: RelationBetweenArticulators | '';
-  configurationChanges: ConfigurationChange | '';
-  location: Location | '';
-  movementRelatedOrientation: MovementRelatedOrientation | '';
-  orientationRelatedToLocation: OrientationRelatedToLocation | '';
-  orientationChange: OrientationChange | '';
-  contactType: ContactType | '';
-  movementType: MovementType | '';
-  movementDirection: MovementDirection | '';
+  handedness: string;
+  dominantConfiguration: string;
+  nonDominantConfiguration: string;
+  dominantRelationBetweenArticulators: string;
+  nonDominantRelationBetweenArticulators: string;
+  configurationChanges: string;
+  location: string;
+  movementRelatedOrientation: string;
+  orientationRelatedToLocation: string;
+  orientationChange: string;
+  contactType: string;
+  movementType: string;
+  movementDirection: string;
   repeatedMovement: boolean;
   vocalization: string;
   nonManualComponent: string;
diff --git a/backend/src/typesense/typesense.service.ts b/backend/src/typesense/typesense.service.ts
index c87e904..8c21fa1 100644
--- a/backend/src/typesense/typesense.service.ts
+++ b/backend/src/typesense/typesense.service.ts
@@ -5,7 +5,6 @@ import { VIDEOS_COLLECTION_NAME, videosSchema } from './typesense.config';
 import { GlossIndex } from './types/gloss-index.type';
 import {
   GlossStatus,
-  Handedness,
   Prisma,
 } from '@prisma/client';
 import { compoundPartsInclude } from '../glosses/compound-include';
@@ -13,6 +12,10 @@ import {
   resolveCompoundSearchPhonology,
   resolveCompoundSearchVideoUrl,
 } from '../glosses/compound-phonology';
+import {
+  toSearchPhonology,
+  videoDataPhonologyInclude,
+} from '../phonology-values/phonology-video-data';
 
 const glossIndexInclude = {
   definitions: {
@@ -26,7 +29,7 @@ const glossIndexInclude = {
   glossVideos: {
     include: {
       videos: { orderBy: { priority: 'asc' as const } },
-      videoData: true,
+      videoData: { include: videoDataPhonologyInclude },
     },
     orderBy: { priority: 'asc' as const },
   },
@@ -154,23 +157,7 @@ export class TypesenseService implements OnModuleInit {
         lexicalCategory: primaryDefinition?.lexicalCategory ?? lexicalCategories[0] ?? '',
         lexicalCategories,
         description,
-        handedness: videoData?.handedness ?? Handedness.ONE,
-        dominantConfiguration: videoData?.dominantConfiguration ?? '',
-        nonDominantConfiguration: videoData?.nonDominantConfiguration ?? '',
-        dominantRelationBetweenArticulators: videoData?.dominantRelationBetweenArticulators ?? '',
-        nonDominantRelationBetweenArticulators: videoData?.nonDominantRelationBetweenArticulators ?? '',
-        configurationChanges: videoData?.configurationChanges ?? '',
-        location: videoData?.location ?? '',
-        movementRelatedOrientation: videoData?.movementRelatedOrientation ?? '',
-        orientationRelatedToLocation: videoData?.orientationRelatedToLocation ?? '',
-        orientationChange: videoData?.orientationChange ?? '',
-        contactType: videoData?.contactType ?? '',
-        movementType: videoData?.movementType ?? '',
-        movementDirection: videoData?.movementDirection ?? '',
-        vocalization: videoData?.vocalization ?? '',
-        nonManualComponent: videoData?.nonManualComponent ?? '',
-        inicialization: videoData?.inicialization ?? '',
-        repeatedMovement: videoData?.repeatedMovement ?? false,
+        ...toSearchPhonology(videoData),
       };
     }
 
@@ -192,23 +179,7 @@ export class TypesenseService implements OnModuleInit {
       lexicalCategory: primaryDefinition?.lexicalCategory ?? lexicalCategories[0] ?? '',
       lexicalCategories,
       description,
-      handedness: videoData?.handedness ?? Handedness.ONE,
-      dominantConfiguration: videoData?.dominantConfiguration ?? '',
-      nonDominantConfiguration: videoData?.nonDominantConfiguration ?? '',
-      dominantRelationBetweenArticulators: videoData?.dominantRelationBetweenArticulators ?? '',
-      nonDominantRelationBetweenArticulators: videoData?.nonDominantRelationBetweenArticulators ?? '',
-      configurationChanges: videoData?.configurationChanges ?? '',
-      location: videoData?.location ?? '',
-      movementRelatedOrientation: videoData?.movementRelatedOrientation ?? '',
-      orientationRelatedToLocation: videoData?.orientationRelatedToLocation ?? '',
-      orientationChange: videoData?.orientationChange ?? '',
-      contactType: videoData?.contactType ?? '',
-      movementType: videoData?.movementType ?? '',
-      movementDirection: videoData?.movementDirection ?? '',
-      vocalization: videoData?.vocalization ?? '',
-      nonManualComponent: videoData?.nonManualComponent ?? '',
-      inicialization: videoData?.inicialization ?? '',
-      repeatedMovement: videoData?.repeatedMovement ?? false,
+      ...toSearchPhonology(videoData),
     };
   }
 
diff --git a/frontend/quasar.config.ts b/frontend/quasar.config.ts
index a99d649..450af68 100644
--- a/frontend/quasar.config.ts
+++ b/frontend/quasar.config.ts
@@ -6,8 +6,6 @@ import { fileURLToPath } from 'node:url';
 
 export default defineConfig(() => {
   return {
-    sassVariables: 'src/css/quasar.variables.scss',
-
     // https://v2.quasar.dev/quasar-cli-vite/prefetch-feature
     // preFetch: true,
 
@@ -17,7 +15,8 @@ export default defineConfig(() => {
     boot: [
       'i18n',
       'axios',
-      'auth'
+      'auth',
+      'phonology-catalog'
     ],
 
 
@@ -130,17 +129,17 @@ export default defineConfig(() => {
     framework: {
       config: {
         brand: {
-          primary: '#B6463A',
-          secondary: '#EDE4D6',
-          accent: '#9C6B4A',
+          primary: '#c8102f',
+          secondary: '#FFFFFF',
+          accent: '#9C27B0',
 
-          dark: '#2F2A24',
-          'dark-page': '#1A1714',
+          dark: '#1d1d1d',
+          'dark-page': '#121212',
 
-          positive: '#3F7A52',
-          negative: '#B64A4A',
-          info: '#5B7C8C',
-          warning: '#B3832E'
+          positive: '#21BA45',
+          negative: '#8B0000',
+          info: '#31CCEC',
+          warning: '#F2C037'
         }
       },
       plugins: ['Notify', 'Dialog'],
diff --git a/frontend/src/boot/phonology-catalog.ts b/frontend/src/boot/phonology-catalog.ts
new file mode 100644
index 0000000..c3ebbe8
--- /dev/null
+++ b/frontend/src/boot/phonology-catalog.ts
@@ -0,0 +1,11 @@
+import { boot } from 'quasar/wrappers';
+import { usePhonologyCatalogStore } from 'src/stores/phonology-catalog.store';
+
+export default boot(async () => {
+  const catalog = usePhonologyCatalogStore();
+  try {
+    await catalog.ensureLoaded();
+  } catch (error) {
+    console.error('Failed to load phonology catalog', error);
+  }
+});
diff --git a/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue b/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
index d055939..40c799c 100644
--- a/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
+++ b/frontend/src/components/GlossDetail/components/CompoundPhonologyTable.vue
@@ -149,7 +149,7 @@ const phonologyRows = computed<{ id: string; label: string; getValue: RowGetter
       slot,
       'dominantConfiguration',
       'nonDominantConfiguration',
-      phonologyOptions.handConfigurationOptions,
+      phonologyOptions.handConfigurationOptions.value,
     ),
   },
   {
@@ -159,54 +159,54 @@ const phonologyRows = computed<{ id: string; label: string; getValue: RowGetter
       slot,
       'dominantRelationBetweenArticulators',
       'nonDominantRelationBetweenArticulators',
-      phonologyOptions.relationBetweenArticulatorsOptions,
+      phonologyOptions.relationBetweenArticulatorsOptions.value,
     ),
   },
   {
     id: 'location',
     label: translate('location'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.location, phonologyOptions.locationOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.location, phonologyOptions.locationOptions.value),
   },
   {
     id: 'configurationChanges',
     label: translate('configurationChanges'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.configurationChanges, phonologyOptions.configurationChangeOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.configurationChanges, phonologyOptions.configurationChangeOptions.value),
   },
   {
     id: 'movementRelatedOrientation',
     label: translate('movementRelatedOrientation'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.movementRelatedOrientation, phonologyOptions.movementRelatedOrientationOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.movementRelatedOrientation, phonologyOptions.movementRelatedOrientationOptions.value),
   },
   {
     id: 'orientationRelatedToLocation',
     label: translate('orientationRelatedToLocation'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.orientationRelatedToLocation, phonologyOptions.orientationRelatedToLocationOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.orientationRelatedToLocation, phonologyOptions.orientationRelatedToLocationOptions.value),
   },
   {
     id: 'orientationChange',
     label: translate('orientationChange'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.orientationChange, phonologyOptions.orientationChangeOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.orientationChange, phonologyOptions.orientationChangeOptions.value),
   },
   {
     id: 'contactType',
     label: translate('contactType'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.contactType, phonologyOptions.contactTypeOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.contactType, phonologyOptions.contactTypeOptions.value),
   },
   {
     id: 'movementType',
     label: translate('movementType'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.movementType, phonologyOptions.movementTypeOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.movementType, phonologyOptions.movementTypeOptions.value),
   },
   {
     id: 'movementDirection',
     label: translate('movementDirection'),
-    getValue: (slot) => formatSharedEnum(slot.phonology.movementDirection, phonologyOptions.movementDirectionOptions),
+    getValue: (slot) => formatSharedEnum(slot.phonology.movementDirection, phonologyOptions.movementDirectionOptions.value),
   },
 ]);
 
 function formatHandedness(handedness: string | undefined) {
   if (!handedness) return translate('notSet');
-  return getOptionLabel(phonologyOptions.handednessOptions, handedness);
+  return getOptionLabel(phonologyOptions.handednessOptions.value, handedness);
 }
 
 function formatSharedEnum(
diff --git a/frontend/src/components/GlossDetail/components/VideosComponent.vue b/frontend/src/components/GlossDetail/components/VideosComponent.vue
index 792dbc3..ce37a17 100644
--- a/frontend/src/components/GlossDetail/components/VideosComponent.vue
+++ b/frontend/src/components/GlossDetail/components/VideosComponent.vue
@@ -214,7 +214,7 @@ import EditableModule from 'src/components/Shared/EditableModule.vue';
 import { ref, watch, computed, onMounted } from 'vue';
 import { useQuasar } from 'quasar';
 import api from 'src/services/api';
-import { Handedness, HandConfiguration, ConfigurationChange, RelationBetweenArticulators, Location, MovementRelatedOrientation, OrientationRelatedToLocation, OrientationChange, ContactType, MovementType, MovementDirection } from 'src/types/enums';
+import { createDefaultPhonology } from 'src/utils/defaultPhonology';
 
 const glossData = defineModel<GlossData>({ required: true });
 const emit = defineEmits<{
@@ -357,24 +357,7 @@ const addVideo = () => {
       priority: 1,
     }],
     minimalPairs: [],
-    videoData: {
-      handedness: Handedness.ONE,
-      dominantConfiguration: HandConfiguration.CONF_1,
-      configurationChanges: ConfigurationChange.BENDING,
-      dominantRelationBetweenArticulators: RelationBetweenArticulators.ABOVE,
-      location: Location.NEUTRAL_SPACE,
-      movementRelatedOrientation: MovementRelatedOrientation.FRONT,
-      orientationRelatedToLocation: OrientationRelatedToLocation.AO_FINGERS_CONTRA,
-      orientationChange: OrientationChange.EXTENSION,
-      contactType: ContactType.CONTINUOUS,
-      movementType: MovementType.STRAIGHT,
-      movementDirection: MovementDirection.FORWARDS,
-      repeatedMovement: false,
-      vocalization: '',
-      nonManualComponent: '',
-      inicialization: '',
-      id: Date.now().toString(),
-    },
+    videoData: createDefaultPhonology(),
   };
 
   glossData.value.glossVideos.unshift(newVideo);
diff --git a/frontend/src/components/HeaderComponent.vue b/frontend/src/components/HeaderComponent.vue
index 84c3395..f3536e3 100644
--- a/frontend/src/components/HeaderComponent.vue
+++ b/frontend/src/components/HeaderComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <q-header
-    class="app-header"
+    class="bg-secondary text-black app-header"
     bordered
   >
     <loginComponent v-model="isLoginDialogOpen" />
@@ -11,7 +11,7 @@
       :width="280"
       bordered
       overlay
-      class="app-drawer"
+      class="bg-secondary"
     >
       <q-list padding>
         <q-item-label
@@ -97,6 +97,19 @@
             </q-item-section>
             <q-item-section>{{ translate('bulkImport') }}</q-item-section>
           </q-item>
+
+          <q-item
+            v-ripple
+            clickable
+            :active="isActive('/phonology-catalog')"
+            active-class="nav-item-active"
+            @click="navigateTo('/phonology-catalog')"
+          >
+            <q-item-section avatar>
+              <q-icon name="tune" />
+            </q-item-section>
+            <q-item-section>{{ translate('phonologyCatalog') }}</q-item-section>
+          </q-item>
         </template>
       </q-list>
 
@@ -197,12 +210,6 @@ const isActive = (path: string) => route.path === path || route.path.startsWith(
 </script>
 
 <style scoped>
-.app-header,
-.app-drawer {
-  background-color: var(--sb-surface-muted);
-  color: var(--sb-text-primary);
-}
-
 .app-header {
   min-height: 64px;
   box-shadow: none;
@@ -217,7 +224,7 @@ const isActive = (path: string) => route.path === path || route.path.startsWith(
 }
 
 .nav-item-active {
-  background: rgba(182, 70, 58, 0.1);
+  background: rgba(200, 16, 47, 0.08);
   color: var(--primary);
   font-weight: 500;
 }
diff --git a/frontend/src/components/Search/components/SearchPhonologyFilters.vue b/frontend/src/components/Search/components/SearchPhonologyFilters.vue
index 381c41c..6cd06f7 100644
--- a/frontend/src/components/Search/components/SearchPhonologyFilters.vue
+++ b/frontend/src/components/Search/components/SearchPhonologyFilters.vue
@@ -608,19 +608,50 @@ const localData = ref<FilterInputs>({ ...props.phonologyData });
 
 // Initialize filtered options with the original options
 const filteredOptions = ref({
-  handedness: phonologyOptions.handednessOptions,
-  dominantConfiguration: phonologyOptions.handConfigurationOptions,
-  configurationChanges: phonologyOptions.configurationChangeOptions,
-  dominantRelationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions,
-  location: phonologyOptions.locationOptions,
-  movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions,
-  orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions,
-  orientationChange: phonologyOptions.orientationChangeOptions,
-  contactType: phonologyOptions.contactTypeOptions,
-  movementType: phonologyOptions.movementTypeOptions,
-  movementDirection: phonologyOptions.movementDirectionOptions,
+  handedness: phonologyOptions.handednessOptions.value,
+  dominantConfiguration: phonologyOptions.handConfigurationOptions.value,
+  configurationChanges: phonologyOptions.configurationChangeOptions.value,
+  dominantRelationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions.value,
+  location: phonologyOptions.locationOptions.value,
+  movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions.value,
+  orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions.value,
+  orientationChange: phonologyOptions.orientationChangeOptions.value,
+  contactType: phonologyOptions.contactTypeOptions.value,
+  movementType: phonologyOptions.movementTypeOptions.value,
+  movementDirection: phonologyOptions.movementDirectionOptions.value,
 });
 
+watch(
+  () => [
+    phonologyOptions.handednessOptions.value,
+    phonologyOptions.handConfigurationOptions.value,
+    phonologyOptions.configurationChangeOptions.value,
+    phonologyOptions.relationBetweenArticulatorsOptions.value,
+    phonologyOptions.locationOptions.value,
+    phonologyOptions.movementRelatedOrientationOptions.value,
+    phonologyOptions.orientationRelatedToLocationOptions.value,
+    phonologyOptions.orientationChangeOptions.value,
+    phonologyOptions.contactTypeOptions.value,
+    phonologyOptions.movementTypeOptions.value,
+    phonologyOptions.movementDirectionOptions.value,
+  ],
+  () => {
+    filteredOptions.value = {
+      handedness: phonologyOptions.handednessOptions.value,
+      dominantConfiguration: phonologyOptions.handConfigurationOptions.value,
+      configurationChanges: phonologyOptions.configurationChangeOptions.value,
+      dominantRelationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions.value,
+      location: phonologyOptions.locationOptions.value,
+      movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions.value,
+      orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions.value,
+      orientationChange: phonologyOptions.orientationChangeOptions.value,
+      contactType: phonologyOptions.contactTypeOptions.value,
+      movementType: phonologyOptions.movementTypeOptions.value,
+      movementDirection: phonologyOptions.movementDirectionOptions.value,
+    };
+  },
+);
+
 // Keep local data in sync with prop changes
 watch(() => props.phonologyData, (newValue) => {
   localData.value = { ...newValue };
@@ -659,57 +690,57 @@ const updateField = (field: keyof FilterInputs, value: string | string[] | numbe
 };
 
 const getHandednessLabel = (handedness: string) => {
-  const option = phonologyOptions.handednessOptions.find(o => o.value === handedness);
+  const option = phonologyOptions.handednessOptions.value.find(o => o.value === handedness);
   return option ? option.label : '';
 };
 
 const getConfigurationLabel = (configuration: string) => {
-  const option = phonologyOptions.handConfigurationOptions.find(o => o.value === configuration);
+  const option = phonologyOptions.handConfigurationOptions.value.find(o => o.value === configuration);
   return option ? option.label : '';
 };
 
 const getConfigurationChangesLabel = (configurationChanges: string) => {
-  const option = phonologyOptions.configurationChangeOptions.find(o => o.value === configurationChanges);
+  const option = phonologyOptions.configurationChangeOptions.value.find(o => o.value === configurationChanges);
   return option ? option.label : '';
 };
 
 const getRelationBetweenArticulatorsLabel = (relationBetweenArticulators: string) => {
-  const option = phonologyOptions.relationBetweenArticulatorsOptions.find(o => o.value === relationBetweenArticulators);
+  const option = phonologyOptions.relationBetweenArticulatorsOptions.value.find(o => o.value === relationBetweenArticulators);
   return option ? option.label : '';
 };
 
 const getLocationLabel = (location: string) => {
-  const option = phonologyOptions.locationOptions.find(o => o.value === location);
+  const option = phonologyOptions.locationOptions.value.find(o => o.value === location);
   return option ? option.label : '';
 };
 
 const getMovementRelatedOrientationLabel = (movementRelatedOrientation: string) => {
-  const option = phonologyOptions.movementRelatedOrientationOptions.find(o => o.value === movementRelatedOrientation);
+  const option = phonologyOptions.movementRelatedOrientationOptions.value.find(o => o.value === movementRelatedOrientation);
   return option ? option.label : '';
 };
 
 const getOrientationRelatedToLocationLabel = (orientationRelatedToLocation: string) => {
-  const option = phonologyOptions.orientationRelatedToLocationOptions.find(o => o.value === orientationRelatedToLocation);
+  const option = phonologyOptions.orientationRelatedToLocationOptions.value.find(o => o.value === orientationRelatedToLocation);
   return option ? option.label : '';
 };
 
 const getOrientationChangeLabel = (orientationChange: string) => {
-  const option = phonologyOptions.orientationChangeOptions.find(o => o.value === orientationChange);
+  const option = phonologyOptions.orientationChangeOptions.value.find(o => o.value === orientationChange);
   return option ? option.label : '';
 };
 
 const getContactTypeLabel = (contactType: string) => {
-  const option = phonologyOptions.contactTypeOptions.find(o => o.value === contactType);
+  const option = phonologyOptions.contactTypeOptions.value.find(o => o.value === contactType);
   return option ? option.label : '';
 };
 
 const getMovementTypeLabel = (movementType: string) => {
-  const option = phonologyOptions.movementTypeOptions.find(o => o.value === movementType);
+  const option = phonologyOptions.movementTypeOptions.value.find(o => o.value === movementType);
   return option ? option.label : '';
 };
 
 const getMovementDirectionLabel = (movementDirection: string) => {
-  const option = phonologyOptions.movementDirectionOptions.find(o => o.value === movementDirection);
+  const option = phonologyOptions.movementDirectionOptions.value.find(o => o.value === movementDirection);
   return option ? option.label : '';
 };
 
diff --git a/frontend/src/components/Shared/PhonologyTable.vue b/frontend/src/components/Shared/PhonologyTable.vue
index e88490d..db9cac3 100644
--- a/frontend/src/components/Shared/PhonologyTable.vue
+++ b/frontend/src/components/Shared/PhonologyTable.vue
@@ -229,45 +229,74 @@ type SharedRowDef = {
   advanced?: boolean;
 };
 
-const sharedRowDefs: SharedRowDef[] = [
-  { field: 'configurationChanges', label: translate('configurationChanges'), type: 'select', optionsKey: 'configurationChanges', allOptions: phonologyOptions.configurationChangeOptions, advanced: true },
-  { field: 'location', label: translate('location'), type: 'select', optionsKey: 'location', allOptions: phonologyOptions.locationOptions },
-  { field: 'movementRelatedOrientation', label: translate('movementRelatedOrientation'), type: 'select', optionsKey: 'movementRelatedOrientation', allOptions: phonologyOptions.movementRelatedOrientationOptions, advanced: true },
-  { field: 'orientationRelatedToLocation', label: translate('orientationRelatedToLocation'), type: 'select', optionsKey: 'orientationRelatedToLocation', allOptions: phonologyOptions.orientationRelatedToLocationOptions, advanced: true },
-  { field: 'orientationChange', label: translate('orientationChange'), type: 'select', optionsKey: 'orientationChange', allOptions: phonologyOptions.orientationChangeOptions, advanced: true },
-  { field: 'contactType', label: translate('contactType'), type: 'select', optionsKey: 'contactType', allOptions: phonologyOptions.contactTypeOptions, advanced: true },
-  { field: 'movementType', label: translate('movementType'), type: 'select', optionsKey: 'movementType', allOptions: phonologyOptions.movementTypeOptions },
-  { field: 'movementDirection', label: translate('movementDirection'), type: 'select', optionsKey: 'movementDirection', allOptions: phonologyOptions.movementDirectionOptions, advanced: true },
+const sharedRowDefs = computed<SharedRowDef[]>(() => [
+  { field: 'configurationChanges', label: translate('configurationChanges'), type: 'select', optionsKey: 'configurationChanges', allOptions: phonologyOptions.configurationChangeOptions.value, advanced: true },
+  { field: 'location', label: translate('location'), type: 'select', optionsKey: 'location', allOptions: phonologyOptions.locationOptions.value },
+  { field: 'movementRelatedOrientation', label: translate('movementRelatedOrientation'), type: 'select', optionsKey: 'movementRelatedOrientation', allOptions: phonologyOptions.movementRelatedOrientationOptions.value, advanced: true },
+  { field: 'orientationRelatedToLocation', label: translate('orientationRelatedToLocation'), type: 'select', optionsKey: 'orientationRelatedToLocation', allOptions: phonologyOptions.orientationRelatedToLocationOptions.value, advanced: true },
+  { field: 'orientationChange', label: translate('orientationChange'), type: 'select', optionsKey: 'orientationChange', allOptions: phonologyOptions.orientationChangeOptions.value, advanced: true },
+  { field: 'contactType', label: translate('contactType'), type: 'select', optionsKey: 'contactType', allOptions: phonologyOptions.contactTypeOptions.value, advanced: true },
+  { field: 'movementType', label: translate('movementType'), type: 'select', optionsKey: 'movementType', allOptions: phonologyOptions.movementTypeOptions.value },
+  { field: 'movementDirection', label: translate('movementDirection'), type: 'select', optionsKey: 'movementDirection', allOptions: phonologyOptions.movementDirectionOptions.value, advanced: true },
   { field: 'vocalization', label: translate('vocalization'), type: 'text', advanced: true },
   { field: 'nonManualComponent', label: translate('nonManualComponent'), type: 'text', advanced: true },
   { field: 'inicialization', label: translate('inicialization'), type: 'text', advanced: true },
   { field: 'repeatedMovement', label: translate('repeatedMovement'), type: 'boolean', advanced: true },
-];
+]);
 
 const visibleSharedRows = computed(() => {
   if (props.compact && props.isEditable) {
-    return sharedRowDefs.filter(r => !r.advanced && r.field !== 'configurationChanges');
+    return sharedRowDefs.value.filter(r => !r.advanced && r.field !== 'configurationChanges');
   }
-  return sharedRowDefs.filter(r => !r.advanced || !props.compact);
+  return sharedRowDefs.value.filter(r => !r.advanced || !props.compact);
 });
 
 const advancedSharedRows = computed(() =>
-  sharedRowDefs.filter(r => r.advanced),
+  sharedRowDefs.value.filter(r => r.advanced),
 );
 
 const filteredOptions = ref({
-  configuration: phonologyOptions.handConfigurationOptions,
-  relationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions,
-  configurationChanges: phonologyOptions.configurationChangeOptions,
-  location: phonologyOptions.locationOptions,
-  movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions,
-  orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions,
-  orientationChange: phonologyOptions.orientationChangeOptions,
-  contactType: phonologyOptions.contactTypeOptions,
-  movementType: phonologyOptions.movementTypeOptions,
-  movementDirection: phonologyOptions.movementDirectionOptions,
+  configuration: phonologyOptions.handConfigurationOptions.value,
+  relationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions.value,
+  configurationChanges: phonologyOptions.configurationChangeOptions.value,
+  location: phonologyOptions.locationOptions.value,
+  movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions.value,
+  orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions.value,
+  orientationChange: phonologyOptions.orientationChangeOptions.value,
+  contactType: phonologyOptions.contactTypeOptions.value,
+  movementType: phonologyOptions.movementTypeOptions.value,
+  movementDirection: phonologyOptions.movementDirectionOptions.value,
 });
 
+watch(
+  () => [
+    phonologyOptions.handConfigurationOptions.value,
+    phonologyOptions.relationBetweenArticulatorsOptions.value,
+    phonologyOptions.configurationChangeOptions.value,
+    phonologyOptions.locationOptions.value,
+    phonologyOptions.movementRelatedOrientationOptions.value,
+    phonologyOptions.orientationRelatedToLocationOptions.value,
+    phonologyOptions.orientationChangeOptions.value,
+    phonologyOptions.contactTypeOptions.value,
+    phonologyOptions.movementTypeOptions.value,
+    phonologyOptions.movementDirectionOptions.value,
+  ],
+  () => {
+    filteredOptions.value = {
+      configuration: phonologyOptions.handConfigurationOptions.value,
+      relationBetweenArticulators: phonologyOptions.relationBetweenArticulatorsOptions.value,
+      configurationChanges: phonologyOptions.configurationChangeOptions.value,
+      location: phonologyOptions.locationOptions.value,
+      movementRelatedOrientation: phonologyOptions.movementRelatedOrientationOptions.value,
+      orientationRelatedToLocation: phonologyOptions.orientationRelatedToLocationOptions.value,
+      orientationChange: phonologyOptions.orientationChangeOptions.value,
+      contactType: phonologyOptions.contactTypeOptions.value,
+      movementType: phonologyOptions.movementTypeOptions.value,
+      movementDirection: phonologyOptions.movementDirectionOptions.value,
+    };
+  },
+);
+
 watch(() => props.phonologyData, (newValue) => {
   localData.value = { ...newValue };
 }, { deep: true });
@@ -293,11 +322,11 @@ function filterFn(
 }
 
 function getHandednessLabel(handedness: string) {
-  return getOptionLabel(phonologyOptions.handednessOptions, handedness);
+  return getOptionLabel(phonologyOptions.handednessOptions.value, handedness);
 }
 
 function getHandednessDescription(handedness: string) {
-  const option = phonologyOptions.handednessOptions.find(o => o.value === handedness);
+  const option = phonologyOptions.handednessOptions.value.find(o => o.value === handedness);
   return option?.description ?? '';
 }
 
diff --git a/frontend/src/css/app.css b/frontend/src/css/app.css
index 8ec5a64..0d74c93 100644
--- a/frontend/src/css/app.css
+++ b/frontend/src/css/app.css
@@ -1,22 +1,21 @@
-/* app global css — warm neutral palette (Option A) */
+/* app global css */
 :root {
-  --primary: #B6463A;
-  --primary-hover: #9E3C31;
+  --primary: #c8102f;
+  --primary-hover: #a50d26;
 
-  /* Strong warm contrast — clearly off-white, easy on the eyes */
-  --sb-bg: #D4C8B8;
-  --sb-surface: #EDE4D6;
-  --sb-surface-elevated: #F5EFE6;
-  --sb-surface-muted: #C4B8A8;
+  --sb-bg: #fafafa;
+  --sb-surface: #ffffff;
+  --sb-surface-elevated: #ffffff;
+  --sb-surface-muted: #f5f5f5;
 
-  --sb-text-primary: #2F2A24;
-  --sb-text-secondary: #6B6258;
+  --sb-text-primary: #1d1d1d;
+  --sb-text-secondary: #616161;
 
-  --sb-border: #C9BDB0;
+  --sb-border: rgba(0, 0, 0, 0.12);
 
-  --sb-positive: #3F7A52;
-  --sb-warning: #B3832E;
-  --sb-negative: #B64A4A;
+  --sb-positive: #21ba45;
+  --sb-warning: #f2c037;
+  --sb-negative: #8b0000;
 
   --sb-card-radius: 12px;
   --sb-transition: 0.2s ease;
@@ -25,18 +24,6 @@
   --sb-video-compact-max-height: 140px;
 }
 
-body.body--light {
-  --q-primary: #B6463A;
-  --q-secondary: #EDE4D6;
-  --q-accent: #9C6B4A;
-  --q-dark: #2F2A24;
-  --q-dark-page: #1A1714;
-  --q-positive: #3F7A52;
-  --q-negative: #B64A4A;
-  --q-info: #5B7C8C;
-  --q-warning: #B3832E;
-}
-
 @media (max-width: 1023px) {
   :root {
     --sb-video-max-width: 360px;
@@ -53,118 +40,11 @@ body.body--light {
   }
 }
 
-html,
-body,
-#q-app {
-  background-color: var(--sb-bg) !important;
-  color: var(--sb-text-primary);
-}
-
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
-.q-layout,
-.q-page-container,
-.q-page,
-.q-drawer__content {
-  background-color: var(--sb-bg) !important;
-  color: var(--sb-text-primary);
-}
-
-.q-header,
-.q-footer {
-  background-color: var(--sb-surface-muted) !important;
-  color: var(--sb-text-primary) !important;
-}
-
-.q-toolbar {
-  background-color: inherit !important;
-  color: inherit !important;
-}
-
-.q-card,
-.q-stepper,
-.q-list--bordered,
-.q-expansion-item__container,
-.q-menu .q-list {
-  background-color: var(--sb-surface) !important;
-  color: var(--sb-text-primary) !important;
-}
-
-.q-card--flat {
-  background-color: var(--sb-surface) !important;
-}
-
-.q-dialog .q-card,
-.q-select__dialog .q-card {
-  background-color: var(--sb-surface-elevated) !important;
-}
-
-.q-field--outlined .q-field__control,
-.q-field--filled .q-field__control {
-  background-color: var(--sb-surface-elevated) !important;
-}
-
-.q-field--outlined .q-field__control:before {
-  border-color: var(--sb-border) !important;
-}
-
-.q-separator {
-  background: var(--sb-border) !important;
-}
-
-.q-item {
-  color: var(--sb-text-primary);
-}
-
-.q-item__label--caption,
-.text-grey-7,
-.text-grey-8 {
-  color: var(--sb-text-secondary) !important;
-}
-
-.q-tab-panels,
-.q-tab-panel {
-  background: transparent !important;
-  color: var(--sb-text-primary);
-}
-
-.q-markup-table,
-.q-markup-table thead th,
-.q-table thead tr,
-.q-table tbody td {
-  background-color: var(--sb-surface) !important;
-  color: var(--sb-text-primary);
-}
-
-.q-banner {
-  background-color: var(--sb-surface-muted) !important;
-  color: var(--sb-text-primary) !important;
-}
-
-/* Remap Quasar grey utilities to warm neutrals */
-.bg-secondary,
-.bg-grey-1 {
-  background-color: var(--sb-surface-elevated) !important;
-}
-
-.bg-grey-2,
-.bg-grey-3 {
-  background-color: var(--sb-surface-muted) !important;
-}
-
-.q-hover\:bg-grey-1:hover,
-.q-item.q-hoverable:hover > .q-focus-helper,
-.q-item--clickable:hover {
-  background-color: rgba(182, 70, 58, 0.06) !important;
-}
-
-.q-btn--outline {
-  color: var(--primary) !important;
-}
-
 /* Consistent focus ring for keyboard navigation */
 :focus-visible {
   outline: 2px solid var(--primary);
@@ -178,16 +58,16 @@ body {
 }
 
 ::-webkit-scrollbar-track {
-  background: var(--sb-surface-muted);
+  background: #f5f5f5;
 }
 
 ::-webkit-scrollbar-thumb {
-  background: #B5A796;
+  background: #c4c4c4;
   border-radius: 4px;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: #9A8B7A;
+  background: #999;
 }
 
 /* Shared card hover effect */
@@ -198,10 +78,10 @@ body {
 
 .sb-card-interactive:hover {
   transform: translateY(-2px);
-  box-shadow: 0 4px 16px rgba(47, 42, 36, 0.12);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
 }
 
 .sb-card-interactive:focus-visible {
   transform: translateY(-2px);
-  box-shadow: 0 4px 16px rgba(47, 42, 36, 0.12);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
 }
diff --git a/frontend/src/css/quasar.variables.scss b/frontend/src/css/quasar.variables.scss
index 17ee8fb..d2ec82f 100644
--- a/frontend/src/css/quasar.variables.scss
+++ b/frontend/src/css/quasar.variables.scss
@@ -1,27 +1,13 @@
-// Warm neutral palette (Option A) — compiled into Quasar components
-$primary   : #B6463A;
-$secondary : #EDE4D6;
-$accent    : #9C6B4A;
+// Quasar SCSS variables — original SignBank brand
 
-$dark      : #2F2A24;
-$dark-page : #1A1714;
+$primary   : #c8102f;
+$secondary : #FFFFFF;
+$accent    : #9C27B0;
 
-$positive  : #3F7A52;
-$negative  : #B64A4A;
-$info      : #5B7C8C;
-$warning   : #B3832E;
+$dark      : #1d1d1d;
+$dark-page : #121212;
 
-$separator-color      : #B5A796;
-$separator-dark-color : #4A433C;
-
-// Warm grey scale (replaces cool Quasar greys in bg-grey-* utilities)
-$grey-1 : #F5EFE6;
-$grey-2 : #E5DDD2;
-$grey-3 : #D4C8B8;
-$grey-4 : #C4B8A8;
-$grey-5 : #A89888;
-$grey-6 : #8A7B6C;
-$grey-7 : #6B6258;
-$grey-8 : #4A433C;
-$grey-9 : #2F2A24;
-$grey-10: #1A1714;
+$positive  : #21BA45;
+$negative  : #8B0000;
+$info      : #31CCEC;
+$warning   : #F2C037;
diff --git a/frontend/src/i18n/ca-ES/index.ts b/frontend/src/i18n/ca-ES/index.ts
index d57425f..803713c 100644
--- a/frontend/src/i18n/ca-ES/index.ts
+++ b/frontend/src/i18n/ca-ES/index.ts
@@ -495,6 +495,47 @@ const translations: TranslateKeys = {
   bulkImportFailed: 'La importació ha fallat',
   bulkImportOverwriteOne: 'Sobreescriure',
   bulkImportOverwriteOneDone: 'Glossa sobreescrita',
+  phonologyCatalog: 'Catàleg de fonologia',
+  phonologyCatalogDescription: 'Afegiu, editeu o desactiveu els valors de fonologia sense una migració de base de dades.',
+  phonologyDimension: 'Dimensió',
+  phonologyCode: 'Codi',
+  phonologyLabelCa: 'Etiqueta (CA)',
+  phonologyLabelEn: 'Etiqueta (EN)',
+  phonologyLabelEs: 'Etiqueta (ES)',
+  phonologyDescription: 'Descripció',
+  phonologyAliases: 'Àlies',
+  phonologyActive: 'Actiu',
+  phonologyUsage: 'Ús',
+  phonologyAddValue: 'Afegir valor',
+  phonologyEditValue: 'Editar valor',
+  phonologyDeleteValue: 'Eliminar valor',
+  phonologyDeleteConfirm: 'Segur que voleu eliminar {code}?',
+  phonologyDeleteInUse: 'Aquest valor s\'està fent servir. Desactiveu-lo en lloc d\'eliminar-lo.',
+  phonologyDeleteInUseWarning: 'Aquest valor s\'usa en {count} signe(s). En eliminar-lo se n\'esborraran els camps. Escriviu {code} per confirmar.',
+  phonologyDeleteTypeCode: 'Escriviu el codi per confirmar',
+  phonologyCodeMismatch: 'El codi no coincideix',
+  phonologyDeleteFailed: 'No s\'ha pogut eliminar aquest valor',
+  phonologyValueCreated: 'Valor creat',
+  phonologyValueUpdated: 'Valor actualitzat',
+  phonologyValueDeleted: 'Valor eliminat',
+  phonologyCodeRequired: 'El codi és obligatori',
+  phonologyLabelRequired: 'L\'etiqueta en català és obligatòria',
+  phonologyCodeHint: 'Lletres, números i guió baix. Exemple: CONF_41',
+  phonologyCodeExists: 'Ja existeix un valor amb aquest codi en aquesta dimensió',
+  phonologyCodeInvalid: 'El codi ha de començar per lletra o dígit i només pot contenir A-Z, 0-9 i guió baix',
+  errorLoadingPhonologyCatalog: 'Error en carregar el catàleg de fonologia',
+  errorSavingPhonologyValue: 'No s\'ha pogut desar aquest valor',
+  phonologyDim_HANDEDNESS: 'Nombre de mans',
+  phonologyDim_HAND_CONFIGURATION: 'Configuració de la mà',
+  phonologyDim_CONFIGURATION_CHANGE: 'Canvi de configuració',
+  phonologyDim_RELATION_BETWEEN_ARTICULATORS: 'Relació entre articuladors',
+  phonologyDim_LOCATION: 'Localització',
+  phonologyDim_MOVEMENT_RELATED_ORIENTATION: 'Orientació relativa al moviment',
+  phonologyDim_ORIENTATION_RELATED_TO_LOCATION: 'Orientació relativa a la localització',
+  phonologyDim_ORIENTATION_CHANGE: 'Canvi d\'orientació',
+  phonologyDim_CONTACT_TYPE: 'Tipus de contacte',
+  phonologyDim_MOVEMENT_TYPE: 'Forma del moviment',
+  phonologyDim_MOVEMENT_DIRECTION: 'Direcció del moviment',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/en-US/index.ts b/frontend/src/i18n/en-US/index.ts
index d1b6d7d..888c504 100644
--- a/frontend/src/i18n/en-US/index.ts
+++ b/frontend/src/i18n/en-US/index.ts
@@ -412,6 +412,47 @@ const translations: TranslateKeys = {
   bulkImportFailed: 'Import failed',
   bulkImportOverwriteOne: 'Overwrite',
   bulkImportOverwriteOneDone: 'Gloss overwritten',
+  phonologyCatalog: 'Phonology catalog',
+  phonologyCatalogDescription: 'Add, edit or deactivate phonology values without a database migration.',
+  phonologyDimension: 'Dimension',
+  phonologyCode: 'Code',
+  phonologyLabelCa: 'Label (CA)',
+  phonologyLabelEn: 'Label (EN)',
+  phonologyLabelEs: 'Label (ES)',
+  phonologyDescription: 'Description',
+  phonologyAliases: 'Aliases',
+  phonologyActive: 'Active',
+  phonologyUsage: 'Usage',
+  phonologyAddValue: 'Add value',
+  phonologyEditValue: 'Edit value',
+  phonologyDeleteValue: 'Delete value',
+  phonologyDeleteConfirm: 'Delete {code}?',
+  phonologyDeleteInUse: 'This value is in use. Deactivate it instead of deleting it.',
+  phonologyDeleteInUseWarning: 'This value is used by {count} sign(s). Deleting it will clear those fields. Type {code} to confirm.',
+  phonologyDeleteTypeCode: 'Type the code to confirm',
+  phonologyCodeMismatch: 'The code does not match',
+  phonologyDeleteFailed: 'Could not delete this value',
+  phonologyValueCreated: 'Value created',
+  phonologyValueUpdated: 'Value updated',
+  phonologyValueDeleted: 'Value deleted',
+  phonologyCodeRequired: 'Code is required',
+  phonologyLabelRequired: 'Catalan label is required',
+  phonologyCodeHint: 'Letters, digits and underscore. Example: CONF_41',
+  phonologyCodeExists: 'A value with this code already exists in this dimension',
+  phonologyCodeInvalid: 'Code must start with a letter or digit and contain only A-Z, 0-9 and underscore',
+  errorLoadingPhonologyCatalog: 'Error loading phonology catalog',
+  errorSavingPhonologyValue: 'Could not save this value',
+  phonologyDim_HANDEDNESS: 'Handedness',
+  phonologyDim_HAND_CONFIGURATION: 'Hand configuration',
+  phonologyDim_CONFIGURATION_CHANGE: 'Configuration change',
+  phonologyDim_RELATION_BETWEEN_ARTICULATORS: 'Relation between articulators',
+  phonologyDim_LOCATION: 'Location',
+  phonologyDim_MOVEMENT_RELATED_ORIENTATION: 'Movement-related orientation',
+  phonologyDim_ORIENTATION_RELATED_TO_LOCATION: 'Orientation related to location',
+  phonologyDim_ORIENTATION_CHANGE: 'Orientation change',
+  phonologyDim_CONTACT_TYPE: 'Contact type',
+  phonologyDim_MOVEMENT_TYPE: 'Movement type',
+  phonologyDim_MOVEMENT_DIRECTION: 'Movement direction',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/es-ES/index.ts b/frontend/src/i18n/es-ES/index.ts
index 2c6dbc7..a44c000 100644
--- a/frontend/src/i18n/es-ES/index.ts
+++ b/frontend/src/i18n/es-ES/index.ts
@@ -427,6 +427,47 @@ const translations: TranslateKeys = {
   bulkImportFailed: 'La importación ha fallado',
   bulkImportOverwriteOne: 'Sobrescribir',
   bulkImportOverwriteOneDone: 'Glosa sobrescrita',
+  phonologyCatalog: 'Catálogo de fonología',
+  phonologyCatalogDescription: 'Añade, edita o desactiva valores de fonología sin una migración de base de datos.',
+  phonologyDimension: 'Dimensión',
+  phonologyCode: 'Código',
+  phonologyLabelCa: 'Etiqueta (CA)',
+  phonologyLabelEn: 'Etiqueta (EN)',
+  phonologyLabelEs: 'Etiqueta (ES)',
+  phonologyDescription: 'Descripción',
+  phonologyAliases: 'Alias',
+  phonologyActive: 'Activo',
+  phonologyUsage: 'Uso',
+  phonologyAddValue: 'Añadir valor',
+  phonologyEditValue: 'Editar valor',
+  phonologyDeleteValue: 'Eliminar valor',
+  phonologyDeleteConfirm: '¿Eliminar {code}?',
+  phonologyDeleteInUse: 'Este valor está en uso. Desactívalo en lugar de eliminarlo.',
+  phonologyDeleteInUseWarning: 'Este valor se usa en {count} signo(s). Al eliminarlo se vaciarán esos campos. Escribe {code} para confirmar.',
+  phonologyDeleteTypeCode: 'Escribe el código para confirmar',
+  phonologyCodeMismatch: 'El código no coincide',
+  phonologyDeleteFailed: 'No se ha podido eliminar este valor',
+  phonologyValueCreated: 'Valor creado',
+  phonologyValueUpdated: 'Valor actualizado',
+  phonologyValueDeleted: 'Valor eliminado',
+  phonologyCodeRequired: 'El código es obligatorio',
+  phonologyLabelRequired: 'La etiqueta en catalán es obligatoria',
+  phonologyCodeHint: 'Letras, números y guion bajo. Ejemplo: CONF_41',
+  phonologyCodeExists: 'Ya existe un valor con este código en esta dimensión',
+  phonologyCodeInvalid: 'El código debe empezar por letra o dígito y solo puede contener A-Z, 0-9 y guion bajo',
+  errorLoadingPhonologyCatalog: 'Error al cargar el catálogo de fonología',
+  errorSavingPhonologyValue: 'No se ha podido guardar este valor',
+  phonologyDim_HANDEDNESS: 'Número de manos',
+  phonologyDim_HAND_CONFIGURATION: 'Configuración de la mano',
+  phonologyDim_CONFIGURATION_CHANGE: 'Cambio de configuración',
+  phonologyDim_RELATION_BETWEEN_ARTICULATORS: 'Relación entre articuladores',
+  phonologyDim_LOCATION: 'Localización',
+  phonologyDim_MOVEMENT_RELATED_ORIENTATION: 'Orientación relativa al movimiento',
+  phonologyDim_ORIENTATION_RELATED_TO_LOCATION: 'Orientación relativa a la localización',
+  phonologyDim_ORIENTATION_CHANGE: 'Cambio de orientación',
+  phonologyDim_CONTACT_TYPE: 'Tipo de contacto',
+  phonologyDim_MOVEMENT_TYPE: 'Forma del movimiento',
+  phonologyDim_MOVEMENT_DIRECTION: 'Dirección del movimiento',
 };
 
 export default translations; 
\ No newline at end of file
diff --git a/frontend/src/i18n/translateKeys.ts b/frontend/src/i18n/translateKeys.ts
index 368a788..6d2d0dc 100644
--- a/frontend/src/i18n/translateKeys.ts
+++ b/frontend/src/i18n/translateKeys.ts
@@ -955,6 +955,47 @@ interface TranslateKeys extends PhonologyTranslateKeys {
   bulkImportFailed: string;
   bulkImportOverwriteOne: string;
   bulkImportOverwriteOneDone: string;
+  phonologyCatalog: string;
+  phonologyCatalogDescription: string;
+  phonologyDimension: string;
+  phonologyCode: string;
+  phonologyLabelCa: string;
+  phonologyLabelEn: string;
+  phonologyLabelEs: string;
+  phonologyDescription: string;
+  phonologyAliases: string;
+  phonologyActive: string;
+  phonologyUsage: string;
+  phonologyAddValue: string;
+  phonologyEditValue: string;
+  phonologyDeleteValue: string;
+  phonologyDeleteConfirm: string;
+  phonologyDeleteInUse: string;
+  phonologyDeleteInUseWarning: string;
+  phonologyDeleteTypeCode: string;
+  phonologyCodeMismatch: string;
+  phonologyDeleteFailed: string;
+  phonologyValueCreated: string;
+  phonologyValueUpdated: string;
+  phonologyValueDeleted: string;
+  phonologyCodeRequired: string;
+  phonologyLabelRequired: string;
+  phonologyCodeHint: string;
+  phonologyCodeExists: string;
+  phonologyCodeInvalid: string;
+  errorLoadingPhonologyCatalog: string;
+  errorSavingPhonologyValue: string;
+  phonologyDim_HANDEDNESS: string;
+  phonologyDim_HAND_CONFIGURATION: string;
+  phonologyDim_CONFIGURATION_CHANGE: string;
+  phonologyDim_RELATION_BETWEEN_ARTICULATORS: string;
+  phonologyDim_LOCATION: string;
+  phonologyDim_MOVEMENT_RELATED_ORIENTATION: string;
+  phonologyDim_ORIENTATION_RELATED_TO_LOCATION: string;
+  phonologyDim_ORIENTATION_CHANGE: string;
+  phonologyDim_CONTACT_TYPE: string;
+  phonologyDim_MOVEMENT_TYPE: string;
+  phonologyDim_MOVEMENT_DIRECTION: string;
 }
 
 export default TranslateKeys;
\ No newline at end of file
diff --git a/frontend/src/pages/PhonologyCatalogPage.vue b/frontend/src/pages/PhonologyCatalogPage.vue
new file mode 100644
index 0000000..872977d
--- /dev/null
+++ b/frontend/src/pages/PhonologyCatalogPage.vue
@@ -0,0 +1,482 @@
+<template>
+  <q-page class="q-pa-md">
+    <div class="row q-mb-md items-center justify-between">
+      <div>
+        <div class="text-h4">{{ translate('phonologyCatalog') }}</div>
+        <p class="text-body2 text-grey-7 q-mb-none q-mt-sm">
+          {{ translate('phonologyCatalogDescription') }}
+        </p>
+      </div>
+      <q-btn
+        color="primary"
+        icon="add"
+        :label="translate('phonologyAddValue')"
+        :disable="!selectedDimension"
+        @click="openCreate"
+      />
+    </div>
+
+    <div class="row q-col-gutter-md q-mb-md">
+      <div class="col-12 col-md-4">
+        <q-select
+          v-model="selectedDimension"
+          :options="dimensionOptions"
+          emit-value
+          map-options
+          outlined
+          dense
+          :label="translate('phonologyDimension')"
+        />
+      </div>
+      <div class="col-12 col-md-8">
+        <q-input
+          v-model="searchQuery"
+          outlined
+          dense
+          clearable
+          :label="translate('search')"
+        >
+          <template #prepend>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </div>
+    </div>
+
+    <q-table
+      :rows="filteredRows"
+      :columns="columns"
+      row-key="id"
+      :loading="loading"
+      flat
+      bordered
+      :pagination="{ rowsPerPage: 20 }"
+    >
+      <template #body-cell-active="props">
+        <q-td :props="props">
+          <q-toggle
+            :model-value="props.row.active"
+            color="primary"
+            @update:model-value="toggleActive(props.row, $event)"
+          />
+        </q-td>
+      </template>
+      <template #body-cell-aliases="props">
+        <q-td :props="props">
+          <span class="text-caption">{{ (props.row.aliases || []).join(', ') }}</span>
+        </q-td>
+      </template>
+      <template #body-cell-actions="props">
+        <q-td :props="props">
+          <q-btn
+            flat
+            dense
+            round
+            icon="edit"
+            @click="openEdit(props.row)"
+          />
+          <q-btn
+            flat
+            dense
+            round
+            icon="delete"
+            color="negative"
+            @click="openDelete(props.row)"
+          />
+        </q-td>
+      </template>
+    </q-table>
+
+    <q-dialog v-model="showDialog" persistent>
+      <q-card style="min-width: 480px; max-width: 640px">
+        <q-card-section class="text-h6">
+          {{ editing ? translate('phonologyEditValue') : translate('phonologyAddValue') }}
+        </q-card-section>
+        <q-card-section class="q-gutter-md">
+          <q-banner
+            v-if="formError"
+            class="bg-red-1 text-negative"
+            rounded
+          >
+            {{ formError }}
+          </q-banner>
+          <q-input
+            :model-value="form.code"
+            outlined
+            dense
+            :label="translate('phonologyCode')"
+            :hint="translate('phonologyCodeHint')"
+            :error="!!codeError"
+            :error-message="codeError"
+            @update:model-value="onCodeInput"
+          />
+          <q-input
+            v-model="form.labelCa"
+            outlined
+            dense
+            :label="translate('phonologyLabelCa')"
+            :error="!!labelError"
+            :error-message="labelError"
+          />
+          <q-input
+            v-model="form.labelEn"
+            outlined
+            dense
+            :label="translate('phonologyLabelEn')"
+          />
+          <q-input
+            v-model="form.labelEs"
+            outlined
+            dense
+            :label="translate('phonologyLabelEs')"
+          />
+          <q-input
+            v-model="form.descriptionCa"
+            outlined
+            dense
+            type="textarea"
+            autogrow
+            :label="translate('phonologyDescription')"
+          />
+          <q-select
+            v-model="form.aliases"
+            outlined
+            dense
+            multiple
+            use-chips
+            use-input
+            hide-dropdown-icon
+            new-value-mode="add-unique"
+            :label="translate('phonologyAliases')"
+          />
+        </q-card-section>
+        <q-card-actions align="right">
+          <q-btn
+            flat
+            :label="translate('cancel')"
+            @click="showDialog = false"
+          />
+          <q-btn
+            color="primary"
+            :label="translate('save')"
+            :loading="saving"
+            @click="saveValue"
+          />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+
+    <q-dialog v-model="showDeleteDialog" persistent>
+      <q-card style="min-width: 420px; max-width: 560px">
+        <q-card-section class="text-h6 text-negative">
+          {{ translate('phonologyDeleteValue') }}
+        </q-card-section>
+        <q-card-section>
+          <p class="q-mb-sm">
+            {{ translate('phonologyDeleteConfirm', { code: deletingRow?.code ?? '' }) }}
+          </p>
+          <q-banner
+            v-if="(deletingRow?.usageCount ?? 0) > 0"
+            class="bg-orange-1 text-orange-10 q-mb-md"
+            rounded
+          >
+            {{ translate('phonologyDeleteInUseWarning', {
+              code: deletingRow?.code ?? '',
+              count: deletingRow?.usageCount ?? 0,
+            }) }}
+          </q-banner>
+          <q-input
+            v-if="(deletingRow?.usageCount ?? 0) > 0"
+            v-model="deleteConfirmText"
+            outlined
+            dense
+            :label="translate('phonologyDeleteTypeCode')"
+            :error="!!deleteError"
+            :error-message="deleteError"
+          />
+        </q-card-section>
+        <q-card-actions align="right">
+          <q-btn
+            flat
+            :label="translate('cancel')"
+            :disable="deleting"
+            @click="closeDelete"
+          />
+          <q-btn
+            color="negative"
+            :label="translate('delete')"
+            :loading="deleting"
+            :disable="!canConfirmDelete"
+            @click="deleteValue"
+          />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+  </q-page>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref, watch } from 'vue';
+import { useQuasar } from 'quasar';
+import translate from 'src/utils/translate';
+import { api } from 'src/services/api';
+import { apiErrorMessage, isConflictError } from 'src/utils/apiError';
+import { usePhonologyCatalogStore } from 'src/stores/phonology-catalog.store';
+import {
+  PHONOLOGY_DIMENSIONS,
+  type PhonologyDimension,
+  type PhonologyValue,
+} from 'src/types/phonology-catalog';
+
+const CODE_PATTERN = /^[A-Z0-9][A-Z0-9_]*$/;
+
+function normalizeCode(code: string): string {
+  return code.trim().replace(/[\s-]+/g, '_').toUpperCase();
+}
+
+const $q = useQuasar();
+const catalog = usePhonologyCatalogStore();
+
+const loading = ref(false);
+const saving = ref(false);
+const deleting = ref(false);
+const rows = ref<PhonologyValue[]>([]);
+const selectedDimension = ref<PhonologyDimension>('HAND_CONFIGURATION');
+const searchQuery = ref('');
+const showDialog = ref(false);
+const showDeleteDialog = ref(false);
+const editing = ref<PhonologyValue | null>(null);
+const deletingRow = ref<PhonologyValue | null>(null);
+const formError = ref('');
+const codeError = ref('');
+const labelError = ref('');
+const deleteError = ref('');
+const deleteConfirmText = ref('');
+const form = ref({
+  code: '',
+  labelCa: '',
+  labelEn: '',
+  labelEs: '',
+  descriptionCa: '',
+  aliases: [] as string[],
+});
+
+const dimensionOptions = PHONOLOGY_DIMENSIONS.map((dimension) => ({
+  label: translate(`phonologyDim_${dimension}`),
+  value: dimension,
+}));
+
+const columns = [
+  { name: 'code', label: translate('phonologyCode'), field: 'code', align: 'left' as const, sortable: true },
+  { name: 'labelCa', label: translate('phonologyLabelCa'), field: 'labelCa', align: 'left' as const, sortable: true },
+  { name: 'aliases', label: translate('phonologyAliases'), field: 'aliases', align: 'left' as const },
+  { name: 'usageCount', label: translate('phonologyUsage'), field: 'usageCount', align: 'right' as const, sortable: true },
+  { name: 'active', label: translate('phonologyActive'), field: 'active', align: 'center' as const },
+  { name: 'actions', label: translate('actions'), field: 'actions', align: 'right' as const },
+];
+
+const filteredRows = computed(() => {
+  const query = searchQuery.value.trim().toLowerCase();
+  if (!query) return rows.value;
+  return rows.value.filter((row) =>
+    row.code.toLowerCase().includes(query)
+    || row.labelCa.toLowerCase().includes(query)
+    || (row.labelEn || '').toLowerCase().includes(query)
+    || (row.aliases || []).some((alias) => alias.toLowerCase().includes(query)),
+  );
+});
+
+async function loadRows() {
+  loading.value = true;
+  try {
+    const response = await api.phonologyValues.list({
+      dimension: selectedDimension.value,
+      includeInactive: true,
+      withUsage: true,
+    });
+    rows.value = response.data;
+  } catch (error) {
+    $q.notify({
+      type: 'negative',
+      message: apiErrorMessage(error, translate('errorLoadingPhonologyCatalog')),
+    });
+  } finally {
+    loading.value = false;
+  }
+}
+
+function resetForm() {
+  form.value = {
+    code: '',
+    labelCa: '',
+    labelEn: '',
+    labelEs: '',
+    descriptionCa: '',
+    aliases: [],
+  };
+  formError.value = '';
+  codeError.value = '';
+  labelError.value = '';
+}
+
+function onCodeInput(value: string | number | null) {
+  form.value.code = String(value ?? '').toUpperCase();
+  codeError.value = '';
+  formError.value = '';
+}
+
+function openCreate() {
+  editing.value = null;
+  resetForm();
+  showDialog.value = true;
+}
+
+function openEdit(row: PhonologyValue) {
+  editing.value = row;
+  form.value = {
+    code: row.code,
+    labelCa: row.labelCa,
+    labelEn: row.labelEn || '',
+    labelEs: row.labelEs || '',
+    descriptionCa: row.descriptionCa || '',
+    aliases: [...(row.aliases || [])],
+  };
+  formError.value = '';
+  codeError.value = '';
+  labelError.value = '';
+  showDialog.value = true;
+}
+
+function validateForm(): boolean {
+  codeError.value = '';
+  labelError.value = '';
+  formError.value = '';
+
+  const code = normalizeCode(form.value.code);
+  form.value.code = code;
+  if (!code) {
+    codeError.value = translate('phonologyCodeRequired');
+  } else if (!CODE_PATTERN.test(code)) {
+    codeError.value = translate('phonologyCodeInvalid');
+  } else {
+    const duplicate = rows.value.some(
+      (row) => row.code === code && row.id !== editing.value?.id,
+    );
+    if (duplicate) {
+      codeError.value = translate('phonologyCodeExists');
+    }
+  }
+
+  if (!form.value.labelCa.trim()) {
+    labelError.value = translate('phonologyLabelRequired');
+  }
+
+  return !codeError.value && !labelError.value;
+}
+
+async function saveValue() {
+  if (!validateForm()) return;
+
+  saving.value = true;
+  try {
+    if (editing.value) {
+      await api.phonologyValues.update(editing.value.id, {
+        code: form.value.code,
+        labelCa: form.value.labelCa,
+        labelEn: form.value.labelEn,
+        labelEs: form.value.labelEs,
+        descriptionCa: form.value.descriptionCa,
+        aliases: form.value.aliases,
+      });
+      $q.notify({ type: 'positive', message: translate('phonologyValueUpdated') });
+    } else {
+      await api.phonologyValues.create({
+        dimension: selectedDimension.value,
+        code: form.value.code,
+        labelCa: form.value.labelCa,
+        labelEn: form.value.labelEn,
+        labelEs: form.value.labelEs,
+        descriptionCa: form.value.descriptionCa,
+        aliases: form.value.aliases,
+      });
+      $q.notify({ type: 'positive', message: translate('phonologyValueCreated') });
+    }
+    showDialog.value = false;
+    await catalog.load(true);
+    await loadRows();
+  } catch (error) {
+    formError.value = isConflictError(error)
+      ? translate('phonologyCodeExists')
+      : apiErrorMessage(error, translate('errorSavingPhonologyValue'));
+  } finally {
+    saving.value = false;
+  }
+}
+
+async function toggleActive(row: PhonologyValue, active: boolean) {
+  try {
+    await api.phonologyValues.update(row.id, { active });
+    await catalog.load(true);
+    await loadRows();
+  } catch (error) {
+    $q.notify({
+      type: 'negative',
+      message: apiErrorMessage(error, translate('errorSavingPhonologyValue')),
+    });
+  }
+}
+
+const canConfirmDelete = computed(() => {
+  const row = deletingRow.value;
+  if (!row || deleting.value) return false;
+  if ((row.usageCount ?? 0) === 0) return true;
+  return normalizeCode(deleteConfirmText.value) === row.code;
+});
+
+function openDelete(row: PhonologyValue) {
+  deletingRow.value = row;
+  deleteConfirmText.value = '';
+  deleteError.value = '';
+  showDeleteDialog.value = true;
+}
+
+function closeDelete() {
+  showDeleteDialog.value = false;
+  deletingRow.value = null;
+  deleteConfirmText.value = '';
+  deleteError.value = '';
+}
+
+async function deleteValue() {
+  const row = deletingRow.value;
+  if (!row || !canConfirmDelete.value) {
+    deleteError.value = translate('phonologyCodeMismatch');
+    return;
+  }
+
+  deleting.value = true;
+  deleteError.value = '';
+  try {
+    await api.phonologyValues.remove(
+      row.id,
+      (row.usageCount ?? 0) > 0 ? { confirmCode: row.code } : undefined,
+    );
+    $q.notify({ type: 'positive', message: translate('phonologyValueDeleted') });
+    closeDelete();
+    await catalog.load(true);
+    await loadRows();
+  } catch (error) {
+    deleteError.value = apiErrorMessage(error, translate('phonologyDeleteFailed'));
+  } finally {
+    deleting.value = false;
+  }
+}
+
+watch(selectedDimension, () => {
+  void loadRows();
+});
+
+onMounted(() => {
+  void loadRows();
+});
+</script>
diff --git a/frontend/src/pages/SearchPage.vue b/frontend/src/pages/SearchPage.vue
index 4b71ab9..4d0adb0 100644
--- a/frontend/src/pages/SearchPage.vue
+++ b/frontend/src/pages/SearchPage.vue
@@ -278,16 +278,16 @@ onMounted(async () => {
 }
 
 .filters-container::-webkit-scrollbar-track {
-  background: var(--sb-surface-muted);
+  background: #f1f1f1;
 }
 
 .filters-container::-webkit-scrollbar-thumb {
-  background: #B5A796;
+  background: #888;
   border-radius: 3px;
 }
 
 .filters-container::-webkit-scrollbar-thumb:hover {
-  background: #9A8B7A;
+  background: #555;
 }
 
 /* Mobile responsive adjustments */
diff --git a/frontend/src/router/routes.ts b/frontend/src/router/routes.ts
index e9c5d08..7d9b150 100644
--- a/frontend/src/router/routes.ts
+++ b/frontend/src/router/routes.ts
@@ -48,6 +48,13 @@ const routes: RouteRecordRaw[] = [
       { path: '', component: () => import('pages/BulkImportPage.vue') },
     ],
   },
+  {
+    path: '/phonology-catalog',
+    component: () => import('layouts/MainLayout.vue'),
+    children: [
+      { path: '', component: () => import('pages/PhonologyCatalogPage.vue') },
+    ],
+  },
 
   // Always leave this as last one,
   // but you can also remove it
diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts
index 5006897..044b368 100644
--- a/frontend/src/services/api.ts
+++ b/frontend/src/services/api.ts
@@ -213,6 +213,16 @@ export const api = {
     changePassword: (userId: string, newPassword: string) =>
       apiClient.put(`/users/${userId}/password`, { newPassword }),
   },
+  phonologyValues: {
+    list: (params?: { dimension?: string; includeInactive?: boolean; withUsage?: boolean }) =>
+      apiClient.get('/phonology-values', { params }),
+    create: (data: Record<string, unknown>) =>
+      apiClient.post('/phonology-values', data),
+    update: (id: string, data: Record<string, unknown>) =>
+      apiClient.patch(`/phonology-values/${id}`, data),
+    remove: (id: string, params?: { confirmCode?: string }) =>
+      apiClient.delete(`/phonology-values/${id}`, { params }),
+  },
   bulkImport: {
     importFitxas: (files: File[], overwriteAll: boolean, overwriteGlosses: string[] = []) => {
       const formData = new FormData()
diff --git a/frontend/src/stores/phonology-catalog.store.ts b/frontend/src/stores/phonology-catalog.store.ts
new file mode 100644
index 0000000..079aa9e
--- /dev/null
+++ b/frontend/src/stores/phonology-catalog.store.ts
@@ -0,0 +1,78 @@
+import { defineStore } from 'pinia';
+import { ref } from 'vue';
+import { api } from 'src/services/api';
+import { i18n } from 'boot/i18n';
+import type { PhonologyDimension, PhonologySelectOption, PhonologyValue } from 'src/types/phonology-catalog';
+
+function currentLocale(): string {
+  const locale = i18n.global.locale;
+  return typeof locale === 'string' ? locale : locale.value;
+}
+
+function pickLocalized(
+  value: PhonologyValue,
+  kind: 'label' | 'description',
+): string {
+  const locale = currentLocale();
+  if (kind === 'label') {
+    if (locale.startsWith('en')) return value.labelEn || value.labelCa;
+    if (locale.startsWith('es')) return value.labelEs || value.labelCa;
+    return value.labelCa;
+  }
+  if (locale.startsWith('en')) return value.descriptionEn || value.descriptionCa || '';
+  if (locale.startsWith('es')) return value.descriptionEs || value.descriptionCa || '';
+  return value.descriptionCa || '';
+}
+
+export const usePhonologyCatalogStore = defineStore('phonologyCatalog', () => {
+  const values = ref<PhonologyValue[]>([]);
+  const loaded = ref(false);
+  const loading = ref(false);
+
+  async function load(force = false) {
+    if (loading.value) return;
+    if (loaded.value && !force) return;
+    loading.value = true;
+    try {
+      const response = await api.phonologyValues.list({ includeInactive: true });
+      values.value = response.data;
+      loaded.value = true;
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  async function ensureLoaded() {
+    if (!loaded.value) await load();
+  }
+
+  function optionsFor(dimension: PhonologyDimension, includeInactive = false): PhonologySelectOption[] {
+    return values.value
+      .filter((value) => value.dimension === dimension && (includeInactive || value.active))
+      .sort((a, b) => a.sortOrder - b.sortOrder || a.code.localeCompare(b.code))
+      .map((value) => {
+        const description = pickLocalized(value, 'description');
+        return {
+          value: value.code,
+          label: pickLocalized(value, 'label'),
+          ...(description ? { description } : {}),
+        };
+      });
+  }
+
+  function labelFor(dimension: PhonologyDimension, code: string | null | undefined): string {
+    if (!code) return '';
+    const match = values.value.find((value) => value.dimension === dimension && value.code === code);
+    return match ? pickLocalized(match, 'label') : code;
+  }
+
+  return {
+    values,
+    loaded,
+    loading,
+    load,
+    ensureLoaded,
+    optionsFor,
+    labelFor,
+  };
+});
diff --git a/frontend/src/types/api.ts b/frontend/src/types/api.ts
index 408fe3e..5f18b94 100644
--- a/frontend/src/types/api.ts
+++ b/frontend/src/types/api.ts
@@ -1,5 +1,4 @@
 import type { GlossData , Language, RequestStatus } from './models'
-import type { Handedness } from './enums'
 
 export type WordStatus = 'PUBLISHED' | 'DRAFT' | 'PENDING';
 
@@ -96,7 +95,7 @@ export interface UpdateVideoDto {
   url: string;
   priority?: number;
   videoData: {
-    handedness: Handedness;
+    handedness: string;
     dominantConfiguration: string;
     nonDominantConfiguration?: string;
     configurationChanges: string;
@@ -182,7 +181,7 @@ export interface GlossRequestDetailResponse extends GlossRequestResponse {
     url: string;
     priority: number;
     videoData: {
-      handedness: Handedness;
+      handedness: string;
       dominantConfiguration: string;
       nonDominantConfiguration?: string;
       configurationChanges: string;
diff --git a/frontend/src/types/models.ts b/frontend/src/types/models.ts
index d7e7669..c397c9c 100644
--- a/frontend/src/types/models.ts
+++ b/frontend/src/types/models.ts
@@ -1,17 +1,4 @@
 import type { RelatedGloss, MinimalPair } from "./gloss"
-import type { 
-  Handedness,
-  HandConfiguration,
-  ConfigurationChange,
-  RelationBetweenArticulators,
-  MovementRelatedOrientation,
-  OrientationRelatedToLocation,
-  OrientationChange,
-  ContactType,
-  MovementType,
-  Location,
-  MovementDirection,
-} from './enums';
 
 export type WordStatus = 'PUBLISHED' | 'DRAFT' | 'PENDING';
 
@@ -81,19 +68,19 @@ export interface Video {
 }
 
 export interface PhonologyData {
-  handedness: Handedness;
-  dominantConfiguration?: HandConfiguration | null;
-  nonDominantConfiguration?: HandConfiguration | null;
-  dominantRelationBetweenArticulators?: RelationBetweenArticulators | null;
-  nonDominantRelationBetweenArticulators?: RelationBetweenArticulators | null;
-  configurationChanges: ConfigurationChange;
-  location: Location;
-  movementRelatedOrientation: MovementRelatedOrientation;
-  orientationRelatedToLocation: OrientationRelatedToLocation;
-  orientationChange: OrientationChange;
-  contactType: ContactType;
-  movementType: MovementType;
-  movementDirection: MovementDirection;
+  handedness: string;
+  dominantConfiguration?: string | null;
+  nonDominantConfiguration?: string | null;
+  dominantRelationBetweenArticulators?: string | null;
+  nonDominantRelationBetweenArticulators?: string | null;
+  configurationChanges: string;
+  location: string;
+  movementRelatedOrientation: string;
+  orientationRelatedToLocation: string;
+  orientationChange: string;
+  contactType: string;
+  movementType: string;
+  movementDirection: string;
   vocalization: string;
   nonManualComponent: string;
   repeatedMovement: boolean;
diff --git a/frontend/src/types/phonology-catalog.ts b/frontend/src/types/phonology-catalog.ts
new file mode 100644
index 0000000..8557432
--- /dev/null
+++ b/frontend/src/types/phonology-catalog.ts
@@ -0,0 +1,62 @@
+export type PhonologyDimension =
+  | 'HANDEDNESS'
+  | 'HAND_CONFIGURATION'
+  | 'CONFIGURATION_CHANGE'
+  | 'RELATION_BETWEEN_ARTICULATORS'
+  | 'LOCATION'
+  | 'MOVEMENT_RELATED_ORIENTATION'
+  | 'ORIENTATION_RELATED_TO_LOCATION'
+  | 'ORIENTATION_CHANGE'
+  | 'CONTACT_TYPE'
+  | 'MOVEMENT_TYPE'
+  | 'MOVEMENT_DIRECTION';
+
+export const PHONOLOGY_DIMENSIONS: PhonologyDimension[] = [
+  'HANDEDNESS',
+  'HAND_CONFIGURATION',
+  'CONFIGURATION_CHANGE',
+  'RELATION_BETWEEN_ARTICULATORS',
+  'LOCATION',
+  'MOVEMENT_RELATED_ORIENTATION',
+  'ORIENTATION_RELATED_TO_LOCATION',
+  'ORIENTATION_CHANGE',
+  'CONTACT_TYPE',
+  'MOVEMENT_TYPE',
+  'MOVEMENT_DIRECTION',
+];
+
+export interface PhonologySelectOption {
+  value: string;
+  label: string;
+  description?: string;
+}
+
+export interface PhonologyValue {
+  id: string;
+  dimension: PhonologyDimension;
+  code: string;
+  labelCa: string;
+  labelEn?: string | null;
+  labelEs?: string | null;
+  descriptionCa?: string | null;
+  descriptionEn?: string | null;
+  descriptionEs?: string | null;
+  aliases: string[];
+  sortOrder: number;
+  active: boolean;
+  usageCount?: number;
+}
+
+export interface PhonologyValuePayload {
+  dimension?: PhonologyDimension;
+  code?: string;
+  labelCa?: string;
+  labelEn?: string;
+  labelEs?: string;
+  descriptionCa?: string;
+  descriptionEn?: string;
+  descriptionEs?: string;
+  aliases?: string[];
+  sortOrder?: number;
+  active?: boolean;
+}
diff --git a/frontend/src/utils/apiError.ts b/frontend/src/utils/apiError.ts
new file mode 100644
index 0000000..52bcb85
--- /dev/null
+++ b/frontend/src/utils/apiError.ts
@@ -0,0 +1,22 @@
+import { isAxiosError } from 'axios';
+
+export function apiErrorMessage(error: unknown, fallback: string): string {
+  if (isAxiosError(error)) {
+    const payload = error.response?.data as { message?: string | string[] } | undefined;
+    const message = payload?.message;
+    if (typeof message === 'string' && message.trim()) return message;
+    if (Array.isArray(message) && message.length > 0) {
+      return message.filter((item) => typeof item === 'string').join(', ');
+    }
+  }
+  if (error instanceof Error && error.message.trim()) return error.message;
+  return fallback;
+}
+
+export function isConflictError(error: unknown): boolean {
+  return isAxiosError(error) && error.response?.status === 409;
+}
+
+export function isBadRequestError(error: unknown): boolean {
+  return isAxiosError(error) && error.response?.status === 400;
+}
diff --git a/frontend/src/utils/defaultPhonology.ts b/frontend/src/utils/defaultPhonology.ts
index 5642a47..94e88ea 100644
--- a/frontend/src/utils/defaultPhonology.ts
+++ b/frontend/src/utils/defaultPhonology.ts
@@ -1,32 +1,19 @@
 import type { PhonologyData } from 'src/types/models';
-import {
-  Handedness,
-  HandConfiguration,
-  ConfigurationChange,
-  RelationBetweenArticulators,
-  Location,
-  MovementRelatedOrientation,
-  OrientationRelatedToLocation,
-  OrientationChange,
-  ContactType,
-  MovementType,
-  MovementDirection,
-} from 'src/types/enums';
 
 export function createDefaultPhonology(): PhonologyData {
   return {
     id: crypto.randomUUID(),
-    handedness: Handedness.ONE,
-    dominantConfiguration: HandConfiguration.CONF_1,
-    configurationChanges: ConfigurationChange.EMPTY,
-    dominantRelationBetweenArticulators: RelationBetweenArticulators.EMPTY,
-    location: Location.NEUTRAL_SPACE,
-    movementRelatedOrientation: MovementRelatedOrientation.EMPTY,
-    orientationRelatedToLocation: OrientationRelatedToLocation.EMPTY,
-    orientationChange: OrientationChange.EMPTY,
-    contactType: ContactType.EMPTY,
-    movementType: MovementType.EMPTY,
-    movementDirection: MovementDirection.EMPTY,
+    handedness: 'ONE',
+    dominantConfiguration: 'CONF_1',
+    configurationChanges: 'EMPTY',
+    dominantRelationBetweenArticulators: 'EMPTY',
+    location: 'NEUTRAL_SPACE',
+    movementRelatedOrientation: 'EMPTY',
+    orientationRelatedToLocation: 'EMPTY',
+    orientationChange: 'EMPTY',
+    contactType: 'EMPTY',
+    movementType: 'EMPTY',
+    movementDirection: 'EMPTY',
     repeatedMovement: false,
     vocalization: 'none',
     nonManualComponent: 'none',
diff --git a/frontend/src/utils/phonologyHelpers.ts b/frontend/src/utils/phonologyHelpers.ts
index 9ac4dfb..0e9eca3 100644
--- a/frontend/src/utils/phonologyHelpers.ts
+++ b/frontend/src/utils/phonologyHelpers.ts
@@ -1,9 +1,7 @@
-import { Handedness } from 'src/types/enums';
-
-export function isMultiHand(handedness: Handedness | string | null | undefined): boolean {
-  return handedness === Handedness.TWO_A
-    || handedness === Handedness.TWO_N
-    || handedness === Handedness.TWO_S;
+export function isMultiHand(handedness: string | null | undefined): boolean {
+  return handedness === 'TWO_A'
+    || handedness === 'TWO_N'
+    || handedness === 'TWO_S';
 }
 
 export type PhonologyDisplayMode = 'single' | 'merged' | 'split';
@@ -29,35 +27,35 @@ export function getPhonologyDisplayMode(
   return 'split';
 }
 
-export function mapFitxaHandednessCode(code: string): Handedness | null {
+export function mapFitxaHandednessCode(code: string): string | null {
   const normalized = String(code).trim().toLowerCase();
   switch (normalized) {
     case '1':
-      return Handedness.ONE;
+      return 'ONE';
     case '2a':
-      return Handedness.TWO_A;
+      return 'TWO_A';
     case '2n':
-      return Handedness.TWO_N;
+      return 'TWO_N';
     case '2s':
-      return Handedness.TWO_S;
+      return 'TWO_S';
     case 'x':
-      return Handedness.NA;
+      return 'NA';
     default:
       return null;
   }
 }
 
-export function handednessToFitxaCode(handedness: Handedness): string {
+export function handednessToFitxaCode(handedness: string): string {
   switch (handedness) {
-    case Handedness.ONE:
+    case 'ONE':
       return '1';
-    case Handedness.TWO_A:
+    case 'TWO_A':
       return '2a';
-    case Handedness.TWO_N:
+    case 'TWO_N':
       return '2n';
-    case Handedness.TWO_S:
+    case 'TWO_S':
       return '2s';
-    case Handedness.NA:
+    case 'NA':
       return 'x';
     default:
       return '1';
diff --git a/frontend/src/utils/phonologyOptions.ts b/frontend/src/utils/phonologyOptions.ts
index 14fea72..446a723 100644
--- a/frontend/src/utils/phonologyOptions.ts
+++ b/frontend/src/utils/phonologyOptions.ts
@@ -1,107 +1,37 @@
-import {
-  Handedness,
-  HandConfiguration,
-  ConfigurationChange,
-  RelationBetweenArticulators,
-  Location,
-  MovementRelatedOrientation,
-  OrientationRelatedToLocation,
-  OrientationChange,
-  ContactType,
-  MovementType,
-  MovementDirection,
-} from '../types/enums';
-import translate from './translate'
+import { computed } from 'vue';
+import { usePhonologyCatalogStore } from 'src/stores/phonology-catalog.store';
+import type { PhonologySelectOption } from 'src/types/phonology-catalog';
 
-interface SelectOption {
-  value: string;
-  label: string;
-  description?: string;
-}
+export type { PhonologySelectOption };
 
 export function usePhonologyOptions() {
-  const  t = (key: string) => translate(key);
-
-  const handednessOptions: SelectOption[] = Object.values(Handedness).map(value => ({
-    value,
-    label: t(`phonology.handedness.${value}`),
-    description: t(`phonology.handedness.${value}_description`),
-  }));
-
-  /** @deprecated Use handednessOptions */
-  const handOptions = handednessOptions;
-
-  const handConfigurationOptions: SelectOption[] = Object.values(HandConfiguration).map(value => ({
-    value,
-    label: t(`phonology.handConfiguration.${value}`),
-  }));
-
-  const configurationChangeOptions: SelectOption[] = Object.values(ConfigurationChange).map(value => ({
-    value,
-    label: t(`phonology.configurationChange.${value}`),
-    description: t(`phonology.configurationChange.${value}_description`),
-  }));
-
-  const relationBetweenArticulatorsOptions: SelectOption[] = Object.values(RelationBetweenArticulators).map(value => ({
-    value,
-    label: t(`phonology.relationBetweenArticulators.${value}`),
-  }));
-
-  const locationOptions: SelectOption[] = Object.values(Location).map(value => ({
-    value,
-    label: t(`phonology.location.${value}`),
-  }));
-
-  const movementRelatedOrientationOptions: SelectOption[] = Object.values(MovementRelatedOrientation).map(value => ({
-    value,
-    label: t(`phonology.movementRelatedOrientation.${value}`),
-  }));
-
-  const orientationRelatedToLocationOptions: SelectOption[] = Object.values(OrientationRelatedToLocation).map(value => ({
-    value,
-    label: t(`phonology.orientationRelatedToLocation.${value}`),
-  }));
-
-  const orientationChangeOptions: SelectOption[] = Object.values(OrientationChange).map(value => ({
-    value,
-    label: t(`phonology.orientationChange.${value}`),
-  }));
-
-  const contactTypeOptions: SelectOption[] = Object.values(ContactType).map(value => ({
-    value,
-    label: t(`phonology.contactType.${value}`),
-  }));
-
-  const movementTypeOptions: SelectOption[] = Object.values(MovementType).map(value => ({
-    value,
-    label: t(`phonology.movementType.${value}`),
-  }));
-
-  const movementDirectionOptions: SelectOption[] = Object.values(MovementDirection).map(value => ({
-    value,
-    label: t(`phonology.movementDirection.${value}`),
-  }));
+  const catalog = usePhonologyCatalogStore();
+  void catalog.ensureLoaded();
 
   return {
-    handednessOptions,
-    handOptions,
-    handConfigurationOptions,
-    configurationChangeOptions,
-    relationBetweenArticulatorsOptions,
-    locationOptions,
-    movementRelatedOrientationOptions,
-    orientationRelatedToLocationOptions,
-    orientationChangeOptions,
-    contactTypeOptions,
-    movementTypeOptions,
-    movementDirectionOptions,
+    handednessOptions: computed(() => catalog.optionsFor('HANDEDNESS')),
+    handOptions: computed(() => catalog.optionsFor('HANDEDNESS')),
+    handConfigurationOptions: computed(() => catalog.optionsFor('HAND_CONFIGURATION')),
+    configurationChangeOptions: computed(() => catalog.optionsFor('CONFIGURATION_CHANGE')),
+    relationBetweenArticulatorsOptions: computed(() =>
+      catalog.optionsFor('RELATION_BETWEEN_ARTICULATORS'),
+    ),
+    locationOptions: computed(() => catalog.optionsFor('LOCATION')),
+    movementRelatedOrientationOptions: computed(() =>
+      catalog.optionsFor('MOVEMENT_RELATED_ORIENTATION'),
+    ),
+    orientationRelatedToLocationOptions: computed(() =>
+      catalog.optionsFor('ORIENTATION_RELATED_TO_LOCATION'),
+    ),
+    orientationChangeOptions: computed(() => catalog.optionsFor('ORIENTATION_CHANGE')),
+    contactTypeOptions: computed(() => catalog.optionsFor('CONTACT_TYPE')),
+    movementTypeOptions: computed(() => catalog.optionsFor('MOVEMENT_TYPE')),
+    movementDirectionOptions: computed(() => catalog.optionsFor('MOVEMENT_DIRECTION')),
   };
 }
 
-export type PhonologySelectOption = SelectOption;
-
-export function getOptionLabel(options: SelectOption[], value: string | null | undefined): string {
+export function getOptionLabel(options: PhonologySelectOption[], value: string | null | undefined): string {
   if (!value) return '';
-  const option = options.find(o => o.value === value);
+  const option = options.find((item) => item.value === value);
   return option ? option.label : value;
 }

From 581068bcd6eb8f113c2f4044ae0556d73cd97661 Mon Sep 17 00:00:00 2001
From: RamonDonadeu <ramondonadeucaballero@gmail.com>
Date: Sat, 29 Aug 2026 11:50:55 +0200
Subject: [PATCH 17/17] Require login and improve gloss detail tabs.

Move phonology into the main tab bar, hide empty tabs in view mode, and gate all pages behind mandatory authentication.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../GlossDetail/components/MainContent.vue    | 54 ++++++++++-
 .../components/PhonologyTabPanel.vue          | 82 ++++++++++++++++
 .../components/SignFonologyComponent.vue      |  6 +-
 .../GlossDetail/components/SignVideoAside.vue | 23 +++--
 .../components/SignVideosBrowseView.vue       | 62 +-----------
 frontend/src/components/HeaderComponent.vue   | 13 +--
 frontend/src/components/loginComponent.vue    | 11 ++-
 frontend/src/layouts/MainLayout.vue           | 27 +++++-
 frontend/src/router/routes.ts                 |  7 +-
 frontend/src/utils/glossTabVisibility.ts      | 95 +++++++++++++++++++
 10 files changed, 294 insertions(+), 86 deletions(-)
 create mode 100644 frontend/src/components/GlossDetail/components/PhonologyTabPanel.vue
 create mode 100644 frontend/src/utils/glossTabVisibility.ts

diff --git a/frontend/src/components/GlossDetail/components/MainContent.vue b/frontend/src/components/GlossDetail/components/MainContent.vue
index 617c8a5..a7102b9 100644
--- a/frontend/src/components/GlossDetail/components/MainContent.vue
+++ b/frontend/src/components/GlossDetail/components/MainContent.vue
@@ -20,6 +20,7 @@
             :gloss-data="glossData"
             :is-compound="isCompound"
             @show-all-videos="showAllVideos = true"
+            @show-phonology="selectedTab = 'phonology'"
             @show-compound-phonology="openCompoundPhonology"
           />
         </div>
@@ -29,6 +30,7 @@
           :class="{ 'gloss-content-column--full': !showSidebar }"
         >
           <q-tabs
+            v-if="visibleTabs.length > 0"
             v-model="selectedTab"
             class="gloss-content-tabs text-primary q-mb-sm"
             active-color="primary"
@@ -40,19 +42,27 @@
             mobile-arrows
           >
             <q-tab
+              v-if="showDefinitionsTab"
               name="definitions"
               :label="translate('definitions')"
             />
             <q-tab
-              v-if="isCompound"
+              v-if="showCompoundTab"
               name="compound"
               :label="translate('compound')"
             />
             <q-tab
+              v-if="showPhonologyTab"
+              name="phonology"
+              :label="translate('signFonology')"
+            />
+            <q-tab
+              v-if="showExamplesTab"
               name="examples"
               :label="translate('examples')"
             />
             <q-tab
+              v-if="showRelatedTab"
               name="related"
               :label="translate('relatedGlosses')"
             />
@@ -60,11 +70,13 @@
 
           <div class="gloss-content-scroll">
             <q-tab-panels
+              v-if="visibleTabs.length > 0"
               v-model="selectedTab"
               animated
               class="gloss-tab-panels"
             >
               <q-tab-panel
+                v-if="showDefinitionsTab"
                 name="definitions"
                 class="q-pa-none"
               >
@@ -79,7 +91,7 @@
               </q-tab-panel>
 
               <q-tab-panel
-                v-if="isCompound"
+                v-if="showCompoundTab"
                 name="compound"
                 class="q-pa-none"
               >
@@ -90,6 +102,15 @@
               </q-tab-panel>
 
               <q-tab-panel
+                v-if="showPhonologyTab"
+                name="phonology"
+                class="q-pa-none"
+              >
+                <PhonologyTabPanel :gloss-data="glossData" />
+              </q-tab-panel>
+
+              <q-tab-panel
+                v-if="showExamplesTab"
                 name="examples"
                 class="q-pa-none"
               >
@@ -102,6 +123,7 @@
               </q-tab-panel>
 
               <q-tab-panel
+                v-if="showRelatedTab"
                 name="related"
                 class="q-pa-none"
               >
@@ -122,7 +144,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { GlossData } from 'src/types/models'
 import SignVideoAside from './SignVideoAside.vue'
 import SignVideosBrowseView from './SignVideosBrowseView.vue'
@@ -130,19 +152,43 @@ import DefinitionsComponent from './DefinitionsComponent/DefinitionsComponent.vu
 import ExamplesComponent from './ExamplesComponent/ExamplesComponent.vue'
 import RelatedGlosses from './RelatedGlosses.vue'
 import CompoundComponent from './CompoundComponent.vue'
+import PhonologyTabPanel from './PhonologyTabPanel.vue'
 import translate from 'src/utils/translate'
 import { isCompoundGloss } from 'src/utils/compoundPhonology'
+import {
+  getVisibleGlossTabs,
+  type GlossContentTab,
+} from 'src/utils/glossTabVisibility'
 
 const { glossData } = defineProps<{
   glossData: GlossData
 }>()
 
+const editMode = false
+
 const isCompound = computed(() => isCompoundGloss(glossData))
 
-const selectedTab = ref('definitions')
+const selectedTab = ref<GlossContentTab>('definitions')
 const showAllVideos = ref(false)
 const showCompoundPhonology = ref(false)
 
+const visibleTabs = computed(() => getVisibleGlossTabs(glossData, {
+  editMode,
+  isCompound: isCompound.value,
+}))
+
+const showDefinitionsTab = computed(() => visibleTabs.value.includes('definitions'))
+const showCompoundTab = computed(() => visibleTabs.value.includes('compound'))
+const showPhonologyTab = computed(() => visibleTabs.value.includes('phonology'))
+const showExamplesTab = computed(() => visibleTabs.value.includes('examples'))
+const showRelatedTab = computed(() => visibleTabs.value.includes('related'))
+
+watch(visibleTabs, (tabs) => {
+  if (!tabs.includes(selectedTab.value)) {
+    selectedTab.value = tabs[0] ?? 'definitions'
+  }
+}, { immediate: true })
+
 function openCompoundPhonology() {
   selectedTab.value = 'compound'
   showCompoundPhonology.value = true
diff --git a/frontend/src/components/GlossDetail/components/PhonologyTabPanel.vue b/frontend/src/components/GlossDetail/components/PhonologyTabPanel.vue
new file mode 100644
index 0000000..6ee44b9
--- /dev/null
+++ b/frontend/src/components/GlossDetail/components/PhonologyTabPanel.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="phonology-tab-panel q-pa-md">
+    <div
+      v-if="hasMultipleVideos"
+      class="phonology-tab-panel__selector q-mb-md"
+    >
+      <q-select
+        v-model="selectedVideoId"
+        :options="videoOptions"
+        :label="translate('videos')"
+        outlined
+        dense
+        emit-value
+        map-options
+        options-dense
+        class="phonology-tab-panel__select"
+      />
+    </div>
+
+    <SignFonologyComponent
+      v-if="selectedVideo?.videoData"
+      :video-data="selectedVideo.videoData"
+      :edit-mode="false"
+      natural-height
+      hide-title
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+import type { GlossData } from 'src/types/models';
+import SignFonologyComponent from './SignFonologyComponent.vue';
+import translate from 'src/utils/translate';
+import { getPrimarySignVideo } from 'src/utils/glossTabVisibility';
+
+const { glossData } = defineProps<{
+  glossData: GlossData;
+}>();
+
+const sortedVideos = computed(() =>
+  [...(glossData.glossVideos || [])].sort(
+    (a, b) => (a.priority || 0) - (b.priority || 0),
+  ),
+);
+
+const hasMultipleVideos = computed(() => sortedVideos.value.length > 1);
+
+const selectedVideoId = ref<string | null>(null);
+
+const videoOptions = computed(() =>
+  sortedVideos.value
+    .filter((video) => video.id)
+    .map((video) => ({
+      label: video.title || translate('videos'),
+      value: video.id as string,
+    })),
+);
+
+const selectedVideo = computed(() =>
+  sortedVideos.value.find((video) => video.id === selectedVideoId.value) ?? null,
+);
+
+watch(
+  sortedVideos,
+  (videos) => {
+    const primary = getPrimarySignVideo(glossData);
+    const nextId = primary?.id ?? videos[0]?.id ?? null;
+
+    if (!videos.some((video) => video.id === selectedVideoId.value)) {
+      selectedVideoId.value = nextId;
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<style scoped>
+.phonology-tab-panel__select {
+  max-width: 360px;
+}
+</style>
diff --git a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
index a07a5d0..f638fc5 100644
--- a/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
+++ b/frontend/src/components/GlossDetail/components/SignFonologyComponent.vue
@@ -3,7 +3,10 @@
     class="sign-phonology"
     :class="{ 'sign-phonology--natural-height': naturalHeight }"
   >
-    <div class="text-subtitle2 text-weight-medium sign-phonology__title">
+    <div
+      v-if="!hideTitle"
+      class="text-subtitle2 text-weight-medium sign-phonology__title"
+    >
       {{ translate('signFonology') }}
     </div>
     <PhonologyTable
@@ -26,6 +29,7 @@ defineProps<{
   editMode: boolean;
   compact?: boolean;
   naturalHeight?: boolean;
+  hideTitle?: boolean;
 }>();
 
 defineEmits<{
diff --git a/frontend/src/components/GlossDetail/components/SignVideoAside.vue b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
index cc2e880..0e222ad 100644
--- a/frontend/src/components/GlossDetail/components/SignVideoAside.vue
+++ b/frontend/src/components/GlossDetail/components/SignVideoAside.vue
@@ -51,15 +51,22 @@ const { glossData, isCompound = false } = defineProps<{
 
 const emit = defineEmits<{
   (e: 'showAllVideos'): void
+  (e: 'showPhonology'): void
   (e: 'showCompoundPhonology'): void
 }>()
 
 function onDetailsClick() {
-  if (isCompound && !hasMultipleSignVideos.value) {
+  if (hasMultipleSignVideos.value) {
+    emit('showAllVideos')
+    return
+  }
+
+  if (isCompound) {
     emit('showCompoundPhonology')
     return
   }
-  emit('showAllVideos')
+
+  emit('showPhonology')
 }
 
 const primarySignVideo = computed(() => {
@@ -74,15 +81,19 @@ const hasGlossTranslations = computed(() =>
   (glossData.glossTranslations?.length ?? 0) > 0
 )
 
-const showDetailsButton = computed(() =>
-  Boolean(primarySignVideo.value) && (glossData.glossVideos?.length ?? 0) > 0
-)
-
 const detailsButtonLabel = computed(() =>
   hasMultipleSignVideos.value
     ? translate('seeOtherVideos')
     : translate('signFonology')
 )
+
+const showDetailsButton = computed(() => {
+  if (hasMultipleSignVideos.value) {
+    return (glossData.glossVideos?.length ?? 0) > 1
+  }
+
+  return Boolean(primarySignVideo.value)
+})
 </script>
 
 <style scoped>
diff --git a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
index 8ffad1b..782ed68 100644
--- a/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
+++ b/frontend/src/components/GlossDetail/components/SignVideosBrowseView.vue
@@ -19,7 +19,6 @@
 
     <div class="sign-videos-browse__main">
       <aside class="sign-videos-browse__videos">
-        <!-- Single video: show player only -->
         <template v-if="!hasMultipleVideos && selectedVideo">
           <div
             v-if="selectedVideo.title"
@@ -69,16 +68,6 @@
           </button>
         </div>
       </aside>
-
-      <section
-        v-if="selectedVideo?.videoData"
-        class="sign-videos-browse__phonology"
-      >
-        <SignFonologyComponent
-          :video-data="selectedVideo.videoData"
-          :edit-mode="false"
-        />
-      </section>
     </div>
   </div>
 </template>
@@ -87,7 +76,6 @@
 import { computed, ref, watch } from 'vue'
 import { GlossData } from 'src/types/models'
 import GlossVideoComponent from './GlossVideoComponent.vue'
-import SignFonologyComponent from './SignFonologyComponent.vue'
 import translate from 'src/utils/translate'
 
 const { glossData } = defineProps<{
@@ -177,13 +165,12 @@ function selectVideo(videoId: string | undefined) {
   display: flex;
   flex: 1 1 0;
   min-height: 0;
-  gap: 20px;
   overflow: hidden;
 }
 
 .sign-videos-browse__videos {
-  flex: 0 0 34%;
-  max-width: 380px;
+  flex: 1 1 0;
+  max-width: none;
   min-width: 0;
   display: flex;
   flex-direction: column;
@@ -244,46 +231,6 @@ function selectVideo(videoId: string | undefined) {
   overflow: hidden;
 }
 
-.sign-videos-browse__phonology {
-  flex: 1 1 0;
-  min-width: 0;
-  min-height: 0;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  border: 1px solid rgba(0, 0, 0, 0.12);
-  border-radius: var(--sb-card-radius, 12px);
-  padding: 16px 20px;
-  background: var(--sb-surface);
-}
-
-.sign-videos-browse__phonology :deep(.sign-phonology) {
-  flex: 1 1 0;
-  min-height: 0;
-  margin-top: 0;
-}
-
-.sign-videos-browse__phonology :deep(.text-subtitle2) {
-  font-size: 1.05rem;
-}
-
-.sign-videos-browse__phonology :deep(.phonology-table__grid) {
-  font-size: 0.95rem;
-}
-
-.sign-videos-browse__phonology :deep(.phonology-table__grid .text-caption) {
-  font-size: 0.8rem;
-}
-
-.sign-videos-browse__phonology :deep(.phonology-table__grid .text-body2),
-.sign-videos-browse__phonology :deep(.phonology-table__grid td),
-.sign-videos-browse__phonology :deep(.phonology-table__grid th) {
-  font-size: 0.95rem;
-  white-space: normal;
-  word-break: break-word;
-  padding: 10px 8px;
-}
-
 .sign-videos-browse__picker-item--active .sign-videos-browse__picker-video {
   overflow: hidden;
 }
@@ -316,10 +263,5 @@ function selectVideo(videoId: string | undefined) {
     flex: 0 0 min(280px, 72vw);
     width: min(280px, 72vw);
   }
-
-  .sign-videos-browse__phonology {
-    flex: 1 1 auto;
-    min-height: 50vh;
-  }
 }
 </style>
diff --git a/frontend/src/components/HeaderComponent.vue b/frontend/src/components/HeaderComponent.vue
index f3536e3..fd1eccb 100644
--- a/frontend/src/components/HeaderComponent.vue
+++ b/frontend/src/components/HeaderComponent.vue
@@ -3,8 +3,6 @@
     class="bg-secondary text-black app-header"
     bordered
   >
-    <loginComponent v-model="isLoginDialogOpen" />
-
     <q-drawer
       v-model="isSidebarOpen"
       side="right"
@@ -120,7 +118,7 @@
           v-ripple
           clickable
           class="rounded-borders"
-          @click="openLogin"
+          @click="openLoginDialog"
         >
           <q-item-section avatar>
             <q-icon
@@ -184,25 +182,24 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { inject, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import loginComponent from '../components/loginComponent.vue'
 import useUser from 'src/stores/user.store'
 import translate from 'src/utils/translate'
 
 const userStore = useUser()
 const route = useRoute()
 const router = useRouter()
-const isLoginDialogOpen = ref(false)
 const isSidebarOpen = ref(false)
+const openLogin = inject<() => void>('openLogin', () => {})
 
 const navigateTo = (path: string) => {
   router.push(path)
   isSidebarOpen.value = false
 }
 
-const openLogin = () => {
-  isLoginDialogOpen.value = true
+const openLoginDialog = () => {
+  openLogin()
   isSidebarOpen.value = false
 }
 
diff --git a/frontend/src/components/loginComponent.vue b/frontend/src/components/loginComponent.vue
index 8df2ef9..8f9687c 100644
--- a/frontend/src/components/loginComponent.vue
+++ b/frontend/src/components/loginComponent.vue
@@ -1,7 +1,7 @@
 <template>
   <q-dialog
     v-model="isOpen"
-    persistent
+    :persistent="mandatory"
   >
     <q-card class="login-card">
       <q-card-section class="row items-center q-pb-none">
@@ -10,6 +10,7 @@
         </div>
         <q-space />
         <q-btn
+          v-if="!mandatory"
           v-close-popup
           icon="close"
           flat
@@ -93,8 +94,12 @@ import translate from '../utils/translate'
 const props = defineProps({
   modelValue: {
     type: Boolean,
-    required: true
-  }
+    required: true,
+  },
+  mandatory: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['update:modelValue'])
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 187be82..c61bb7d 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -2,13 +2,38 @@
   <q-layout view="lfh Lpr lFf">
     <HeaderComponent />
     <q-page-container class="page-container">
-      <router-view />
+      <router-view v-if="userStore.isLoggedIn" />
     </q-page-container>
+    <loginComponent
+      :model-value="showLoginDialog"
+      :mandatory="!userStore.isLoggedIn"
+      @update:model-value="onLoginDialogUpdate"
+    />
   </q-layout>
 </template>
 
 <script setup lang="ts">
+import { computed, provide, ref } from 'vue';
 import HeaderComponent from 'components/HeaderComponent.vue';
+import loginComponent from 'components/loginComponent.vue';
+import useUser from 'src/stores/user.store';
+
+const userStore = useUser();
+const isLoginDialogOpen = ref(false);
+
+const showLoginDialog = computed(() => !userStore.isLoggedIn || isLoginDialogOpen.value);
+
+function openLogin() {
+  isLoginDialogOpen.value = true;
+}
+
+function onLoginDialogUpdate(value: boolean) {
+  if (userStore.isLoggedIn) {
+    isLoginDialogOpen.value = value;
+  }
+}
+
+provide('openLogin', openLogin);
 </script>
 
 <style scoped>
diff --git a/frontend/src/router/routes.ts b/frontend/src/router/routes.ts
index 7d9b150..e8c63fb 100644
--- a/frontend/src/router/routes.ts
+++ b/frontend/src/router/routes.ts
@@ -56,11 +56,12 @@ const routes: RouteRecordRaw[] = [
     ],
   },
 
-  // Always leave this as last one,
-  // but you can also remove it
   {
     path: '/:catchAll(.*)*',
-    component: () => import('pages/ErrorNotFound.vue'),
+    component: () => import('layouts/MainLayout.vue'),
+    children: [
+      { path: '', component: () => import('pages/ErrorNotFound.vue') },
+    ],
   },
 ];
 
diff --git a/frontend/src/utils/glossTabVisibility.ts b/frontend/src/utils/glossTabVisibility.ts
new file mode 100644
index 0000000..9ffdfdc
--- /dev/null
+++ b/frontend/src/utils/glossTabVisibility.ts
@@ -0,0 +1,95 @@
+import type { GlossData, PhonologyData, SignVideo } from 'src/types/models';
+import { sortedCompoundParts } from 'src/utils/compoundPhonology';
+import { isPhonologyValueEmpty } from 'src/utils/phonologyHelpers';
+
+const PHONOLOGY_STRING_FIELDS: (keyof PhonologyData)[] = [
+  'handedness',
+  'dominantConfiguration',
+  'nonDominantConfiguration',
+  'dominantRelationBetweenArticulators',
+  'nonDominantRelationBetweenArticulators',
+  'configurationChanges',
+  'location',
+  'movementRelatedOrientation',
+  'orientationRelatedToLocation',
+  'orientationChange',
+  'contactType',
+  'movementType',
+  'movementDirection',
+  'vocalization',
+  'nonManualComponent',
+  'inicialization',
+];
+
+function isEmptyPhonologyString(value: string | null | undefined): boolean {
+  if (isPhonologyValueEmpty(value)) return true;
+  return value === 'EMPTY' || value === 'none';
+}
+
+export function hasPhonologyContent(data: PhonologyData | null | undefined): boolean {
+  if (!data) return false;
+
+  const hasStringValue = PHONOLOGY_STRING_FIELDS.some(
+    (field) => !isEmptyPhonologyString(data[field] as string | null | undefined),
+  );
+
+  return hasStringValue || data.repeatedMovement === true;
+}
+
+export function getPrimarySignVideo(glossData: GlossData): SignVideo | null {
+  const videos = glossData.glossVideos || [];
+  if (!videos.length) return null;
+  return [...videos].sort((a, b) => a.priority - b.priority)[0] ?? null;
+}
+
+export function hasDefinitionsContent(glossData: GlossData): boolean {
+  return (glossData.definitions?.length ?? 0) > 0;
+}
+
+export function hasExamplesContent(glossData: GlossData): boolean {
+  return (glossData.examples?.length ?? 0) > 0;
+}
+
+export function hasRelatedContent(glossData: GlossData): boolean {
+  return (glossData.relationsAsSource?.length ?? 0) > 0
+    || (glossData.minimalPairsAsSource?.length ?? 0) > 0;
+}
+
+export function hasCompoundContent(glossData: GlossData): boolean {
+  return sortedCompoundParts(glossData).length > 0;
+}
+
+export function hasSignPhonologyContent(glossData: GlossData): boolean {
+  return (glossData.glossVideos || []).some((video) => hasPhonologyContent(video.videoData));
+}
+
+export type GlossContentTab = 'definitions' | 'compound' | 'phonology' | 'examples' | 'related';
+
+export function getVisibleGlossTabs(
+  glossData: GlossData,
+  options: { editMode: boolean; isCompound: boolean },
+): GlossContentTab[] {
+  const tabs: GlossContentTab[] = [];
+
+  if (options.editMode || hasDefinitionsContent(glossData)) {
+    tabs.push('definitions');
+  }
+
+  if (options.isCompound && (options.editMode || hasCompoundContent(glossData))) {
+    tabs.push('compound');
+  }
+
+  if (options.editMode || hasSignPhonologyContent(glossData)) {
+    tabs.push('phonology');
+  }
+
+  if (options.editMode || hasExamplesContent(glossData)) {
+    tabs.push('examples');
+  }
+
+  if (options.editMode || hasRelatedContent(glossData)) {
+    tabs.push('related');
+  }
+
+  return tabs;
+}