diff --git a/blender_manifest.toml b/blender_manifest.toml
index 4a45665..e724648 100644
--- a/blender_manifest.toml
+++ b/blender_manifest.toml
@@ -3,7 +3,7 @@
 schema_version = "1.0.0"
 
 id = "avatar_toolkit"
-version = "0.1.0"
+version = "0.1.1"
 name = "Avatar Toolkit"
 tagline = "A modern tool for importing and optimizing models for VRChat, Resonite, and other similar games."
 maintainer = "Team NekoNeo"
diff --git a/core/common.py b/core/common.py
index d6696b3..c232856 100644
--- a/core/common.py
+++ b/core/common.py
@@ -6,10 +6,12 @@
 import typing
 import struct
 from io import BytesIO
+import numpy.typing as npt
 
-from typing import Optional, Tuple, List, Set, Dict, Any, Generator, Callable
-from mathutils import Vector
-from bpy.types import Context, Object, Modifier, EditBone, Operator
+from typing import Optional, Tuple, List, Set, Dict, Any, Generator, Callable, Union, Type
+from mathutils import Vector, Matrix
+from bpy.types import (Context, Object, Modifier, EditBone, Operator, 
+                      VertexGroup, ShapeKey, Bone, Mesh, Armature, PropertyGroup)
 from functools import lru_cache
 from bpy.props import PointerProperty, IntProperty, StringProperty
 from bpy.utils import register_class
@@ -20,11 +22,11 @@
 class ProgressTracker:
     """Universal progress tracking for Avatar Toolkit operations"""
     
-    def __init__(self, context: Context, total_steps: int, operation_name: str = "Operation"):
-        self.context = context
-        self.total = total_steps
-        self.current = 0
-        self.operation_name = operation_name
+    def __init__(self, context: Context, total_steps: int, operation_name: str = "Operation") -> None:
+        self.context: Context = context
+        self.total: int = total_steps
+        self.current: int = 0
+        self.operation_name: str = operation_name
         self.wm = context.window_manager
         
     def step(self, message: str = "") -> None:
@@ -35,26 +37,28 @@ def step(self, message: str = "") -> None:
         self.wm.progress_update(progress * 100)
         logger.debug(f"{self.operation_name} - {progress:.1%}: {message}")
         
-    def __enter__(self):
+    def __enter__(self) -> 'ProgressTracker':
         logger.info(f"Starting {self.operation_name}")
         return self
         
-    def __exit__(self, exc_type, exc_val, exc_tb):
+    def __exit__(self, exc_type: Optional[Type[BaseException]], 
+                 exc_val: Optional[BaseException], 
+                 exc_tb: Optional[Any]) -> None:
         self.wm.progress_end()
         logger.info(f"Completed {self.operation_name}")
 
-def get_active_armature(context: bpy.types.Context) -> Optional[bpy.types.Object]:
+def get_active_armature(context: Context) -> Optional[Object]:
     """Get the currently selected armature from Avatar Toolkit properties"""
-    armature_name = context.scene.avatar_toolkit.active_armature
+    armature_name = str(context.scene.avatar_toolkit.active_armature)
     if armature_name and armature_name != 'NONE':
         return bpy.data.objects.get(armature_name)
     return None
 
-def set_active_armature(context: bpy.types.Context, armature: bpy.types.Object) -> None:
+def set_active_armature(context: Context, armature: Object) -> None:
     """Set the active armature for Avatar Toolkit operations"""
     context.scene.avatar_toolkit.active_armature = armature
 
-def get_armature_list(self=None, context: bpy.types.Context = None) -> List[Tuple[str, str, str]]:
+def get_armature_list(self: Optional[Any] = None, context: Optional[Context] = None) -> List[Tuple[str, str, str]]:
     """Get list of all armature objects in the scene"""
     if context is None:
         context = bpy.context
@@ -63,25 +67,21 @@ def get_armature_list(self=None, context: bpy.types.Context = None) -> List[Tupl
         return [('NONE', t("Armature.validation.no_armature"), '')]
     return armatures
 
-def validate_armature(armature: bpy.types.Object) -> Tuple[bool, List[str]]:
+def validate_armature(armature: Object) -> Tuple[bool, List[str]]:
     """Enhanced armature validation with multiple validation modes"""
     validation_mode = bpy.context.scene.avatar_toolkit.validation_mode
+    messages: List[str] = []
     
-    # Skip validation if mode is NONE
     if validation_mode == 'NONE':
         return True, []
         
-    messages = []
-    
-    # Basic checks always run if not NONE
     if not armature or armature.type != 'ARMATURE' or not armature.data.bones:
         return False, [t("Armature.validation.basic_check_failed")]
         
-    found_bones = {bone.name.lower(): bone for bone in armature.data.bones}
+    found_bones: Dict[str, Bone] = {bone.name.lower(): bone for bone in armature.data.bones}
+    essential_bones: Set[str] = {'hips', 'spine', 'chest', 'neck', 'head'}
     
-    # Essential bones check (BASIC and STRICT)
-    essential_bones = {'hips', 'spine', 'chest', 'neck', 'head'}
-    missing_bones = []
+    missing_bones: List[str] = []
     for bone in essential_bones:
         if not any(alt_name in found_bones for alt_name in bone_names[bone]):
             missing_bones.append(bone)
@@ -89,41 +89,38 @@ def validate_armature(armature: bpy.types.Object) -> Tuple[bool, List[str]]:
     if missing_bones:
         messages.append(t("Armature.validation.missing_bones", bones=", ".join(missing_bones)))
     
-    # Additional checks for STRICT mode only
     if validation_mode == 'STRICT':
-        # Hierarchy validation
-        hierarchy = [('hips', 'spine'), ('spine', 'chest'), ('chest', 'neck'), ('neck', 'head')]
+        hierarchy: List[Tuple[str, str]] = [
+            ('hips', 'spine'), ('spine', 'chest'), 
+            ('chest', 'neck'), ('neck', 'head')
+        ]
         for parent, child in hierarchy:
             if not validate_bone_hierarchy(found_bones, parent, child):
-                messages.append(t("Armature.validation.invalid_hierarchy", parent=parent, child=child))
+                messages.append(t("Armature.validation.invalid_hierarchy", 
+                                parent=parent, child=child))
         
-        # Symmetry validation
-        symmetry_pairs = [('arm', 'l', 'r'), ('leg', 'l', 'r')]
+        symmetry_pairs: List[Tuple[str, str, str]] = [('arm', 'l', 'r'), ('leg', 'l', 'r')]
         for base, left, right in symmetry_pairs:
             if not validate_symmetry(found_bones, base, left, right):
                 messages.append(t("Armature.validation.asymmetric_bones", bone=base))
                 
-        # Special handling for hand/wrist symmetry
         if (not validate_symmetry(found_bones, 'hand', 'l', 'r') and 
             not validate_symmetry(found_bones, 'wrist', 'l', 'r')):
             messages.append(t("Armature.validation.asymmetric_hand_wrist"))
     
-    is_valid = len(messages) == 0
+    is_valid: bool = len(messages) == 0
     return is_valid, messages
 
-def validate_bone_hierarchy(bones: Dict[str, bpy.types.Bone], parent_name: str, child_name: str) -> bool:
+def validate_bone_hierarchy(bones: Dict[str, Bone], parent_name: str, child_name: str) -> bool:
     """Validate if there is a valid parent-child relationship between bones"""
-    # Find matching parent and child bones using bone_names dictionary
-    parent_bone = None
-    child_bone = None
+    parent_bone: Optional[Bone] = None
+    child_bone: Optional[Bone] = None
     
-    # Check for parent bone matches
     for alt_name in bone_names[parent_name]:
         if alt_name in bones:
             parent_bone = bones[alt_name]
             break
             
-    # Check for child bone matches
     for alt_name in bone_names[child_name]:
         if alt_name in bones:
             child_bone = bones[alt_name]
@@ -132,47 +129,42 @@ def validate_bone_hierarchy(bones: Dict[str, bpy.types.Bone], parent_name: str,
     if not parent_bone or not child_bone:
         return False
         
-    # Check if child's parent matches parent bone
     return child_bone.parent == parent_bone
 
-def validate_symmetry(bones: Dict[str, bpy.types.Bone], base: str, left: str, right: str) -> bool:
-    """
-    Validate if matching left and right bones exist for a given base bone name
-    """
-    # Define common naming patterns
-    left_patterns = [
+def validate_symmetry(bones: Dict[str, Bone], base: str, left: str, right: str) -> bool:
+    """Validate if matching left and right bones exist for a given base bone name"""
+    left_patterns: List[str] = [
         f"{base}.{left}",
         f"{base}_{left}",
         f"{left}_{base}"
     ]
     
-    right_patterns = [
+    right_patterns: List[str] = [
         f"{base}.{right}",
         f"{base}_{right}", 
         f"{right}_{base}"
     ]
     
-    # Check if any of the patterns exist in the bones dictionary
-    left_exists = any(pattern in bones for pattern in left_patterns)
-    right_exists = any(pattern in bones for pattern in right_patterns)
+    left_exists: bool = any(pattern in bones for pattern in left_patterns)
+    right_exists: bool = any(pattern in bones for pattern in right_patterns)
     
     return left_exists and right_exists
   
-def auto_select_single_armature(context: bpy.types.Context) -> None:
+def auto_select_single_armature(context: Context) -> None:
     """Automatically select armature if only one exists in scene"""
-    armatures = get_armature_list(context)
+    armatures: List[Tuple[str, str, str]] = get_armature_list(context)
     if len(armatures) == 1 and armatures[0][0] != 'NONE':
         toolkit = context.scene.avatar_toolkit
         set_active_armature(context, armatures[0])
 
 def clear_default_objects() -> None:
-    """Removes default Blender objects (cube, light, camera)"""
+    """Removes default Blender objects"""
     default_names: Set[str] = {'Cube', 'Light', 'Camera'}
     for obj in bpy.data.objects:
         if obj.name.split('.')[0] in default_names:
             bpy.data.objects.remove(obj, do_unlink=True)
 
-def get_armature_stats(armature: bpy.types.Object) -> dict:
+def get_armature_stats(armature: Object) -> Dict[str, Union[int, bool, str]]:
     """Get statistics about the armature"""
     return {
         'bone_count': len(armature.data.bones),
@@ -183,7 +175,7 @@ def get_armature_stats(armature: bpy.types.Object) -> dict:
 
 def get_all_meshes(context: Context) -> List[Object]:
     """Get all mesh objects parented to the active armature"""
-    armature = get_active_armature(context)
+    armature: Optional[Object] = get_active_armature(context)
     if armature:
         return [obj for obj in bpy.data.objects if obj.type == 'MESH' and obj.parent == armature]
     return []
@@ -196,26 +188,26 @@ def validate_mesh_for_pose(mesh_obj: Object) -> Tuple[bool, str]:
     if not mesh_obj.vertex_groups:
         return False, t("Mesh.validation.no_vertex_groups")
         
-    armature_mods = [mod for mod in mesh_obj.modifiers if mod.type == 'ARMATURE']
+    armature_mods: List[Modifier] = [mod for mod in mesh_obj.modifiers if mod.type == 'ARMATURE']
     if not armature_mods:
         return False, t("Mesh.validation.no_armature_modifier")
     
     return True, t("Mesh.validation.valid")
 
-def cache_vertex_positions(mesh_obj: Object) -> np.ndarray:
+def cache_vertex_positions(mesh_obj: Object) -> npt.NDArray[np.float32]:
     """Cache vertex positions for a mesh object"""
     vertices = mesh_obj.data.vertices
-    positions = np.empty(len(vertices) * 3, dtype=np.float32)
+    positions: npt.NDArray[np.float32] = np.empty(len(vertices) * 3, dtype=np.float32)
     vertices.foreach_get('co', positions)
     return positions.reshape(-1, 3)
 
-def apply_vertex_positions(vertices: Object, positions: np.ndarray) -> None:
+def apply_vertex_positions(vertices: Object, positions: npt.NDArray[np.float32]) -> None:
     """Apply cached vertex positions to mesh in batch"""
     vertices.foreach_set('co', positions.flatten())
 
 def process_armature_modifiers(mesh_obj: Object) -> List[Dict[str, Any]]:
     """Process and store armature modifier states"""
-    modifier_states = []
+    modifier_states: List[Dict[str, Any]] = []
     for mod in mesh_obj.modifiers:
         if mod.type == 'ARMATURE':
             modifier_states.append({
@@ -252,10 +244,10 @@ def apply_pose_as_rest(context: Context, armature_obj: Object, meshes: List[Obje
     except Exception as e:
         logger.error(f"Error applying pose as rest: {str(e)}")
         return False, str(e)
-
+    
 def apply_armature_to_mesh(armature_obj: Object, mesh_obj: Object) -> None:
     """Apply armature deformation to mesh"""
-    armature_mod = mesh_obj.modifiers.new('PoseToRest', 'ARMATURE')
+    armature_mod: Modifier = mesh_obj.modifiers.new('PoseToRest', 'ARMATURE')
     armature_mod.object = armature_obj
     
     if bpy.app.version >= (3, 5):
@@ -269,13 +261,13 @@ def apply_armature_to_mesh(armature_obj: Object, mesh_obj: Object) -> None:
 
 def apply_armature_to_mesh_with_shapekeys(armature_obj: Object, mesh_obj: Object, context: Context) -> None:
     """Apply armature deformation to mesh with shape keys"""
-    old_active_index = mesh_obj.active_shape_key_index
-    old_show_only = mesh_obj.show_only_shape_key
+    old_active_index: int = mesh_obj.active_shape_key_index
+    old_show_only: bool = mesh_obj.show_only_shape_key
     mesh_obj.show_only_shape_key = True
     
-    shape_keys = mesh_obj.data.shape_keys.key_blocks
-    vertex_groups = []
-    mutes = []
+    shape_keys: List[ShapeKey] = mesh_obj.data.shape_keys.key_blocks
+    vertex_groups: List[str] = []
+    mutes: List[bool] = []
     
     for sk in shape_keys:
         vertex_groups.append(sk.vertex_group)
@@ -283,17 +275,17 @@ def apply_armature_to_mesh_with_shapekeys(armature_obj: Object, mesh_obj: Object
         mutes.append(sk.mute)
         sk.mute = False
 
-    disabled_mods = []
+    disabled_mods: List[Modifier] = []
     for mod in mesh_obj.modifiers:
         if mod.show_viewport:
             mod.show_viewport = False
             disabled_mods.append(mod)
 
-    arm_mod = mesh_obj.modifiers.new('PoseToRest', 'ARMATURE')
+    arm_mod: Modifier = mesh_obj.modifiers.new('PoseToRest', 'ARMATURE')
     arm_mod.object = armature_obj
     
-    co_length = len(mesh_obj.data.vertices) * 3
-    eval_cos = np.empty(co_length, dtype=np.single)
+    co_length: int = len(mesh_obj.data.vertices) * 3
+    eval_cos: npt.NDArray[np.float32] = np.empty(co_length, dtype=np.single)
     
     for i, shape_key in enumerate(shape_keys):
         mesh_obj.active_shape_key_index = i
@@ -331,6 +323,11 @@ def validate_meshes(meshes: List[Object]) -> Tuple[bool, str]:
 def join_mesh_objects(context: Context, meshes: List[Object], progress: Optional[ProgressTracker] = None) -> Optional[Object]:
     """Combines multiple mesh objects into a single mesh with proper cleanup and UV fixing"""
     try:
+        # Store UV maps before joining
+        uv_maps_data = {}
+        for mesh in meshes:
+            uv_maps_data[mesh.name] = {uv.name: uv.data.copy() for uv in mesh.data.uv_layers}
+
         bpy.ops.object.mode_set(mode='OBJECT')
         bpy.ops.object.select_all(action='DESELECT')
         
@@ -352,12 +349,17 @@ def join_mesh_objects(context: Context, meshes: List[Object], progress: Optional
                 progress.step(t("Optimization.fixing_uvs"))
             fix_uv_coordinates(context)
             
-            # Return the joined mesh object
+            # Restore UV maps after joining
+            joined_mesh = context.active_object
+            for uv_name, uv_data in uv_maps_data.items():
+                for map_name, map_data in uv_data.items():
+                    if map_name not in joined_mesh.data.uv_layers:
+                        joined_mesh.data.uv_layers.new(name=map_name)
+                    joined_mesh.data.uv_layers[map_name].data.foreach_set("uv", map_data)
+            
             return context.active_object 
             
-        else:
-            # No objects were selected, return None
-            return None
+        return None
             
     except Exception as e:
         logger.error(f"Failed to join meshes: {str(e)}")
@@ -374,13 +376,17 @@ def fix_uv_coordinates(context: Context) -> None:
         bpy.ops.object.mode_set(mode='OBJECT')
         obj.select_set(True)
         context.view_layer.objects.active = obj
-        bpy.ops.object.mode_set(mode='EDIT')
         
-        bpy.ops.mesh.select_all(action='SELECT')
-
-        with context.temp_override(active_object=obj):
-            bpy.ops.uv.select_all(action='SELECT')
-            bpy.ops.uv.average_islands_scale()
+        # Process each UV layer
+        for uv_layer in obj.data.uv_layers:
+            obj.data.uv_layers.active = uv_layer
+            bpy.ops.object.mode_set(mode='EDIT')
+            bpy.ops.mesh.select_all(action='SELECT')
+            
+            with context.temp_override(active_object=obj):
+                bpy.ops.uv.select_all(action='SELECT')
+                bpy.ops.uv.pack_islands(margin=0.001)
+                bpy.ops.uv.average_islands_scale()
             
         logger.debug(f"UV Fix - Successfully processed {obj.name}")
 
@@ -392,13 +398,13 @@ def fix_uv_coordinates(context: Context) -> None:
         for sel_obj in current_selected:
             sel_obj.select_set(True)
         context.view_layer.objects.active = current_active
-# This should be at the top level, not indented inside any class or function
+
 def clear_unused_data_blocks() -> int:
     """Removes all unused data blocks from the current Blender file"""
-    initial_count = sum(len(getattr(bpy.data, attr)) for attr in dir(bpy.data)
+    initial_count: int = sum(len(getattr(bpy.data, attr)) for attr in dir(bpy.data)
                         if isinstance(getattr(bpy.data, attr), bpy.types.bpy_prop_collection))
     bpy.ops.outliner.orphans_purge(do_local_ids=True, do_linked_ids=True, do_recursive=True)
-    final_count = sum(len(getattr(bpy.data, attr)) for attr in dir(bpy.data)
+    final_count: int = sum(len(getattr(bpy.data, attr)) for attr in dir(bpy.data)
                       if isinstance(getattr(bpy.data, attr), bpy.types.bpy_prop_collection))
     return initial_count - final_count
 
@@ -408,8 +414,8 @@ def simplify_bonename(name: str) -> str:
 
 def duplicate_bone_chain(bones: List[EditBone]) -> List[EditBone]:
     """Duplicate a chain of bones while preserving hierarchy"""
-    new_bones = []
-    parent_map = {}
+    new_bones: List[EditBone] = []
+    parent_map: Dict[EditBone, EditBone] = {}
     
     for bone in bones:
         new_bone = duplicate_bone(bone)
@@ -429,37 +435,31 @@ def restore_bone_transforms(bone: EditBone, transforms: Dict[str, Any]) -> None:
 
 def get_vertex_weights(mesh_obj: Object, group_name: str) -> Dict[int, float]:
     """Get vertex weights for a specific vertex group"""
-    weights = {}
-    group_index = mesh_obj.vertex_groups[group_name].index
+    weights: Dict[int, float] = {}
+    group_index: int = mesh_obj.vertex_groups[group_name].index
     for vertex in mesh_obj.data.vertices:
         for group in vertex.groups:
             if group.group == group_index:
                 weights[vertex.index] = group.weight
     return weights
 
-def transfer_vertex_weights(mesh_obj: Object, 
-                          source_name: str, 
-                          target_name: str, 
-                          threshold: float = 0.01) -> None:
+def transfer_vertex_weights(mesh_obj: Object, source_name: str, target_name: str, threshold: float = 0.01) -> None:
     """Transfer vertex weights from source to target group"""
     if source_name not in mesh_obj.vertex_groups:
         return
         
-    source_group = mesh_obj.vertex_groups[source_name]
-    target_group = mesh_obj.vertex_groups.get(target_name)
+    source_group: VertexGroup = mesh_obj.vertex_groups[source_name]
+    target_group: Optional[VertexGroup] = mesh_obj.vertex_groups.get(target_name)
     
     if not target_group:
         target_group = mesh_obj.vertex_groups.new(name=target_name)
     
-    # Get source weights
-    weights = get_vertex_weights(mesh_obj, source_name)
+    weights: Dict[int, float] = get_vertex_weights(mesh_obj, source_name)
     
-    # Transfer weights above threshold
     for vertex_index, weight in weights.items():
         if weight > threshold:
             target_group.add([vertex_index], weight, 'ADD')
             
-    # Remove source group
     mesh_obj.vertex_groups.remove(source_group)
 
 def remove_unused_shapekeys(mesh_obj: Object, tolerance: float = 0.001) -> int:
@@ -467,35 +467,30 @@ def remove_unused_shapekeys(mesh_obj: Object, tolerance: float = 0.001) -> int:
     if not mesh_obj.data.shape_keys:
         return 0
         
-    key_blocks = mesh_obj.data.shape_keys.key_blocks
-    vertex_count = len(mesh_obj.data.vertices)
-    removed_count = 0
+    key_blocks: List[ShapeKey] = mesh_obj.data.shape_keys.key_blocks
+    vertex_count: int = len(mesh_obj.data.vertices)
+    removed_count: int = 0
     
-    # Cache for relative key locations
-    cache = {}
-    locations = np.empty(3 * vertex_count, dtype=np.float32)
-    to_delete = []
+    cache: Dict[str, npt.NDArray[np.float32]] = {}
+    locations: npt.NDArray[np.float32] = np.empty(3 * vertex_count, dtype=np.float32)
+    to_delete: List[str] = []
     
     for key in key_blocks:
         if key == key.relative_key:
             continue
             
-        # Get current key locations
         key.data.foreach_get("co", locations)
         
-        # Get or calculate relative key locations
         if key.relative_key.name not in cache:
-            rel_locations = np.empty(3 * vertex_count, dtype=np.float32)
+            rel_locations: npt.NDArray[np.float32] = np.empty(3 * vertex_count, dtype=np.float32)
             key.relative_key.data.foreach_get("co", rel_locations)
             cache[key.relative_key.name] = rel_locations
             
-        # Compare locations
         locations -= cache[key.relative_key.name]
         if (np.abs(locations) < tolerance).all():
-            if not any(c in key.name for c in "-=~"):  # Skip category markers
+            if not any(c in key.name for c in "-=~"):
                 to_delete.append(key.name)
                 
-    # Remove marked shape keys
     for key_name in to_delete:
         mesh_obj.shape_key_remove(key_blocks[key_name])
         removed_count += 1
@@ -503,20 +498,52 @@ def remove_unused_shapekeys(mesh_obj: Object, tolerance: float = 0.001) -> int:
     return removed_count
 
 def has_shapekeys(mesh_obj: Object) -> bool:
+    """Check if mesh object has shape keys"""
     return mesh_obj.data.shape_keys is not None
 
-# Identifier to indicate that an EnumProperty is empty
-# This is the default identifier used when a wrapped items function returns an empty list
-# This identifier needs to be something that should never normally be used, so as to avoid the possibility of
-# conflicting with an enum value that exists.
-_empty_enum_identifier = 'Cats_empty_enum_identifier'
+def fix_zero_length_bones(armature: Object) -> None:
+    """Fix zero length bones by setting a minimum length"""
+    if not armature:
+        return
+        
+    bpy.ops.object.mode_set(mode='EDIT')
+    for bone in armature.data.edit_bones:
+        if bone.length < 0.001:
+            bone.length = 0.001
+    bpy.ops.object.mode_set(mode='OBJECT')
+
+def calculate_bone_orientation(mesh: Object, vertices: List[Any]) -> Tuple[Vector, float]:
+    """Calculate optimal bone orientation based on mesh geometry"""
+    if not vertices:
+        return Vector((0, 0, 0.1)), 0.0
+        
+    coords: List[Vector] = [mesh.data.vertices[v.index].co for v in vertices]
+    min_co: Vector = Vector(map(min, zip(*coords)))
+    max_co: Vector = Vector(map(max, zip(*coords)))
+    dimensions: Vector = max_co - min_co
+    
+    roll_angle: float = 0.0
+    
+    return dimensions, roll_angle
+
+def add_armature_modifier(mesh: Object, armature: Object) -> None:
+    """Add armature modifier to mesh"""
+    for mod in mesh.modifiers:
+        if mod.type == 'ARMATURE':
+            mesh.modifiers.remove(mod)
 
-# names - The first object will be the first one in the list. So the first one has to be the one that exists in the most models
-# no_basis - If this is true the Basis will not be available in the list
-def get_shapekeys(context, names, is_mouth, no_basis, return_list):
-    choices = []
-    choices_simple = []
-    meshes_list = get_meshes_objects(check=False)
+    modifier: Modifier = mesh.modifiers.new('Armature', 'ARMATURE')
+    modifier.object = armature
+
+def get_shapekeys(context: Context, 
+                  names: List[str], 
+                  is_mouth: bool, 
+                  no_basis: bool, 
+                  return_list: bool) -> Union[List[Tuple[str, str, str]], List[str]]:
+    """Get shape keys based on specified criteria"""
+    choices: List[Tuple[str, str, str]] = []
+    choices_simple: List[str] = []
+    meshes_list: List[Object] = get_meshes_objects(check=False)
 
     if meshes_list:
         if is_mouth:
@@ -536,15 +563,12 @@ def get_shapekeys(context, names, is_mouth, no_basis, return_list):
                 continue
             if no_basis and name == 'Basis':
                 continue
-            # 1. Will be returned by context.scene
-            # 2. Will be shown in lists
-            # 3. will be shown in the hover description (below description)
             choices.append((name, name, name))
             choices_simple.append(name)
 
     _sort_enum_choices_by_identifier_lower(choices)
 
-    choices2 = []
+    choices2: List[Tuple[str, str, str]] = []
     for name in names:
         if name in choices_simple and len(choices) > 1 and choices[0][0] != name:
             continue
@@ -553,22 +577,16 @@ def get_shapekeys(context, names, is_mouth, no_basis, return_list):
     choices2.extend(choices)
 
     if return_list:
-        shape_list = []
+        shape_list: List[str] = []
         for choice in choices2:
             shape_list.append(choice[0])
         return shape_list
 
     return choices2
 
-# Default sorting for dynamic EnumProperty items
-def _sort_enum_choices_by_identifier_lower(choices, in_place=True):
-    """Sort a list of enum choices (items) by the lowercase of their identifier.
-
-    Sorting is performed in-place by default, but can be changed by setting in_place=False.
-
-    Returns the sorted list of enum choices."""
-
-    def identifier_lower(choice):
+def _sort_enum_choices_by_identifier_lower(choices: List[Tuple[str, str, str]], in_place: bool = True) -> List[Tuple[str, str, str]]:
+    """Sort a list of enum choices by the lowercase of their identifier"""
+    def identifier_lower(choice: Tuple[str, str, str]) -> str:
         return choice[0].lower()
 
     if in_place:
@@ -577,55 +595,39 @@ def identifier_lower(choice):
         choices = sorted(choices, key=identifier_lower)
     return choices
 
-def is_enum_empty(string):
-    """Returns True only if the tested string is the string that signifies that an EnumProperty is empty.
-
-    Returns False in all other cases."""
+def is_enum_empty(string: str) -> bool:
+    """Returns True only if the tested string is the empty enum identifier"""
     return _empty_enum_identifier == string
 
-
-# This function isn't needed since you can 'not is_enum_empty(string)', but is included for code clarity and readability
-def is_enum_non_empty(string):
-    """Returns False only if the tested string is not the string that signifies that an EnumProperty is empty.
-
-    Returns True in all other cases."""
+def is_enum_non_empty(string: str) -> bool:
+    """Returns False only if the tested string is not the empty enum identifier"""
     return _empty_enum_identifier != string
 
-def fix_zero_length_bones(armature: Object) -> None:
-    """Fix zero length bones by setting a minimum length"""
-    if not armature:
-        return
-        
-    bpy.ops.object.mode_set(mode='EDIT')
-    for bone in armature.data.edit_bones:
-        if bone.length < 0.001:
-            bone.length = 0.001
-    bpy.ops.object.mode_set(mode='OBJECT')
-
-
-def calculate_bone_orientation(mesh, vertices):
-    """Calculate optimal bone orientation based on mesh geometry."""
-    
-    if not vertices:
-        return Vector((0, 0, 0.1)), 0.0
-        
-    coords = [mesh.data.vertices[v.index].co for v in vertices]
-    min_co = Vector(map(min, zip(*coords)))
-    max_co = Vector(map(max, zip(*coords)))
-    dimensions = max_co - min_co
-    
-    roll_angle = 0.0
-    
-    return dimensions, roll_angle
-
-def add_armature_modifier(mesh: Object, armature: Object):
-    """Add armature modifier to mesh."""
-    for mod in mesh.modifiers:
-        if mod.type == 'ARMATURE':
-            mesh.modifiers.remove(mod)
-
-    modifier = mesh.modifiers.new('Armature', 'ARMATURE')
-    modifier.object = armature
+_empty_enum_identifier: str = 'Cats_empty_enum_identifier'
+
+def get_meshes_objects(check: bool = True) -> List[Object]:
+    """Get all mesh objects in the scene"""
+    meshes: List[Object] = [obj for obj in bpy.data.objects if obj.type == 'MESH']
+    if check and not meshes:
+        return []
+    return meshes
+
+def get_objects() -> bpy.types.BlendData:
+    """Get all objects in the current Blender scene"""
+    return bpy.data.objects
+
+def duplicate_bone(bone: EditBone) -> EditBone:
+    """Create a duplicate of the given bone"""
+    new_bone: EditBone = bone.id_data.edit_bones.new(bone.name + "_copy")
+    new_bone.head = bone.head.copy()
+    new_bone.tail = bone.tail.copy()
+    new_bone.roll = bone.roll
+    new_bone.use_connect = bone.use_connect
+    new_bone.use_local_location = bone.use_local_location
+    new_bone.use_inherit_rotation = bone.use_inherit_rotation
+    new_bone.use_inherit_scale = bone.use_inherit_scale
+    new_bone.use_deform = bone.use_deform
+    return new_bone
 
 #Binary tools
 
diff --git a/core/logging_setup.py b/core/logging_setup.py
index f921d5d..37aab50 100644
--- a/core/logging_setup.py
+++ b/core/logging_setup.py
@@ -1,5 +1,6 @@
 import logging
-from typing import Optional
+from typing import Optional, Any
+from bpy.types import Context
 
 logger = logging.getLogger('avatar_toolkit')
 
@@ -18,7 +19,7 @@ def configure_logging(enabled: bool = False) -> None:
         handler.setFormatter(formatter)
         logger.addHandler(handler)
 
-def update_logging_state(self, context) -> None:
+def update_logging_state(self: Any, context: Context) -> None:
     """Update logging state based on user preference"""
     from .addon_preferences import save_preference
     enabled = self.enable_logging
diff --git a/core/properties.py b/core/properties.py
index 1aa4a28..bd12643 100644
--- a/core/properties.py
+++ b/core/properties.py
@@ -1,5 +1,5 @@
 import bpy
-from typing import List, Tuple, Optional
+from typing import List, Tuple, Optional, Any, Dict, Union, Callable
 from bpy.types import PropertyGroup, Material, Scene, Object, Context
 from bpy.props import (
     StringProperty, 
@@ -18,19 +18,21 @@
 from ..functions.visemes import VisemePreview
 from ..functions.eye_tracking import set_rotation
 
-def update_validation_mode(self, context):
+def update_validation_mode(self: PropertyGroup, context: Context) -> None:
+    """Updates validation mode and saves preference"""
     logger.info(f"Updating validation mode to: {self.validation_mode}")
     save_preference("validation_mode", self.validation_mode)
 
-def update_logging_state(self, context):
+def update_logging_state(self: PropertyGroup, context: Context) -> None:
+    """Updates logging state and configures logging"""
     logger.info(f"Updating logging state to: {self.enable_logging}")
     save_preference("enable_logging", self.enable_logging)
     from .logging_setup import configure_logging
     configure_logging(self.enable_logging)
 
-def update_shape_intensity(self, context):
+def update_shape_intensity(self: PropertyGroup, context: Context) -> None:
+    """Updates shape key intensity and refreshes preview"""
     if self.viseme_preview_mode:
-        from ..functions.visemes import VisemePreview
         VisemePreview.update_preview(context)
 
 class AvatarToolkitSceneProperties(PropertyGroup):
@@ -133,13 +135,7 @@ class AvatarToolkitSceneProperties(PropertyGroup):
         description=t("Visemes.preview_mode_desc"),
         default=False
     )
-    
-    viseme_preview_selection: StringProperty(
-        name=t("Visemes.preview_selection"),
-        description=t("Visemes.preview_selection_desc"),
-        default="vrc.v_aa"
-    )
-    
+
     mouth_a: StringProperty(
         name=t("Visemes.mouth_a"),
         description=t("Visemes.mouth_a_desc")
@@ -155,6 +151,11 @@ class AvatarToolkitSceneProperties(PropertyGroup):
         description=t("Visemes.mouth_ch_desc")
     )
 
+    viseme_mesh: StringProperty(
+        name=t("Visemes.mesh_select"),
+        description=t("Visemes.mesh_select_desc"),
+    )
+
     shape_intensity: FloatProperty(
         name=t("Visemes.shape_intensity"),
         description=t("Visemes.shape_intensity_desc"),
@@ -366,16 +367,6 @@ class AvatarToolkitSceneProperties(PropertyGroup):
         default=True
     )
 
-    attach_mesh: StringProperty(
-        name=t("Tools.attach_mesh_select"),
-        description=t("Tools.attach_mesh_select_desc")
-    )
-
-    attach_bone: StringProperty(
-        name=t("Tools.attach_bone_select"),
-        description=t("Tools.attach_bone_select_desc")
-    )
-
 def register() -> None:
     """Register the Avatar Toolkit property group"""
     logger.info("Registering Avatar Toolkit properties")
diff --git a/functions/custom_tools/armature_merging.py b/functions/custom_tools/armature_merging.py
index 7164652..437119c 100644
--- a/functions/custom_tools/armature_merging.py
+++ b/functions/custom_tools/armature_merging.py
@@ -1,7 +1,7 @@
 import bpy
 import numpy as np
-from typing import List, Optional, Dict, Set
-from bpy.types import Context, Object, Operator
+from typing import List, Optional, Dict, Set, Tuple, Any
+from bpy.types import Context, Object, Operator, ArmatureModifier, EditBone, VertexGroup, Mesh, ShapeKey
 
 from ...core.logging_setup import logger
 from ...core.translations import t
@@ -13,26 +13,27 @@
     remove_unused_shapekeys
 )
 
-class AvatarToolkit_OT_MergeArmature(Operator):
-    bl_idname = 'avatar_toolkit.merge_armatures'
-    bl_label = t('MergeArmature.label')
-    bl_description = t('MergeArmature.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+class AvatarToolkit_OT_MergeArmature(bpy.types.Operator):
+    """Operator for merging two armatures together with their associated meshes"""
+    bl_idname: str = 'avatar_toolkit.merge_armatures'
+    bl_label: str = t('MergeArmature.label')
+    bl_description: str = t('MergeArmature.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
-    def poll(cls, context):
+    def poll(cls, context: Context) -> bool:
         return len(get_all_meshes(context)) > 1
 
-    def execute(self, context):
+    def execute(self, context: Context) -> Set[str]:
         try:
             wm = context.window_manager
             wm.progress_begin(0, 100)
 
             # Get both armatures
-            base_armature_name = context.scene.merge_armature_into
-            merge_armature_name = context.scene.merge_armature
-            base_armature = bpy.data.objects.get(base_armature_name)
-            merge_armature = bpy.data.objects.get(merge_armature_name)
+            base_armature_name: str = context.scene.merge_armature_into
+            merge_armature_name: str = context.scene.merge_armature
+            base_armature: Optional[Object] = bpy.data.objects.get(base_armature_name)
+            merge_armature: Optional[Object] = bpy.data.objects.get(merge_armature_name)
             
             if not base_armature or not merge_armature:
                 logger.error(f"Armature not found: {merge_armature_name}")
@@ -51,15 +52,15 @@ def execute(self, context):
             wm.progress_update(80)
 
             # Get settings from scene properties
-            merge_all_bones = context.scene.avatar_toolkit.merge_all_bones
-            join_meshes = context.scene.avatar_toolkit.join_meshes
+            merge_all_bones: bool = context.scene.avatar_toolkit.merge_all_bones
+            join_meshes: bool = context.scene.avatar_toolkit.join_meshes
 
             # Merge armatures
             merge_armatures(
                 base_armature_name,
                 merge_armature_name,
                 mesh_only=False,
-                merge_all_bones=context.scene.avatar_toolkit.merge_all_bones,
+                merge_all_bones=merge_all_bones,
                 join_meshes=join_meshes,
                 operator=self
             )
@@ -76,10 +77,10 @@ def execute(self, context):
             self.report({'ERROR'}, str(e))
             return {'CANCELLED'}
 
-def delete_rigidbodies_and_joints(armature: Object):
-    """Delete rigid bodies and joints associated with the armature."""
-    to_delete = []
-    parent = armature
+def delete_rigidbodies_and_joints(armature: Object) -> None:
+    """Delete rigid bodies and joints associated with an armature"""
+    to_delete: List[Object] = []
+    parent: Object = armature
     while parent.parent:
         parent = parent.parent
         
@@ -94,9 +95,9 @@ def delete_rigidbodies_and_joints(armature: Object):
         bpy.data.objects.remove(obj, do_unlink=True)
 
 def validate_parents_and_transforms(merge_armature: Object, base_armature: Object, context: Context) -> bool:
-    """Validate parents and transformations of armatures before merging."""
-    merge_parent = merge_armature.parent
-    base_parent = base_armature.parent
+    """Validate parent relationships and transformations of armatures"""
+    merge_parent: Optional[Object] = merge_armature.parent
+    base_parent: Optional[Object] = base_armature.parent
     
     if merge_parent or base_parent:
         if context.scene.merge_all_bones:
@@ -112,21 +113,21 @@ def validate_parents_and_transforms(merge_armature: Object, base_armature: Objec
     return True
 
 def is_transform_clean(obj: Object) -> bool:
-    """Check if an object's transforms are at default values."""
+    """Check if object transforms are at default values"""
     for i in range(3):
         if obj.scale[i] != 1 or obj.location[i] != 0 or obj.rotation_euler[i] != 0:
             return False
     return True
 
-def prepare_mesh_vertex_groups(mesh: Object):
-    """Prepare mesh by assigning all vertices to a new vertex group."""
+def prepare_mesh_vertex_groups(mesh: Object) -> None:
+    """Initialize mesh vertex groups for merging process"""
     if mesh.vertex_groups:
         for vg in mesh.vertex_groups:
             mesh.vertex_groups.remove(vg)
 
     bpy.ops.object.mode_set(mode='EDIT')
     bpy.ops.mesh.select_all(action='SELECT')
-    vg = mesh.vertex_groups.new(name=mesh.name)
+    vg: VertexGroup = mesh.vertex_groups.new(name=mesh.name)
     bpy.ops.object.vertex_group_assign()
     bpy.ops.object.mode_set(mode='OBJECT')
 
@@ -136,14 +137,14 @@ def merge_armatures(
     mesh_only: bool,
     merge_all_bones: bool = False,
     join_meshes: bool = False,
-    operator=None
-):
-    """Main function to merge two armatures."""
+    operator: Optional[Operator] = None
+) -> None:
+    """Main function to merge two armatures with their associated meshes and data"""
     logger.info(f"Merging armatures: {merge_armature_name} into {base_armature_name}")
-    tolerance = 0.00008726647  # around 0.005 degrees
+    tolerance: float = 0.00008726647  # around 0.005 degrees
 
-    base_armature = bpy.data.objects.get(base_armature_name)
-    merge_armature = bpy.data.objects.get(merge_armature_name)
+    base_armature: Optional[Object] = bpy.data.objects.get(base_armature_name)
+    merge_armature: Optional[Object] = bpy.data.objects.get(merge_armature_name)
 
     if not base_armature or not merge_armature:
         logger.error(f"Armature not found: {merge_armature_name}")
@@ -172,12 +173,12 @@ def merge_armatures(
     fix_zero_length_bones(merge_armature)
 
     # Store original parent relationships
-    original_parents = {}
+    original_parents: Dict[str, Optional[str]] = {}
     for bone in merge_armature.data.bones:
         original_parents[bone.name] = bone.parent.name if bone.parent else None
 
     # Get base bone names
-    base_bone_names = set(bone.name for bone in base_armature.data.bones)
+    base_bone_names: Set[str] = {bone.name for bone in base_armature.data.bones}
 
     # Switch to edit mode on merge armature and rename bones
     bpy.context.view_layer.objects.active = merge_armature
@@ -206,11 +207,11 @@ def merge_armatures(
     # Restore parent relationships
     bpy.ops.object.mode_set(mode='EDIT')
     for bone in base_armature.data.edit_bones:
-        base_name = bone.name.replace('.merge', '')
+        base_name: str = bone.name.replace('.merge', '')
         if base_name in original_parents:
-            parent_name = original_parents[base_name]
+            parent_name: Optional[str] = original_parents[base_name]
             if parent_name:
-                parent_bone = base_armature.data.edit_bones.get(parent_name)
+                parent_bone: Optional[EditBone] = base_armature.data.edit_bones.get(parent_name)
                 if parent_bone:
                     bone.parent = parent_bone
 
@@ -223,7 +224,7 @@ def merge_armatures(
 
     # Process vertex groups if not mesh_only
     if not mesh_only:
-        meshes = [obj for obj in bpy.data.objects if obj.type == 'MESH' and obj.parent == base_armature]
+        meshes: List[Object] = [obj for obj in bpy.data.objects if obj.type == 'MESH' and obj.parent == base_armature]
         process_vertex_groups(meshes)
 
         # Remove zero weight vertex groups if enabled
@@ -235,9 +236,9 @@ def merge_armatures(
 
     # Join meshes if requested
     if join_meshes:
-        meshes_to_join = [obj for obj in bpy.data.objects if obj.type == 'MESH' and obj.parent == base_armature]
+        meshes_to_join: List[Object] = [obj for obj in bpy.data.objects if obj.type == 'MESH' and obj.parent == base_armature]
         if meshes_to_join:
-            joined_mesh = join_mesh_objects(bpy.context, meshes_to_join)
+            joined_mesh: Optional[Object] = join_mesh_objects(bpy.context, meshes_to_join)
             if joined_mesh:
                 logger.info(f"Joined meshes into {joined_mesh.name}")
 
@@ -250,8 +251,8 @@ def merge_armatures(
     # Remove any remaining .merge bones
     bpy.context.view_layer.objects.active = base_armature
     bpy.ops.object.mode_set(mode='EDIT')
-    edit_bones = base_armature.data.edit_bones
-    bones_to_remove = [bone for bone in edit_bones if bone.name.endswith('.merge')]
+    edit_bones: List[EditBone] = base_armature.data.edit_bones
+    bones_to_remove: List[EditBone] = [bone for bone in edit_bones if bone.name.endswith('.merge')]
     for bone in bones_to_remove:
         edit_bones.remove(bone)
     bpy.ops.object.mode_set(mode='OBJECT')
@@ -259,14 +260,13 @@ def merge_armatures(
     # Final cleanup
     clear_unused_data_blocks()
 
-
 def validate_merge_armature_transforms(
     base_armature: Object,
     merge_armature: Object, 
     mesh_merge: Optional[Object],
     tolerance: float
 ) -> bool:
-    """Validate transforms of both armatures and mesh."""
+    """Validate transforms of both armatures and mesh"""
     for i in [0, 1, 2]:
         if abs(base_armature.scale[i] - merge_armature.scale[i]) > tolerance:
             return False
@@ -280,10 +280,10 @@ def validate_merge_armature_transforms(
 def adjust_merge_armature_transforms(
     merge_armature: Object,
     mesh_merge: Object
-):
-    """Adjust transforms of the merge armature."""
-    old_loc = list(merge_armature.location)
-    old_scale = list(merge_armature.scale)
+) -> None:
+    """Adjust transforms of the merge armature"""
+    old_loc: List[float] = list(merge_armature.location)
+    old_scale: List[float] = list(merge_armature.scale)
 
     for i in [0, 1, 2]:
         merge_armature.location[i] = (mesh_merge.location[i] * old_scale[i]) + old_loc[i]
@@ -295,25 +295,24 @@ def adjust_merge_armature_transforms(
         mesh_merge.rotation_euler[i] = 0
         mesh_merge.scale[i] = 1
 
-
 def detect_bones_to_merge(
     base_edit_bones: bpy.types.ArmatureEditBones,
     merge_edit_bones: bpy.types.ArmatureEditBones,
     tolerance: float,
     merge_all_bones: bool
 ) -> List[str]:
-    """Detect corresponding bones between base and merge armatures using smart detection and position tolerance."""
-    bones_to_merge = []
+    """Detect corresponding bones between base and merge armatures using smart detection and position tolerance"""
+    bones_to_merge: List[str] = []
 
     # Cache base bone positions
-    base_bones_positions = {
+    base_bones_positions: Dict[str, np.ndarray] = {
         bone.name: np.array(bone.head) for bone in base_edit_bones
     }
 
     # Smart bone detection
     for merge_bone in merge_edit_bones:
-        merge_bone_position = np.array(merge_bone.head)
-        found_match = False
+        merge_bone_position: np.ndarray = np.array(merge_bone.head)
+        found_match: bool = False
 
         if merge_all_bones and merge_bone.name in base_bones_positions:
             # If merging same bones by name
@@ -333,17 +332,16 @@ def detect_bones_to_merge(
 
     return bones_to_merge
 
-
-def process_vertex_groups(meshes: List[Object]):
-    """Process vertex groups in meshes."""
+def process_vertex_groups(meshes: List[Object]) -> None:
+    """Process vertex groups in meshes"""
     for mesh in meshes:
-        vg_names = {vg.name for vg in mesh.vertex_groups}
-        merge_vg_names = [vg_name for vg_name in vg_names if vg_name.endswith('.merge')]
+        vg_names: Set[str] = {vg.name for vg in mesh.vertex_groups}
+        merge_vg_names: List[str] = [vg_name for vg_name in vg_names if vg_name.endswith('.merge')]
 
         for vg_merge_name in merge_vg_names:
-            base_name = vg_merge_name[:-6]
-            vg_merge = mesh.vertex_groups.get(vg_merge_name)
-            vg_base = mesh.vertex_groups.get(base_name)
+            base_name: str = vg_merge_name[:-6]
+            vg_merge: Optional[VertexGroup] = mesh.vertex_groups.get(vg_merge_name)
+            vg_base: Optional[VertexGroup] = mesh.vertex_groups.get(base_name)
 
             if vg_merge is None:
                 continue
@@ -353,20 +351,20 @@ def process_vertex_groups(meshes: List[Object]):
             else:
                 vg_merge.name = base_name
 
-def mix_vertex_groups(mesh: Object, vg_from_name: str, vg_to_name: str):
-    """Mix vertex group weights."""
-    vg_from = mesh.vertex_groups.get(vg_from_name)
-    vg_to = mesh.vertex_groups.get(vg_to_name)
+def mix_vertex_groups(mesh: Object, vg_from_name: str, vg_to_name: str) -> None:
+    """Mix vertex group weights"""
+    vg_from: Optional[VertexGroup] = mesh.vertex_groups.get(vg_from_name)
+    vg_to: Optional[VertexGroup] = mesh.vertex_groups.get(vg_to_name)
         
     if not vg_from or not vg_to:
         return
 
-    num_vertices = len(mesh.data.vertices)
-    weights_from = np.zeros(num_vertices)
-    weights_to = np.zeros(num_vertices)
+    num_vertices: int = len(mesh.data.vertices)
+    weights_from: np.ndarray = np.zeros(num_vertices)
+    weights_to: np.ndarray = np.zeros(num_vertices)
 
-    idx_from = vg_from.index
-    idx_to = vg_to.index
+    idx_from: int = vg_from.index
+    idx_to: int = vg_to.index
 
     for v in mesh.data.vertices:
         for g in v.groups:
@@ -375,14 +373,14 @@ def mix_vertex_groups(mesh: Object, vg_from_name: str, vg_to_name: str):
             elif g.group == idx_to:
                 weights_to[v.index] = g.weight
 
-    weights_combined = np.clip(weights_from + weights_to, 0.0, 1.0)
+    weights_combined: np.ndarray = np.clip(weights_from + weights_to, 0.0, 1.0)
     vg_to.add(range(num_vertices), weights_combined.tolist(), 'REPLACE')
     mesh.vertex_groups.remove(vg_from)
 
-def remove_unused_vertex_groups(mesh: Object):
-    """Remove vertex groups with no weights."""
+def remove_unused_vertex_groups(mesh: Object) -> None:
+    """Remove vertex groups with no weights"""
     for vg in mesh.vertex_groups:
-        has_weights = False
+        has_weights: bool = False
         for vert in mesh.data.vertices:
             for group in vert.groups:
                 if group.group == vg.index and group.weight > 0.001:
@@ -393,9 +391,9 @@ def remove_unused_vertex_groups(mesh: Object):
         if not has_weights:
             mesh.vertex_groups.remove(vg)
 
-def apply_armature_to_mesh(armature: Object, mesh: Object):
-    """Apply armature deformation to mesh."""
-    armature_mod = mesh.modifiers.new('PoseToRest', 'ARMATURE')
+def apply_armature_to_mesh(armature: Object, mesh: Object) -> None:
+    """Apply armature deformation to mesh"""
+    armature_mod: ArmatureModifier = mesh.modifiers.new('PoseToRest', 'ARMATURE')
     armature_mod.object = armature
     
     if bpy.app.version >= (3, 5):
@@ -407,15 +405,15 @@ def apply_armature_to_mesh(armature: Object, mesh: Object):
     with bpy.context.temp_override(object=mesh):
         bpy.ops.object.modifier_apply(modifier=armature_mod.name)
 
-def apply_armature_to_mesh_with_shapekeys(armature: Object, mesh: Object, context: Context):
-    """Apply armature deformation to mesh with shape keys."""
-    old_active_index = mesh.active_shape_key_index
-    old_show_only = mesh.show_only_shape_key
+def apply_armature_to_mesh_with_shapekeys(armature: Object, mesh: Object, context: Context) -> None:
+    """Apply armature deformation to mesh with shape keys"""
+    old_active_index: int = mesh.active_shape_key_index
+    old_show_only: bool = mesh.show_only_shape_key
     mesh.show_only_shape_key = True
     
-    shape_keys = mesh.data.shape_keys.key_blocks
-    vertex_groups = []
-    mutes = []
+    shape_keys: List[ShapeKey] = mesh.data.shape_keys.key_blocks
+    vertex_groups: List[str] = []
+    mutes: List[bool] = []
     
     for sk in shape_keys:
         vertex_groups.append(sk.vertex_group)
@@ -423,23 +421,23 @@ def apply_armature_to_mesh_with_shapekeys(armature: Object, mesh: Object, contex
         mutes.append(sk.mute)
         sk.mute = False
 
-    disabled_mods = []
+    disabled_mods: List[Any] = []
     for mod in mesh.modifiers:
         if mod.show_viewport:
             mod.show_viewport = False
             disabled_mods.append(mod)
 
-    arm_mod = mesh.modifiers.new('PoseToRest', 'ARMATURE')
+    arm_mod: ArmatureModifier = mesh.modifiers.new('PoseToRest', 'ARMATURE')
     arm_mod.object = armature
     
-    co_length = len(mesh.data.vertices) * 3
-    eval_cos = np.empty(co_length, dtype=np.single)
+    co_length: int = len(mesh.data.vertices) * 3
+    eval_cos: np.ndarray = np.empty(co_length, dtype=np.single)
     
     for i, shape_key in enumerate(shape_keys):
         mesh.active_shape_key_index = i
         
         depsgraph = context.evaluated_depsgraph_get()
-        eval_mesh = mesh.evaluated_get(depsgraph)
+        eval_mesh: Mesh = mesh.evaluated_get(depsgraph)
         eval_mesh.data.vertices.foreach_get('co', eval_cos)
         
         shape_key.data.foreach_set('co', eval_cos)
diff --git a/functions/custom_tools/mesh_attachment.py b/functions/custom_tools/mesh_attachment.py
index 560521f..613e5b9 100644
--- a/functions/custom_tools/mesh_attachment.py
+++ b/functions/custom_tools/mesh_attachment.py
@@ -1,7 +1,7 @@
 import bpy
-from bpy.types import Operator, Context, Object
+from bpy.types import Operator, Context, Object, ArmatureModifier, VertexGroup
 from mathutils import Vector
-from typing import Set, Optional
+from typing import Set, Optional, List, Any
 
 from ...core.logging_setup import logger
 from ...core.translations import t
@@ -15,28 +15,34 @@
 )
 
 class AvatarToolkit_OT_AttachMesh(Operator):
-    """Attach a mesh to an armature bone with automatic weight setup"""
-    bl_idname = "avatar_toolkit.attach_mesh"
-    bl_label = t("AttachMesh.label")
-    bl_description = t("AttachMesh.desc")
-    bl_options = {'REGISTER', 'UNDO'}
+    """Operator to attach a mesh to an armature bone with automatic weight setup"""
+    bl_idname: str = "avatar_toolkit.attach_mesh"
+    bl_label: str = t("AttachMesh.label")
+    bl_description: str = t("AttachMesh.desc")
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context: Context) -> bool:
-        armature = get_active_armature(context)
-        return armature is not None and context.mode == 'OBJECT' and len(get_all_meshes(context)) > 0
+        """Check if operator can be executed"""
+        armature: Optional[Object] = get_active_armature(context)
+        if not armature:
+            return False
+        is_valid, _ = validate_armature(armature)
+        return is_valid
 
     def execute(self, context: Context) -> Set[str]:
         try:
             logger.info("Starting mesh attachment process")
             
-            mesh_name = context.scene.avatar_toolkit.attach_mesh
-            armature = get_active_armature(context)
-            attach_bone_name = context.scene.avatar_toolkit.attach_bone
-            mesh = bpy.data.objects.get(mesh_name)
+            mesh_name: str = context.scene.avatar_toolkit.attach_mesh
+            armature: Object = get_active_armature(context)
+            attach_bone_name: str = context.scene.avatar_toolkit.attach_bone
+            mesh: Optional[Object] = bpy.data.objects.get(mesh_name)
 
             with ProgressTracker(context, 10, "Attaching Mesh") as progress:
                 # Validation steps
+                is_valid: bool
+                error_msg: str
                 is_valid, error_msg = validate_mesh_transforms(mesh)
                 if not is_valid:
                     raise ValueError(error_msg)
@@ -63,7 +69,7 @@ def execute(self, context: Context) -> Set[str]:
                 
                 bpy.ops.object.mode_set(mode='EDIT')
                 bpy.ops.mesh.select_all(action='SELECT')
-                vg = mesh.vertex_groups.new(name=mesh_name)
+                vg: VertexGroup = mesh.vertex_groups.new(name=mesh_name)
                 bpy.ops.object.vertex_group_assign()
                 bpy.ops.object.mode_set(mode='OBJECT')
                 progress.step(t("AttachMesh.setup_weights"))
@@ -83,12 +89,14 @@ def execute(self, context: Context) -> Set[str]:
                 progress.step(t("AttachMesh.create_bone"))
 
                 # Calculate bone placement
-                verts_in_group = [v for v in mesh.data.vertices 
+                verts_in_group: List[Any] = [v for v in mesh.data.vertices 
                                 for g in v.groups if g.group == vg.index]
+                dimensions: Vector
+                roll_angle: float
                 dimensions, roll_angle = calculate_bone_orientation(mesh, verts_in_group)
                 
                 # Set bone position and orientation
-                center = Vector((0, 0, 0))
+                center: Vector = Vector((0, 0, 0))
                 for v in verts_in_group:
                     center += mesh.data.vertices[v.index].co
                 center /= len(verts_in_group)
@@ -111,20 +119,20 @@ def execute(self, context: Context) -> Set[str]:
             self.report({'ERROR'}, str(e))
             return {'CANCELLED'}
 
-def validate_mesh_transforms(mesh):
-    """Validate mesh transforms are suitable for attaching."""
+def validate_mesh_transforms(mesh: Optional[Object]) -> tuple[bool, str]:
+    """Validate mesh transforms are suitable for attaching"""
     if not mesh:
         return False, "Mesh not found"
     
     # Check for non-uniform scale
-    scale = mesh.scale
+    scale: Vector = mesh.scale
     if abs(scale[0] - scale[1]) > 0.001 or abs(scale[1] - scale[2]) > 0.001:
         return False, "Mesh has non-uniform scale. Please apply scale (Ctrl+A)"
     
     return True, ""
 
-def validate_mesh_name(armature, mesh_name):
-    """Validate mesh name doesn't conflict with existing bones."""
+def validate_mesh_name(armature: Object, mesh_name: str) -> tuple[bool, str]:
+    """Validate mesh name doesn't conflict with existing bones"""
     if mesh_name in armature.data.bones:
         return False, f"Bone named '{mesh_name}' already exists in armature"
-    return True, ""
\ No newline at end of file
+    return True, ""
diff --git a/functions/eye_tracking.py b/functions/eye_tracking.py
index 0f1169d..6219ac7 100644
--- a/functions/eye_tracking.py
+++ b/functions/eye_tracking.py
@@ -5,8 +5,8 @@
 import bmesh
 import mathutils
 import json
-from bpy.types import Operator, Object, Context
-from typing import Optional, Dict, Tuple, Set
+from bpy.types import Operator, Object, Context, UILayout, WindowManager, Event, ShapeKey, EditBone, PoseBone
+from typing import Optional, Dict, Tuple, Set, List, Any, Union, ClassVar
 from collections import OrderedDict
 from random import random
 from itertools import chain
@@ -24,19 +24,19 @@
     apply_vertex_positions
 )
 
-VALID_EYE_NAMES = {
+VALID_EYE_NAMES: Dict[str, List[str]] = {
     'left': ['LeftEye', 'Eye_L', 'eye_L', 'eye.L', 'EyeLeft', 'left_eye', 'l_eye'],
     'right': ['RightEye', 'Eye_R', 'eye_R', 'eye.R', 'EyeRight', 'right_eye', 'r_eye']
 }
 
 class CreateEyesAV3Button(bpy.types.Operator):
-    """Create eye tracking setup for VRChat Avatar 3.0"""
-    bl_idname = 'avatar_toolkit.create_eye_tracking_av3'
-    bl_label = t('EyeTracking.create.av3.label')
-    bl_description = t('EyeTracking.create.av3.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Creates eye tracking setup compatible with VRChat Avatar 3.0 system"""
+    bl_idname: str = 'avatar_toolkit.create_eye_tracking_av3'
+    bl_label: str = t('EyeTracking.create.av3.label')
+    bl_description: str = t('EyeTracking.create.av3.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
-    mesh = None
+    mesh: Optional[Object] = None
 
     @classmethod
     def poll(cls, context):
@@ -109,13 +109,13 @@ def execute(self, context):
                 return {'CANCELLED'}
 
 class CreateEyesSDK2Button(bpy.types.Operator):
-    """Create eye tracking setup for VRChat SDK2"""
-    bl_idname = 'avatar_toolkit.create_eye_tracking_sdk2'
-    bl_label = t('EyeTracking.create.sdk2.label')
-    bl_description = t('EyeTracking.create.sdk2.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Creates eye tracking setup compatible with VRChat SDK2 system"""
+    bl_idname: str = 'avatar_toolkit.create_eye_tracking_sdk2'
+    bl_label: str = t('EyeTracking.create.sdk2.label')
+    bl_description: str = t('EyeTracking.create.sdk2.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
-    mesh = None
+    mesh: Optional[Object] = None
 
     @classmethod
     def poll(cls, context):
@@ -201,8 +201,9 @@ def execute(self, context):
                 return {'CANCELLED'}
 
 class EyeTrackingBackup:
-    def __init__(self):
-        self.backup_path = os.path.join(bpy.app.tempdir, "eye_tracking_backup.json")
+    """Manages backup and restoration of eye bone positions"""
+    def __init__(self) -> None:
+        self.backup_path: str = os.path.join(bpy.app.tempdir, "eye_tracking_backup.json")
         self.bone_positions: Dict[str, Dict[str, Tuple[float, float, float]]] = {}
         
     def store_bone_positions(self, armature) -> bool:
@@ -247,8 +248,10 @@ def restore_bone_positions(self, armature) -> bool:
             return False
 
 class EyeTrackingValidator:
+    """Validates eye tracking setup requirements and configurations"""
     @staticmethod
-    def find_eye_vertex_groups(mesh_name: str) -> Tuple[str, str]:
+    def find_eye_vertex_groups(mesh_name: str) -> Tuple[Optional[str], Optional[str]]:
+        """Locates left and right eye vertex groups in mesh"""
         mesh = bpy.data.objects.get(mesh_name)
         if not mesh:
             return None, None
@@ -265,7 +268,8 @@ def find_eye_vertex_groups(mesh_name: str) -> Tuple[str, str]:
         return left_group, right_group
 
     @staticmethod
-    def validate_setup(context, mesh_name: str) -> Tuple[bool, str]:
+    def validate_setup(context: Context, mesh_name: str) -> Tuple[bool, str]:
+        """Validates complete eye tracking setup configuration"""
         armature = get_active_armature(context)
         if not armature:
             return False, t('EyeTracking.validation.noArmature')
@@ -299,10 +303,11 @@ def validate_setup(context, mesh_name: str) -> Tuple[bool, str]:
         return True, t('EyeTracking.validation.success')
             
 class StartTestingButton(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.start_eye_testing'
-    bl_label = t('EyeTracking.testing.start.label')
-    bl_description = t('EyeTracking.testing.start.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Initiates eye tracking testing mode"""
+    bl_idname: str = 'avatar_toolkit.start_eye_testing'
+    bl_label: str = t('EyeTracking.testing.start.label')
+    bl_description: str = t('EyeTracking.testing.start.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context):
@@ -351,10 +356,11 @@ def execute(self, context):
         return {'FINISHED'}
     
 class StopTestingButton(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.stop_eye_testing'
-    bl_label = t('EyeTracking.testing.stop.label')
-    bl_description = t('EyeTracking.testing.stop.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Terminates eye tracking testing mode"""
+    bl_idname: str = 'avatar_toolkit.stop_eye_testing'
+    bl_label: str = t('EyeTracking.testing.stop.label')
+    bl_description: str = t('EyeTracking.testing.stop.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     def execute(self, context):
         global eye_left, eye_right, eye_left_data, eye_right_data, eye_left_rot, eye_right_rot
@@ -392,6 +398,7 @@ def execute(self, context):
         return {'FINISHED'}
 
 def set_rotation(self, context):
+    """Updates eye bone rotations based on current settings"""
     global eye_left, eye_right, eye_left_rot, eye_right_rot
     toolkit = context.scene.avatar_toolkit
 
@@ -414,10 +421,11 @@ def set_rotation(self, context):
     return None
 
 class ResetRotationButton(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.reset_eye_rotation'
-    bl_label = t('EyeTracking.reset.label')
-    bl_description = t('EyeTracking.reset.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Resets eye bone rotations to default values"""
+    bl_idname: str = 'avatar_toolkit.reset_eye_rotation'
+    bl_label: str = t('EyeTracking.reset.label')
+    bl_description: str = t('EyeTracking.reset.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context):
@@ -445,10 +453,11 @@ def execute(self, context):
         return {'FINISHED'}
 
 class AdjustEyesButton(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.adjust_eyes'
-    bl_label = t('EyeTracking.adjust.label')
-    bl_description = t('EyeTracking.adjust.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Adjusts eye bone positions and orientations"""
+    bl_idname: str = 'avatar_toolkit.adjust_eyes'
+    bl_label: str = t('EyeTracking.adjust.label')
+    bl_description: str = t('EyeTracking.adjust.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context):
@@ -494,10 +503,11 @@ def execute(self, context):
         return {'FINISHED'}
     
 class StartIrisHeightButton(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.adjust_iris_height'
-    bl_label = t('EyeTracking.iris.label')
-    bl_description = t('EyeTracking.iris.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Adjusts iris height for eye meshes"""
+    bl_idname: str = 'avatar_toolkit.adjust_iris_height'
+    bl_label: str = t('EyeTracking.iris.label')
+    bl_description: str = t('EyeTracking.iris.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context):
@@ -536,10 +546,11 @@ def execute(self, context):
         return {'FINISHED'}
 
 class TestBlinking(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.test_blinking'
-    bl_label = t('EyeTracking.blink.test.label')
-    bl_description = t('EyeTracking.blink.test.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Tests eye blinking animations"""
+    bl_idname: str = 'avatar_toolkit.test_blinking'
+    bl_label: str = t('EyeTracking.blink.test.label')
+    bl_description: str = t('EyeTracking.blink.test.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context):
@@ -559,10 +570,11 @@ def execute(self, context):
         return {'FINISHED'}
     
 class TestLowerlid(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.test_lowerlid'
-    bl_label = t('EyeTracking.lowerlid.test.label')
-    bl_description = t('EyeTracking.lowerlid.test.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Tests lower eyelid movements"""
+    bl_idname: str = 'avatar_toolkit.test_lowerlid'
+    bl_label: str = t('EyeTracking.lowerlid.test.label')
+    bl_description: str = t('EyeTracking.lowerlid.test.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context):
@@ -584,10 +596,11 @@ def execute(self, context):
         return {'FINISHED'}
 
 class ResetBlinkTest(bpy.types.Operator):
-    bl_idname = 'avatar_toolkit.reset_blink_test'
-    bl_label = t('EyeTracking.blink.reset.label')
-    bl_description = t('EyeTracking.blink.reset.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Resets all eye blinking test values"""
+    bl_idname: str = 'avatar_toolkit.reset_blink_test'
+    bl_label: str = t('EyeTracking.blink.reset.label')
+    bl_description: str = t('EyeTracking.blink.reset.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     def execute(self, context):
         toolkit = context.scene.avatar_toolkit
@@ -601,7 +614,8 @@ def execute(self, context):
 
         return {'FINISHED'}
 
-def fix_eye_position(context, old_eye, new_eye, head, right_side):
+def fix_eye_position(context: Context, old_eye: Union[EditBone, PoseBone], new_eye: EditBone, head: Optional[EditBone], right_side: bool) -> None:
+    """Adjusts eye bone positions and orientations for proper tracking"""
     toolkit = context.scene.avatar_toolkit
     scale = -toolkit.eye_distance + 1
     mesh = bpy.data.objects[toolkit.mesh_name_eye]
@@ -637,8 +651,8 @@ def fix_eye_position(context, old_eye, new_eye, head, right_side):
     new_eye.tail[y_cord] = new_eye.head[y_cord]
     new_eye.tail[z_cord] = new_eye.head[z_cord] + 0.1
 
-def repair_shapekeys(mesh_name, vertex_group):
-    """Fix VRC shape keys by slightly adjusting vertex positions"""
+def repair_shapekeys(mesh_name: str, vertex_group: str) -> None:
+    """Repairs VRChat shape keys by adjusting vertex positions"""
     armature = get_active_armature(bpy.context)
     mesh = bpy.data.objects[mesh_name]
     mesh.select_set(True)
@@ -696,10 +710,12 @@ def repair_shapekeys(mesh_name, vertex_group):
         logger.warning('Shape key repair failed, using random method')
         repair_shapekeys_mouth(mesh_name)
 
-def randBoolNumber():
+def randBoolNumber() -> int:
+    """Generates random boolean value as integer"""
     return -1 if random() < 0.5 else 1
 
-def repair_shapekeys_mouth(mesh_name):
+def repair_shapekeys_mouth(mesh_name: str) -> None:
+    """Repairs mouth-related shape keys using fallback method"""
     mesh = bpy.data.objects[mesh_name]
     mesh.select_set(True)
     bpy.context.view_layer.objects.active = mesh
@@ -730,12 +746,12 @@ def repair_shapekeys_mouth(mesh_name):
     if not moved:
         logger.error('Random shape key repair failed')
 
-def get_bone_orientations():
-    """Get bone orientation axes"""
+def get_bone_orientations() -> Tuple[int, int, int]:
+    """Returns standardized bone orientation axes"""
     return (0, 1, 2)  # x, y, z coordinates
 
-def find_center_vector_of_vertex_group(mesh, group_name):
-    """Calculate center position of vertex group"""
+def find_center_vector_of_vertex_group(mesh: Object, group_name: str) -> Union[mathutils.Vector, bool]:
+    """Calculates center position of vertex group"""
     group = mesh.vertex_groups.get(group_name)
     if not group:
         return False
@@ -751,8 +767,8 @@ def find_center_vector_of_vertex_group(mesh, group_name):
 
     return sum((v for v in vertices), mathutils.Vector()) / len(vertices)
 
-def vertex_group_exists(mesh_obj, group_name):
-    """Check if vertex group exists and has weights"""
+def vertex_group_exists(mesh_obj: Object, group_name: str) -> bool:
+    """Verifies existence and validity of vertex group"""
     if not mesh_obj or group_name not in mesh_obj.vertex_groups:
         return False
         
@@ -763,8 +779,8 @@ def vertex_group_exists(mesh_obj, group_name):
                 return True
     return False
 
-def copy_vertex_group(self, vertex_group, rename_to):
-    """Copy vertex group with new name"""
+def copy_vertex_group(self: Any, vertex_group: str, rename_to: str) -> None:
+    """Creates copy of vertex group with new name"""
     vertex_group_index = 0
     # Select and make mesh active
     bpy.ops.object.mode_set(mode='OBJECT')
@@ -781,8 +797,8 @@ def copy_vertex_group(self, vertex_group, rename_to):
         vertex_group_index += 1
 
 
-def copy_shape_key(self, context, from_shape, new_names, new_index):
-    """Copy shape key with new name"""
+def copy_shape_key(self: Any, context: Context, from_shape: str, new_names: List[str], new_index: int) -> str:
+    """Creates copy of shape key with new name"""
     blinking = not context.scene.avatar_toolkit.disable_eye_blinking
     new_name = new_names[new_index - 1]
 
@@ -847,11 +863,11 @@ def clear_cache(cls):
         cls._cache.clear()
 
 class RotateEyeBonesForAv3Button(Operator):
-    """Reorient eye bones for proper VRChat eye tracking"""
-    bl_idname = "avatar_toolkit.rotate_eye_bones"
-    bl_label = t("EyeTracking.rotate.label")
-    bl_description = t("EyeTracking.rotate.desc")
-    bl_options = {'REGISTER', 'UNDO'}
+    """Reorients eye bones for VRChat Avatar 3.0 compatibility"""
+    bl_idname: str = "avatar_toolkit.rotate_eye_bones"
+    bl_label: str = t("EyeTracking.rotate.label")
+    bl_description: str = t("EyeTracking.rotate.desc")
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     @classmethod
     def poll(cls, context):
@@ -874,11 +890,11 @@ def execute(self, context):
         return {'FINISHED'}
 
 class ResetEyeTrackingButton(Operator):
-    """Reset all eye tracking settings and state"""
-    bl_idname = 'avatar_toolkit.reset_eye_tracking'
-    bl_label = t('EyeTracking.reset.label')
-    bl_description = t('EyeTracking.reset.desc')
-    bl_options = {'REGISTER', 'UNDO'}
+    """Resets all eye tracking settings to default values"""
+    bl_idname: str = 'avatar_toolkit.reset_eye_tracking'
+    bl_label: str = t('EyeTracking.reset.label')
+    bl_description: str = t('EyeTracking.reset.desc')
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
 
     def execute(self, context):
         global eye_left, eye_right, eye_left_data, eye_right_data, eye_left_rot, eye_right_rot
@@ -888,7 +904,7 @@ def execute(self, context):
         return {'FINISHED'}
 
 def validate_weights(mesh_obj: Object, vertex_group: str) -> bool:
-    """Validate vertex group weights"""
+    """Validates vertex group weight assignments"""
     group = mesh_obj.vertex_groups.get(vertex_group)
     if not group:
         return False
@@ -899,8 +915,8 @@ def validate_weights(mesh_obj: Object, vertex_group: str) -> bool:
                 return True
     return False
 
-def get_eye_bone_names(armature: Object) -> Dict[str, str]:
-    """Get standardized eye bone names"""
+def get_eye_bone_names(armature: Object) -> Dict[str, Optional[str]]:
+    """Retrieves standardized eye bone names from armature"""
     eye_bones = {'left': None, 'right': None}
     
     for bone in armature.data.bones:
@@ -912,7 +928,7 @@ def get_eye_bone_names(armature: Object) -> Dict[str, str]:
     return eye_bones
 
 def stop_testing(context: Context) -> None:
-    """Stop eye tracking testing mode"""
+    """Stops eye tracking testing mode and resets all values"""
     global eye_left, eye_right, eye_left_data, eye_right_data, eye_left_rot, eye_right_rot
     
     if not all([eye_left, eye_right, eye_left_data, eye_right_data, eye_left_rot, eye_right_rot]):
diff --git a/functions/optimization/materials_tools.py b/functions/optimization/materials_tools.py
index 2741105..d4f1607 100644
--- a/functions/optimization/materials_tools.py
+++ b/functions/optimization/materials_tools.py
@@ -27,6 +27,11 @@ def consolidate_nodes(node1: ShaderNodeTexImage, node2: ShaderNodeTexImage) -> N
     """Transfer properties from one texture node to another to ensure consistency"""
     node2.color_space = node1.color_space
     node2.coordinates = node1.coordinates
+    # Add UV map synchronization
+    if node1.texture_mapping and node2.texture_mapping:
+        node2.texture_mapping.vector_type = node1.texture_mapping.vector_type
+    if hasattr(node1, "uv_map") and hasattr(node2, "uv_map"):
+        node2.uv_map = node1.uv_map
 
 def consolidate_textures(node_tree1: NodeTree, node_tree2: NodeTree) -> None:
     """Synchronize texture nodes between two material node trees"""
@@ -81,6 +86,9 @@ class AvatarToolkit_OT_CombineMaterials(Operator):
     @classmethod
     def poll(cls, context: Context) -> bool:
         """Check if the operator can be executed"""
+        if context.mode != 'OBJECT':
+            return False
+            
         armature = get_active_armature(context)
         if not armature:
             return False
diff --git a/functions/tools/bone_tools.py b/functions/tools/bone_tools.py
index 68e395e..e90ceaf 100644
--- a/functions/tools/bone_tools.py
+++ b/functions/tools/bone_tools.py
@@ -134,6 +134,10 @@ def poll(cls, context: Context) -> bool:
 
     def execute(self, context: Context) -> set[str]:
         """Execute the constraint removal operation"""
+
+        # Make sure we are in Object mode first or it will error
+        bpy.ops.object.mode_set(mode='OBJECT')
+
         armature = get_active_armature(context)
         
         # Select armature and make it active before changing mode
diff --git a/functions/visemes.py b/functions/visemes.py
index f6ac3b5..301ab4d 100644
--- a/functions/visemes.py
+++ b/functions/visemes.py
@@ -1,9 +1,8 @@
-# MIT License
 # This code was taken from Cats Blender Plugin Unoffical, some of this code is by the original developers, however was improved by myself.
 # Didn't think it was necessary to re-make something that works well.
 
 import bpy
-from typing import Dict, List, Optional, Tuple, Any, Set
+from typing import Dict, List, Optional, Tuple, Any, Set, Union
 from bpy.types import Operator, Context, Object, ShapeKey
 from collections import OrderedDict
 from ..core.logging_setup import logger
@@ -16,22 +15,24 @@
 )
 
 class VisemeCache:
-    """Caches generated viseme shape data"""
-    _cache: Dict = {}
+    """Manages caching of generated viseme shape data for performance optimization"""
+    _cache: Dict[Tuple[str, Tuple[Tuple]], List] = {}
     
     @classmethod
-    def get_cached_shape(cls, key: str, mix_data: List) -> Optional[List]:
+    def get_cached_shape(cls, key: str, mix_data: List[List[Union[str, float]]]) -> Optional[List]:
+        """Retrieves cached shape data for a given viseme key and mix configuration"""
         cache_key = (key, tuple(tuple(x) for x in mix_data))
         return cls._cache.get(cache_key)
     
     @classmethod 
-    def cache_shape(cls, key: str, mix_data: List, shape_data: List) -> None:
+    def cache_shape(cls, key: str, mix_data: List[List[Union[str, float]]], shape_data: List) -> None:
+        """Stores shape data in cache for future retrieval"""
         cache_key = (key, tuple(tuple(x) for x in mix_data))
         cls._cache[cache_key] = shape_data
 
 class VisemePreview:
-    """Handles viseme preview functionality"""
-    _preview_data: Dict = {}
+    """Controls real-time preview functionality for viseme shapes"""
+    _preview_data: Dict[str, float] = {}
     _active: bool = False
     _preview_shapes: Optional[OrderedDict] = None
     
@@ -117,13 +118,18 @@ def end_preview(cls, mesh: Object) -> None:
         cls._preview_shapes = None
 
 class ATOOLKIT_OT_preview_visemes(Operator):
-    bl_idname = "avatar_toolkit.preview_visemes"
-    bl_label = t("Visemes.preview_label")
-    bl_description = t("Visemes.preview_desc")
-    bl_options = {'REGISTER', 'UNDO', 'INTERNAL'}
+    """Operator for previewing viseme shapes in real-time"""
+    bl_idname: str = "avatar_toolkit.preview_visemes"
+    bl_label: str = t("Visemes.preview_label")
+    bl_description: str = t("Visemes.preview_desc")
+    bl_options: Set[str] = {'REGISTER', 'UNDO', 'INTERNAL'}
     
     @classmethod
     def poll(cls, context: Context) -> bool:
+        # Check if we're in object mode first
+        if context.mode != 'OBJECT':
+            return False
+            
         armature = get_active_armature(context)
         if not armature:
             return False
@@ -165,10 +171,11 @@ def validate_deformation(mesh, mix_data):
     return max_deform < (mesh_size * 0.4)
 
 class ATOOLKIT_OT_create_visemes(Operator):
-    bl_idname = "avatar_toolkit.create_visemes"
-    bl_label = t("Visemes.create_label")
-    bl_description = t("Visemes.create_desc")
-    bl_options = {'REGISTER', 'UNDO'}
+    """Operator for generating VRChat-compatible viseme shape keys"""
+    bl_idname: str = "avatar_toolkit.create_visemes"
+    bl_label: str = t("Visemes.create_label")
+    bl_description: str = t("Visemes.create_desc")
+    bl_options: Set[str] = {'REGISTER', 'UNDO'}
     
     @classmethod
     def poll(cls, context: Context) -> bool:
diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json
index dd82000..dc60653 100644
--- a/resources/translations/en_US.json
+++ b/resources/translations/en_US.json
@@ -1,7 +1,7 @@
 {
   "authors": ["Avatar Toolkit Team"],
   "messages": {
-    "AvatarToolkit.label": "Avatar Toolkit (Alpha 0.1.0)",
+    "AvatarToolkit.label": "Avatar Toolkit (Alpha 0.1.1)",
     "AvatarToolkit.desc1": "Avatar Toolkit is in Early Access there",
     "AvatarToolkit.desc2": "will be issues, if you find any issues,",
     "AvatarToolkit.desc3": "please report it on our Github.",
@@ -231,6 +231,8 @@
     "Visemes.error.no_shapekeys": "Mesh has no shape keys",
     "Visemes.error.select_shapekeys": "Please select shape keys for A, O and CH",
     "Visemes.success": "Visemes created successfully",
+    "Visemes.mesh_select": "Select Mesh",
+    "Visemes.mesh_select_desc": "Select the mesh to create visemes on",
 
     "EyeTracking.label": "Eye Tracking",
     "EyeTracking.setup": "Eye Tracking Setup",
@@ -314,6 +316,8 @@
     "EyeTracking.type.av3_desc": "VRChat Avatar 3.0 eye tracking setup",
     "EyeTracking.type.sdk2": "SDK2 (Legacy)",
     "EyeTracking.type.sdk2_desc": "VRChat SDK2 eye tracking setup",
+    "EyeTracking.adjust.label": "Adjust Eye Position",
+    "EyeTracking.adjust.desc": "Adjust the position of eye bones based on vertex groups",
 
     "CustomPanel.label": "Custom Avatar Tools",
     "CustomPanel.merge_mode": "Merge Mode",
@@ -396,8 +400,9 @@
     "Language.auto": "Automatic",
     "Language.en_US": "English",
     "Language.ja_JP": "Japanese",
+    "Language.ko_KR": "Korean",
     "Language.changed.title": "Language Changed",
     "Language.changed.success": "Language changed successfully!",
     "Language.changed.restart": "Some UI elements may require restarting Blender"
   }
-}
+}
\ No newline at end of file
diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json
index 57dc4c2..2a7f445 100644
--- a/resources/translations/ja_JP.json
+++ b/resources/translations/ja_JP.json
@@ -1,298 +1,408 @@
 {
   "authors": ["Avatar Toolkit Team"],
   "messages": {
-    "AutoVisemeButton.desc": "シェイプキーに基づいて自動的にビセムを作成",
-    "AutoVisemeButton.error.noShapekeys": "シェイプキーが見つかりません",
-    "AutoVisemeButton.error.selectShapekeys": "シェイプキーを選択してください",
-    "AutoVisemeButton.label": "ビセムを作成",
-    "AutoVisemeButton.success": "ビセムの作成に成功しました",
-    "AvatarToolkit.label": "Avatar Toolkit (アルファ版)",
-    "AvatarToolkit.desc1": "Avatar Toolkitは早期アクセス段階です",
-    "AvatarToolkit.desc2": "問題が発生する可能性があります。",
-    "AvatarToolkit.desc3": "問題を見つけた場合はGithubで報告してください。",
-    "Export.resonite.desc": "アニメーションとマテリアルを含むGLBをエクスポート。アニメーションデータについては：",
-    "Export.resonite.label": "Resoniteにエクスポート",
-    "Importer.export_resonite.desc": "GLTFとしてResoniteにエクスポート。Blenderでモデルのスケールを確認し、Resoniteではメートル単位でインポートしてください。",
-    "Importer.export_resonite.label": "Resoniteにエクスポート",
-    "Importer.export_vrchat.desc": "VRChatにエクスポート（ChilloutVRでも動作する可能性あり）。Catsのエクスポートに似ています。",
-    "Importer.export_vrchat.label": "VRChatにエクスポート",
-    "Importer.mmd_anim_importer.desc": "MMDアニメーション（.vmd）をインポート",
-    "Importer.mmd_anim_importer.label": "MMDアニメーション",
-    "Importing.importer_search_term": "https://search.brave.com/search?q=blender+{extension}+importer+addon&source=web",
-    "Importing.need_importer": "{extension}タイプに必要なインポーターがありません！インポーター検索用にウェブブラウザを開きます...",
-    "Language.auto": "自動",
-    "Language.en_US": "English",
-    "Language.ja_JP": "日本語",
-    "Optimization.applying_transforms": "トランスフォームを適用中...",
-    "Optimization.cleaning_material_names": "マテリアル名を整理中...",
-    "Optimization.cleaning_material_slots": "マテリアルスロットを整理中...",
-    "Optimization.clearing_unused_data": "未使用データを削除中...",
-    "Optimization.materials_optimization_report": "マテリアル最適化完了：{num_combined}個のマテリアルを結合、{num_cleaned_slots}個のマテリアルスロットを整理、{num_cleaned_names}個のマテリアル名を整理、{num_removed_data_blocks}個の未使用データブロックを削除しました",
-    "Optimization.combine_materials.desc": "描画コールを減らしパフォーマンスを向上させるため、類似したマテリアルを結合",
-    "Optimization.combine_materials.label": "マテリアルを結合",
-    "Optimization.consolidating_materials": "マテリアルを統合中...",
-    "Optimization.finalizing": "最終処理中...",
-    "Optimization.fixing_uv_coordinates": "UV座標を修正中...",
-    "Optimization.join_all_meshes.desc": "描画コールを減らすため、すべてのメッシュを1つのオブジェクトに結合",
-    "Optimization.join_all_meshes.label": "すべてのメッシュを結合",
-    "Optimization.join_error": "メッシュ結合中にエラーが発生",
-    "Optimization.join_operation_failed": "結合操作に失敗しました",
-    "Optimization.join_selected_meshes.desc": "選択したメッシュのみを1つのオブジェクトに結合",
-    "Optimization.join_selected_meshes.label": "選択したメッシュを結合",
-    "Optimization.joinmeshes.label": "メッシュの結合：",
-    "Optimization.joining_meshes": "メッシュを結合中...",
-    "Optimization.label": "最適化",
-    "Optimization.material_attribute_mismatch": "マテリアル{material_name}の属性が一致しません。スキップします",
-    "Optimization.materials_combined": "{num_combined}個のマテリアルを結合しました",
-    "Optimization.meshes_joined": "メッシュの結合に成功しました",
-    "Optimization.no_armature_selected": "アーマチュアが選択されていません",
-    "Optimization.no_mesh_selected": "メッシュオブジェクトが選択されていません",
-    "Optimization.no_meshes_found": "選択したアーマチュアにメッシュが見つかりません",
-    "Optimization.options.label": "最適化：",
-    "Optimization.preparing_meshes": "メッシュを準備中...",
-    "Optimization.processing_mesh_no_shapekeys": "シェイプキーのないメッシュ「{mesh_name}」を処理中",
-    "Optimization.processing_shapekey": "メッシュ「{mesh_name}」のシェイプキー「{shapekeyname}」を処理中",
-    "Optimization.remove_doubles_completed": "重複頂点の削除が完了しました",
-    "Optimization.remove_doubles_safely.desc": "口の形状などの重要な特徴を保持しながら重複頂点を削除します。\n素早い解決策ですが、動く頂点は結合しません。",
-    "Optimization.remove_doubles_safely.label": "安全に重複頂点を削除",
-    "Optimization.remove_doubles_safely_advanced.label": "高度な安全重複頂点削除",
-    "Optimization.remove_doubles_safely_advanced.desc": "口の形状などの重要な特徴を保持しながら重複頂点を削除します。\n基本版と異なり、動く頂点も結合しますがシェイプキーは保持します。\n例：唇を閉じることはありませんが、唇を構成する分割されたポリゴンは修正します。",
-    "UVTools.align_uv_to_target.warning.too_much": "エラー！選択が多すぎます。2つのエッジを選択していますか？",
-    "UVTools.align_uv_to_target.warning.need_a_line": "各選択オブジェクトにUVポイントの1行が必要です。オブジェクト「{obj}」がこの要件を満たしていません！",
-    "avatar_toolkit.align_uv_edges_to_target.label": "UVエッジをターゲットに合わせる",
-    "avatar_toolkit.align_uv_edges_to_target.desc": "選択された各メッシュのUVポイントの線をアクティブメッシュの選択されたUVポイントの線に合わせます。\nあるモデルのテクスチャを別のモデルに適用する際に便利です。\n2Dカーソルからの距離を使用して各メッシュのUVポイントの線の開始点を識別します。",
-    "Quick_Access.selected_armature.label": "選択されたアーマチュア",
-    "Quick_Access.selected_armature.desc": "Avatar Toolkitの操作対象となる現在の「ターゲット」アーマチュア",
-    "Quick_Access.export": "エクスポート",
-    "Quick_Access.export_fbx.desc": "モデルをFBXとしてエクスポート",
-    "Quick_Access.export_fbx.label": "FBXエクスポート",
-    "Quick_Access.export_menu.desc": "サポートされている形式にエクスポート",
-    "Quick_Access.export_menu.label": "エクスポートメニュー",
-    "Quick_Access.import": "インポート",
-    "Quick_Access.import_export.label": "インポート/エクスポート：",
-    "Quick_Access.import_menu.desc": "モデルをインポート",
-    "Quick_Access.import_menu.label": "インポートメニュー",
-    "Quick_Access.import_pmd": "PMDインポート",
-    "Quick_Access.import_pmd.desc": "MMD PMDモデルをインポート",
-    "Quick_Access.import_pmx": "PMXインポート",
-    "Quick_Access.import_pmx.desc": "MMD PMXモデルをインポート",
-    "Quick_Access.import_success": "モデルのインポートに成功しました",
-    "Quick_Access.label": "クイックアクセス",
-    "Quick_Access.options": "クイックアクセス：",
-    "Quick_Access.select_armature": "アーマチュアを選択：",
-    "Quick_Access.apply_armature_failed": "シェイプキーの結合段階でポーズをアーマチュアに適用できませんでした！",
-    "Quick_Access.apply_pose_as_rest.desc": "現在のポーズをデフォルトの休止ポーズにします。",
-    "Quick_Access.stop_pose_mode.desc": "ポーズモードを終了し、ポーズモードの全ての表示ボーンのポーズをクリアします。",
-    "Quick_Access.apply_pose_as_rest.label": "ポーズを休止ポーズとして適用",
-    "Quick_Access.apply_pose_as_shapekey.desc": "現在のポーズを後で有効化できるシェイプキーとして作成します。\n顎の開閉位置を顔の動きのシェイプキーとして適用する際に便利です。",
-    "Quick_Access.apply_pose_as_shapekey.label": "ポーズをシェイプキーとして適用",
-    "Quick_Access.stop_pose_mode.label": "ポーズモードを終了",
-    "Quick_Access.start_pose_mode.desc": "Avatar Toolkitのターゲットアーマチュアのポーズモードを開始します。",
-    "Quick_Access.start_pose_mode.label": "ポーズモードを開始",
-    "Quick_Access.select_export.label": "エクスポート方法を選択",
-    "Quick_Access.select_export_resonite.label": "Resonite",
-    "Settings.label": "設定",
-    "Settings.language.desc": "アドオンのUI言語を選択",
-    "Settings.language.label": "言語：",
-    "Settings.translation_restart_popup.description": "翻訳の更新について",
-    "Settings.translation_restart_popup.label": "翻訳の更新",
-    "Settings.translation_restart_popup.message1": "一部の翻訳はBlenderを再起動するまで",
-    "Settings.translation_restart_popup.message2": "適用されない場合があります。",
-    "TextureAtlas.atlas_completed": "テクスチャアトラスの作成が完了しました",
-    "TextureAtlas.atlas_error": "テクスチャアトラスの作成中にエラーが発生しました",
-    "TextureAtlas.atlas_materials": "マテリアルをアトラス化",
-    "TextureAtlas.atlas_materials_desc": "モデルを最適化するためにマテリアルをアトラス化",
-    "TextureAtlas.label": "テクスチャアトラス",
-    "TextureAtlas.loaded_list": "テクスチャアトラスマテリアルリストを読み込みました",
-    "TextureAtlas.material_list_label": "テクスチャアトラスマテリアルリストのマテリアル",
-    "TextureAtlas.reload_list": "テクスチャアトラスマテリアルリストを再読み込み",
-    "Tools.bones_translated_success": "すべてのボーンを正常にヒューマノイド名に変換しました",
-    "Tools.bones_translated_with_fails": "{translate_bone_fails}個のボーンをヒューマノイド名に変換できませんでした。名前に「<noik>」を追加します。",
-    "Tools.convert_to_resonite.desc": "モデルのボーン名をResonite互換の名前に変換",
-    "Tools.convert_to_resonite.label": "Resoniteに変換",
-    "Tools.create_digitigrade_legs.desc": "選択したボーンチェーンから獣脚を作成",
-    "Tools.create_digitigrade_legs.label": "獣脚を作成",
-    "Tools.digitigrade_legs.error.bone_format": "ボーンの形式が正しくありません！4つの連続したボーンのチェーンを選択してください！",
-    "Tools.digitigrade_legs.success": "獣脚の作成に成功しました",
-    "Tools.import_any_model.desc": "FBX、SMD、DMX、GLTF、PMD、PMXなど、サポートされているモデルをインポート",
-    "Tools.import_any_model.label": "モデルをインポート",
-    "Tools.label": "ツール",
-    "Tools.no_armature_selected": "アーマチュアが選択されていません",
-    "Tools.select_armature": "アーマチュアを選択してください",
-    "Tools.tools_title.label": "ツール：",
-    "Tools.separate_by.label": "分離方法：",
-    "Tools.separate_by_materials.label": "マテリアルで分離",
-    "Tools.separate_by_materials.desc": "選択したメッシュをマテリアルで分離",
-    "Tools.separate_by_materials.success": "メッシュをマテリアルで分離しました",
-    "Tools.separate_by_loose_parts.label": "分離パーツで分離",
-    "Tools.separate_by_loose_parts.desc": "選択したメッシュを分離パーツで分離",
-    "Tools.separate_by_loose_parts.success": "メッシュを分離パーツで分離しました",
-    "Tools.apply_transforms.label": "トランスフォームを適用",
-    "Tools.apply_transforms.desc": "アーマチュアとそのメッシュに位置、回転、スケールを適用",
-    "Tools.apply_transforms.invalid_armature": "無効なアーマチュアが選択されています",
-    "Tools.apply_transforms.success": "アーマチュアとメッシュにトランスフォームを適用しました",
-    "Tools.remove_unused_shapekeys.label": "未使用のシェイプキーを削除",
-    "Tools.remove_unused_shapekeys.tolerance.desc": "シェイプキーを保持する最小の頂点移動量\n（任意の座標での位置）",
-    "Tools.remove_unused_shapekeys.desc": "何も動かさないシェイプキーを削除します。\nカテゴリーシェイプキーは削除しません。\n（例：名前に「~」「-」「=」を含むもの）",
-    "Tools.remove_unused_shapekeys.tolerance.label": "位置の許容値",
-    "Tools.apply_shape_key.label": "シェイプキーをベースに適用",
-    "Tools.apply_shape_key.desc": "選択したシェイプキーをベースに適用し、デフォルトでオンにします。",
-    "Tools.apply_shape_key.error": "シェイプキーが何らかの理由でマージされませんでした！",
-    "Tools.remove_zero_weight_bones.success": "ウェイトのないボーンを削除しました",
-    "Tools.remove_zero_weight_bones.label": "ウェイトのないボーンを削除",
-    "Tools.remove_zero_weight_bones.desc": "閾値以下のウェイトを持つボーンをアーマチュアから削除します。",
-    "Tools.merge_bones_to_active.delete_old.desc": "マージ時に古いボーンを削除します。",
-    "Tools.merge_bones_to_active.delete_old.label": "古いボーンを削除",
-    "Tools.merge_bones_to_active.desc": "選択したボーンをアクティブなボーン（青または橙色で選択）にマージします。",
-    "Tools.merge_bones_to_active.label": "ボーンをアクティブなものにマージ",
-    "Tools.merge_bones_to_parents.delete_old.desc": "マージ時に古いボーンを削除します。",
-    "Tools.merge_bones_to_parents.delete_old.label": "古いボーンを削除",
-    "Tools.merge_bones_to_parents.desc": "選択した各ボーンをそれぞれの親ボーンにマージします。",
-    "Tools.merge_bones_to_parents.label": "ボーンを個別の親にマージ",
-    "Tools.remove_zero_weight_bones.threshold.label": "ウェイトの閾値",
-    "Tools.remove_zero_weight_bones.threshold.desc": "アーマチュア下のメッシュのどの部分にもこの閾値以上のウェイトがないボーンは削除されます",
-    "Tools.connect_bones.label": "ボーンを接続",
-    "Tools.bone_tools.label": "ボーンツール",
-    "Tools.additional_tools.label": "追加ツール",
-    "Tools.merge_twist_bones.label": "ツイストボーンをマージ",
-    "Tools.merge_twist_bones.desc": "ツイストボーンを親ボーンにマージ",
-    "Tools.connect_bones.desc": "ボーンをそれぞれの子ボーンと接続",
-    "Tools.connect_bones.invalid_armature": "無効なアーマチュアが選択されています",
-    "Tools.connect_bones.min_distance.label": "最小距離",
-    "Tools.connect_bones.min_distance.desc": "ボーンを接続する最小距離",
-    "Tools.connect_bones.success": "{bones_connected}個のボーンを接続しました",
-    "Tools.delete_bone_constraints.label": "ボーンの制約を削除",
-    "Tools.delete_bone_constraints.desc": "アーマチュアのボーンから全ての制約を削除",
-    "Tools.delete_bone_constraints.invalid_armature": "無効なアーマチュアが選択されています",
-    "Tools.delete_bone_constraints.success": "ボーンから{constraints_removed}個の制約を削除しました",
-    "Tools.convert_rigify_to_unity.label": "RigifyをUnityに変換",
-    "Tools.convert_rigify_to_unity.desc": "RigifyアーマチュアをUnityで使用できるように準備",
-    "Tools.convert_rigify_to_unity.success": "RigifyアーマチュアをUnity用に変換しました",
-    "VisemePanel.create_visemes": "ビセムを作成",
-    "VisemePanel.creating_viseme": "ビセムを作成中：{viseme_name}",
-    "VisemePanel.creating_viseme_detail": "ビセムを作成中：{viseme_name}",
-    "VisemePanel.creating_visemes": "ビセムを作成中...",
-    "VisemePanel.error.noArmature": "アーマチュアが選択されていません",
-    "VisemePanel.error.noMesh": "メッシュが選択されていません",
-    "VisemePanel.error.noShapekeys": "選択したメッシュにシェイプキーがありません",
-    "VisemePanel.error.selectMesh": "ビセムを作成するメッシュを選択してください",
-    "VisemePanel.info.selectMesh": "ビセムを作成するメッシュを選択してください",
-    "VisemePanel.label": "ビセム",
-    "VisemePanel.mixing_shape": "シェイプを混合中：{shape_name} 値：{value}",
-    "VisemePanel.mouth_a.desc": "'A'の口の形のシェイプキー",
-    "VisemePanel.mouth_a.label": "口 A",
-    "VisemePanel.mouth_ch.desc": "'CH'の口の形のシェイプキー",
-    "VisemePanel.mouth_ch.label": "口 CH",
-    "VisemePanel.mouth_o.desc": "'O'の口の形のシェイプキー",
-    "VisemePanel.mouth_o.label": "口 O",
-    "VisemePanel.removing_existing_viseme": "既存のビセムを削除中：{viseme_name}",
-    "VisemePanel.removing_existing_visemes": "既存のビセムを削除中...",
-    "VisemePanel.select_mesh": "メッシュを選択",
-    "VisemePanel.selected_mesh.label": "選択されたメッシュ",
-    "VisemePanel.selected_mesh.desc": "ビセム操作用に現在選択されているメッシュ",
-    "VisemePanel.selected_shapes": "選択されたシェイプ：A={shape_a}, O={shape_o}, CH={shape_ch}",
-    "VisemePanel.shape_intensity": "シェイプの強度",
-    "VisemePanel.shape_intensity_desc": "ビセムシェイプキーの強度",
-    "VisemePanel.sorting_shapekeys": "シェイプキーを並べ替え中...",
-    "VisemePanel.start_viseme_creation": "ビセム作成を開始...",
-    "VisemePanel.viseme_created_successfully": "ビセム{viseme_name}の作成に成功しました",
-    "VisemePanel.viseme_creation_completed": "ビセム作成が完了しました。",
-    "MergeArmatures.select_armature": "アーマチュアを選択してください",
-    "MergeArmatures.title.label": "アーマチュアのマージ：",
-    "MergeArmatures.label": "アーマチュアをマージ",
-    "MergeArmatures.selected_armature.label": "マージ元のアーマチュア",
-    "MergeArmatures.selected_armature.desc": "Avatar Toolkitのターゲットアーマチュアにマージされるアーマチュア",
-    "MergeArmatures.target_armature.label": "マージ先のアーマチュア",
-    "MergeArmatures.target_armature.desc": "アーマチュアのマージ先となるターゲットアーマチュア",
-    "MergeArmature.merge_armatures.label": "アーマチュアをマージ",
-    "MergeArmature.merge_armatures.desc": "{selected_armature_label}をAvatar Toolkitのターゲットアーマチュアにマージ",
-    "MergeArmature.merge_armatures.align_bones.label": "ボーンを整列",
-    "MergeArmature.merge_armatures.align_bones.desc": "マージ前にソースアーマチュアのボーンをターゲットアーマチュアに合わせて\nボーンを伸縮させます。",
-    "MergeArmature.merge_armatures.apply_transforms.label": "トランスフォームを適用",
-    "MergeArmature.merge_armatures.apply_transforms.desc": "マージ前にアーマチュアとそのメッシュにトランスフォームを適用します。",
-    "MMDOptions.optimize_armature.label": "アーマチュアを最適化",
-    "MMDOptions.optimize_armature.desc": "ボーンのロールの修正、ボーンの整列、ボーンの接続などでアーマチュアを最適化",
-    "MMDOptions.fixing_bone_rolls": "ボーンのロールを修正中",
-    "MMDOptions.aligning_bones": "ボーンを整列中",
-    "MMDOptions.connecting_bones": "ボーンを接続中",
-    "MMDOptions.deleting_bone_constraints": "ボーンの制約を削除中",
-    "MMDOptions.merging_bones_to_parents": "ボーンを親にマージ中",
-    "MMDOptions.reordering_bones": "ボーンを並べ替え中",
-    "MMDOptions.fixing_armature_names": "アーマチュア名を修正中",
-    "MMDOptions.renaming_bones": "ボーン名を変更中",
-    "MMDOptions.armature_optimization_complete": "アーマチュアの最適化が完了しました",
-    "MMDOptions.convert_materials.label": "マテリアルを変換",
-    "MMDOptions.convert_materials.desc": "マテリアルをPrincipled BSDFシェーダーを使用するように変換し、MMDとVRMシェーダーを修正",
-    "MMDOptions.converting_materials": "{name}のマテリアルを変換中",
-    "MMDOptions.title": "MMDオプション",
-    "MMDOptions.no_armature_selected": "アーマチュアが選択されていません",
-    "MMDOptions.label": "MMDオプション",
-    "MMDOptions.cleanup_mesh.label": "メッシュのクリーンアップ",
-    "MMDOptions.cleanup_mesh.desc": "空のオブジェクト、未使用の頂点グループ、未使用の頂点、空のシェイプキーを削除してメッシュをクリーンアップ",
-    "MMDOptions.removing_empty_objects": "空のオブジェクトを削除中",
-    "MMDOptions.removing_unused_vertex_groups": "未使用の頂点グループを削除中",
-    "MMDOptions.removing_unused_vertices": "未使用の頂点を削除中",
-    "MMDOptions.removing_empty_shape_keys": "空のシェイプキーを削除中",
-    "MMDOptions.optimize_weights.label": "ウェイトを最適化",
-    "MMDOptions.optimize_weights.desc": "頂点あたりのウェイト数を制限してウェイトを最適化",
-    "MMDOptions.max_weights.label": "最大ウェイト数",
-    "MMDOptions.max_weights.desc": "頂点あたりの最大ウェイト数",
-    "MMDOptions.merging_weights": "ウェイトを結合中",
-    "MMDOptions.removing_zero_weight_bones": "ウェイトのないボーンを削除中",
-    "MMDOptions.limiting_vertex_weights": "頂点ウェイトを制限中",
-    "MMDOptions.weight_optimization_complete": "ウェイトの最適化が完了しました",
+    "AvatarToolkit.label": "アバターツールキット (Alpha 0.1.1)",
+    "AvatarToolkit.desc1": "アバターツールキットは早期アクセス中で",
+    "AvatarToolkit.desc2": "問題が発生する可能性があります。問題を見つけた場合は、",
+    "AvatarToolkit.desc3": "GitHubで報告してください。",
+
     "Updater.label": "アップデーター",
     "Updater.CheckForUpdateButton.label": "アップデートを確認",
     "Updater.CheckForUpdateButton.label_alt": "利用可能なアップデートはありません",
     "Updater.UpdateToLatestButton.label": "{name}にアップデート",
     "Updater.UpdateToSelectedButton.label": "アップデート",
-    "Updater.currentVersion": "現在のバージョン：{name}",
+    "Updater.currentVersion": "現在のバージョン: {name}",
+    "Updater.selectVersion": "バージョンを選択",
     "Updater.CheckForUpdateButton.desc": "利用可能なアップデートを確認",
     "UpdateToLatestButton.desc": "最新バージョンにアップデート",
     "UpdateNotificationPopup.label": "アップデート通知",
-    "UpdateNotificationPopup.desc": "利用可能なアップデートについての通知",
-    "UpdateNotificationPopup.newUpdate": "新しいアップデートが利用可能：{version}",
+    "UpdateNotificationPopup.desc": "利用可能なアップデートの通知",
+    "UpdateNotificationPopup.newUpdate": "新しいアップデートが利用可能: {version}",
     "RestartBlenderPopup.label": "Blenderを再起動",
     "RestartBlenderPopup.desc": "アップデートを完了するためにBlenderを再起動",
-    "RestartBlenderPopup.message": "アップデートが成功しました！Blenderを再起動してください。",
+    "RestartBlenderPopup.message": "アップデート成功！Blenderを再起動してください。",
     "check_for_update.cantCheck": "アップデートを確認できません",
     "download_file.cantConnect": "アップデートサーバーに接続できません",
     "download_file.cantFindZip": "アップデートファイルが見つかりません",
-    "download_file.cantFindAvatarToolkit": "アップデートパッケージ内にAvatar Toolkitファイルが見つかりません",
-    "CreditsSupport.label": "クレジット＆サポート",
-    "CreditsSupport.credits_title": "クレジット",
-    "CreditsSupport.credits_text1": "Avatar Toolkitは以下のNeonekoチームによって作成されました：",
-    "CreditsSupport.credits_text2": "YusarinaとOnan989",
-    "CreditsSupport.credits_text3": "一部のコードはCats Blender Pluginを参考にしています。",
-    "CreditsSupport.credits_text4": "元のプラグインの貢献者に感謝します。",
-    "CreditsSupport.support_text1": "私たちの活動を支援したい場合は、",
-    "CreditsSupport.support_text2": "pally.ggページで寄付/投げ銭ができます。",
-    "CreditsSupport.support_title": "サポートする",
-    "CreditsSupport.support_button": "サポートする",
-    "CreditsSupport.help_title": "ヘルプが必要ですか？",
-    "CreditsSupport.help_text1": "まずはWikiをご確認ください。さらなるサポートを",
-    "CreditsSupport.help_text2": "求める前にWikiを読むことを強くお勧めします。",
-    "CreditsSupport.wiki_button": "Wiki",
-    "CreditsSupport.discord_button": "Discordに参加",
-    "TextureAtlas.include_in_atlas": "アトラスに含める",
-    "TextureAtlas.include_in_atlas_desc": "このマテリアルをテクスチャアトラスに含める",
+    "download_file.cantFindAvatarToolkit": "アップデートパッケージにAvatarToolkitファイルが見つかりません",
+
+    "QuickAccess.label": "クイックアクセス",
+    "QuickAccess.select_armature": "アーマチュアを選択",
+    "QuickAccess.valid_armature": "有効なアーマチュア",
+    "QuickAccess.bones_count": "ボーン数: {count}",
+    "QuickAccess.pose_bones_available": "ポーズボーン: 利用可能",
+    "QuickAccess.pose_controls": "ポーズコントロール",
+    "QuickAccess.import_export": "インポート/エクスポート",
+    "QuickAccess.import": "インポート",
+    "QuickAccess.export": "エクスポート",
+    "QuickAccess.export_fbx": "FBXエクスポート",
+    "QuickAccess.export_resonite": "Resoniteにエクスポート",
+    "QuickAccess.start_pose_mode.label": "ポーズモード開始",
+    "QuickAccess.start_pose_mode.desc": "選択したアーマチュアのポーズモードに入る",
+    "QuickAccess.stop_pose_mode.label": "ポーズモード終了",
+    "QuickAccess.stop_pose_mode.desc": "ポーズモードを終了し、変形をクリア",
+    "QuickAccess.apply_pose_as_shapekey.label": "ポーズをシェイプキーとして適用",
+    "QuickAccess.apply_pose_as_shapekey.desc": "現在のポーズから新しいシェイプキーを作成",
+    "QuickAccess.apply_pose_as_rest.label": "ポーズを初期位置として適用",
+    "QuickAccess.apply_pose_as_rest.desc": "現在のポーズを初期位置として適用",
+    "QuickAccess.apply_armature_failed": "アーマチュアの修正の適用に失敗しました",
+    "QuickAccess.validation_basic_warning": "基本的な検証のみ有効",
+    "QuickAccess.validation_basic_details": "基本的なボーン構造のみ検証しています",
+    "QuickAccess.validation_none_warning": "検証無効",
+    "QuickAccess.validation_none_details": "アーマチュアの検証は行われていません",
+
+    "PoseMode.error.start": "ポーズモードの開始に失敗: {error}",
+    "PoseMode.error.stop": "ポーズモードの終了に失敗: {error}",
+    "PoseMode.error.shapekey": "ポーズをシェイプキーとして適用に失敗: {error}",
+    "PoseMode.error.rest_pose": "ポーズを初期位置として適用に失敗: {error}",
+    "PoseMode.shapekey.name": "シェイプキー名",
+    "PoseMode.shapekey.description": "新しいシェイプキーの名前",
+    "PoseMode.shapekey.default": "ポーズ_シェイプキー",
+    "PoseMode.skipped_meshes": "一部のメッシュがスキップされました:\n{message}",
+    "PoseMode.basis": "基準",
+
+    "Armature.validation.no_armature": "アーマチュアが選択されていません",
+    "Armature.validation.not_armature": "選択されたオブジェクトはアーマチュアではありません",
+    "Armature.validation.no_bones": "アーマチュアにボーンがありません",
+    "Armature.validation.basic_check_failed": "基本的なアーマチュアの検証に失敗しました",
+    "Armature.validation.missing_bones": "必須ボーンが不足: {bones}",
+    "Armature.validation.invalid_hierarchy": "{parent}と{child}の間のボーン階層が無効です",
+    "Armature.validation.asymmetric_bones": "{bone}の対称ボーンが不足しています",
+    "Armature.validation.asymmetric_hand_wrist": "手首/手のボーンの対称性が不足しています",
+
+    "Mesh.validation.no_data": "メッシュデータがありません",
+    "Mesh.validation.no_vertex_groups": "頂点グループが見つかりません",
+    "Mesh.validation.no_armature_modifier": "アーマチュアモディファイアがありません",
+    "Mesh.validation.valid": "ポーズ操作に有効なメッシュです",
+
+    "Operation.pose_applied": "ポーズが正常に適用されました",
+
     "Scene.avatar_toolkit_updater_version_list.name": "バージョンリスト",
-    "Scene.avatar_toolkit_updater_version_list.description": "アップデート可能なバージョンのリスト",
-    "TextureAtlas.albedo": "アルベド",
-    "TextureAtlas.normal": "法線",
-    "TextureAtlas.emission": "発光",
-    "TextureAtlas.ambient_occlusion": "アンビエントオクルージョン",
-    "TextureAtlas.height": "ハイト",
-    "TextureAtlas.roughness": "ラフネス",
-    "TextureAtlas.error.label": "エラー",
-    "TextureAtlas.none.label": "なし",
-    "TextureAtlas.no_nodes_error.desc": "このマテリアルはノードを使用していません！",
-    "TextureAtlas.no_images_error.desc": "このマテリアルには画像がありません！",
-    "TextureAtlas.texture_use_atlas.desc": "{name}マップアトラスに使用するテクスチャ",
-    "TextureAtlas.no_materials_selected": "アトラス用のマテリアルが選択されていません",
-    "Optimization.select_armature": "アーマチュアを選択してください",
-    "CheckForUpdateButton.label": "アップデートを確認",
-    "CheckForUpdateButton.desc": "利用可能なアップデートを確認",
-    "UpdateToLatestButton.label": "最新バージョンにアップデート"
+    "Scene.avatar_toolkit_updater_version_list.description": "利用可能なバージョンのリスト",
+
+    "Optimization.label": "最適化",
+    "Optimization.materials_title": "マテリアル",
+    "Optimization.cleanup_title": "メッシュクリーンアップ",
+    "Optimization.join_meshes_title": "メッシュ結合",
+    "Optimization.combine_materials": "マテリアルを結合",
+    "Optimization.combine_materials_desc": "類似したマテリアルを結合してドローコールを減らす",
+    "Optimization.remove_doubles": "重複頂点を削除",
+    "Optimization.remove_doubles_desc": "重複した頂点を削除",
+    "Optimization.remove_doubles_advanced": "高度な設定",
+    "Optimization.remove_doubles_advanced_desc": "高度なオプションで重複頂点を削除",
+    "Optimization.join_all_meshes": "すべて結合",
+    "Optimization.join_all_meshes_desc": "シーン内のすべてのメッシュを結合",
+    "Optimization.join_selected_meshes": "選択を結合",
+    "Optimization.join_selected_meshes_desc": "選択したメッシュのみを結合",
+    "Optimization.no_meshes": "最適化するメッシュが見つかりません",
+    "Optimization.materials_combined": "{combined}個のマテリアルを結合し、{cleaned}個のスロットをクリーンアップし、{removed}個の未使用データブロックを削除しました",
+    "Optimization.error.combine_materials": "マテリアルの結合に失敗: {error}",
+    "Optimization.materials_total": "合計マテリアル数: {count}",
+    "Optimization.materials_duplicates": "重複の可能性: {count}",
+    "Optimization.no_materials": "メッシュにマテリアルが見つかりません",
+    "Optimization.error.consolidation": "マテリアルの統合に失敗しました。コンソールで詳細を確認してください",
+    "Optimization.combining_materials": "類似したマテリアルを結合中...",
+    "Optimization.cleaning_slots": "マテリアルスロットをクリーニング中...",
+    "Optimization.removing_unused": "未使用のマテリアルを削除中...",
+    "Optimization.selecting_meshes": "メッシュを選択中...",
+    "Optimization.joining_meshes": "メッシュを結合中...",
+    "Optimization.applying_transforms": "変形を適用中...",
+    "Optimization.fixing_uvs": "UV座標を修正中...",
+    "Optimization.finalizing": "完了処理中...",
+    "Optimization.meshes_joined": "すべてのメッシュが正常に結合されました",
+    "Optimization.selected_meshes_joined": "選択したメッシュが正常に結合されました",
+    "Optimization.no_mesh_selected": "メッシュが選択されていません",
+    "Optimization.select_at_least_two": "少なくとも2つのメッシュを選択してください",
+    "Optimization.error.join_meshes": "メッシュの結合に失敗: {error}",
+    "Optimization.error.join_selected": "選択したメッシュの結合に失敗: {error}",
+    "Optimization.merge_distance": "結合距離",
+    "Optimization.merge_distance_desc": "頂点を結合する距離の閾値",
+    "Optimization.remove_doubles_warning": "この処理には時間がかかる場合があります",
+    "Optimization.remove_doubles_wait": "この操作中、Blenderは応答しないように見える場合があります",
+    "Optimization.error.remove_doubles": "重複頂点の削除に失敗: {error}",
+    "Optimization.no_armature": "アーマチュアが選択されていません",
+    "Optimization.processing_mesh": "メッシュ処理中: {name}",
+    "Optimization.processing_shapekey": "シェイプキー処理中: {name}",
+    "Optimization.remove_doubles_completed": "重複頂点の削除が正常に完了しました",
+
+    "Tools.label": "ツール",
+    "Tools.general_title": "一般ツール",
+    "Tools.convert_resonite": "Resoniteに変換",
+    "Tools.convert_resonite_desc": "Resonite用にモデルを変換",
+    "Tools.convert_resonite.operation": "Resoniteに変換中",
+    "Tools.separate_title": "分離ツール",
+    "Tools.separate_materials": "マテリアルで分離",
+    "Tools.separate_materials_desc": "マテリアルごとにメッシュを分離",
+    "Tools.separate_loose": "分離パーツ",
+    "Tools.separate_loose_desc": "メッシュを分離パーツに分割",
+    "Tools.separate_materials_success": "メッシュをマテリアルごとに正常に分離しました",
+    "Tools.separate_loose_success": "メッシュを分離パーツに正常に分割しました",
+    "Tools.bone_title": "ボーンツール",
+    "Tools.create_digitigrade": "デジタイグレード脚を作成",
+    "Tools.create_digitigrade_desc": "脚をデジタイグレード設定に変換",
+    "Tools.digitigrade": "デジタイグレード脚を作成",
+    "Tools.digitigrade_desc": "選択した脚のボーンをデジタイグレード設定に変換",
+    "Tools.digitigrade_error": "デジタイグレード脚の作成に失敗: {error}",
+    "Tools.digitigrade_success": "デジタイグレード脚の設定が正常に作成されました",
+    "Tools.processing_leg": "脚のボーン処理中: {bone}",
+    "Tools.merge_twist_bones": "ツイストボーンを保持",
+    "Tools.merge_twist_bones_desc": "チェックすると、重みが0でもツイストボーンを保持します",
+    "Tools.clean_weights": "重みなしボーンを削除",
+    "Tools.clean_weights_desc": "頂点の重みがないボーンを削除",
+    "Tools.clean_constraints": "ボーンのコンストレイントを削除",
+    "Tools.clean_constraints_desc": "アーマチュアからすべてのボーンコンストレイントを削除",
+    "Tools.clean_constraints_success": "{count}個のボーンコンストレイントを削除しました",
+    "Tools.processing_bone_constraints": "ボーンのコンストレイント削除中: {bone}",
+    "Tools.clean_weights_success": "{count}個の重みなしボーンを削除しました",
+    "Tools.clean_weights_threshold": "重みの閾値",
+    "Tools.clean_weights_threshold_desc": "ボーンに重みがあると判断する最小値",
+    "Tools.merge_title": "結合ツール",
+    "Tools.merge_to_active": "アクティブに結合",
+    "Tools.merge_to_active_desc": "選択したボーンをアクティブなボーンに結合",
+    "Tools.merge_to_parent": "親に結合",
+    "Tools.merge_to_parent_desc": "ボーンをそれぞれの親ボーンに結合",
+    "Tools.connect_bones": "ボーンを接続",
+    "Tools.connect_bones_desc": "チェーン内の未接続のボーンを接続",
+    "Tools.additional_title": "追加ツール",
+    "Tools.apply_transforms": "変形を適用",
+    "Tools.apply_transforms_desc": "オブジェクトのすべての変形を適用",
+    "Tools.clean_shapekeys": "未使用のシェイプキーを削除",
+    "Tools.clean_shapekeys_desc": "メッシュから未使用のシェイプキーを削除",
+    "Tools.bones_translated_success": "すべてのボーンが正常に変換されました",
+    "Tools.bones_translated_with_fails": "変換完了（{translate_bone_fails}個のボーンは未変換）",
+    "Tools.storing_transforms": "ボーンの変形を保存中...",
+    "Tools.analyzing_weights": "頂点の重みを分析中...",
+    "Tools.removing_bones": "重みのないボーンを削除中...",
+    "Tools.verifying_hierarchy": "ボーン階層を検証中...",
+    "Tools.connect_bones_min_distance": "最小距離",
+    "Tools.connect_bones_min_distance_desc": "ボーンを接続する最小距離",
+    "Tools.connect_bones_success": "{count}個のボーンを接続しました",
+    "Tools.merge_weights_threshold": "重み転送閾値",
+    "Tools.merge_weights_threshold_desc": "ボーン結合時に転送する最小重み値",
+    "Tools.no_bones_selected": "結合するボーンが選択されていません",
+    "Tools.no_bones_with_parent": "親を持つ選択ボーンが見つかりません",
+    "Tools.merge_to_active_success": "{count}個のボーンをアクティブボーンに正常に結合しました",
+    "Tools.merge_to_parent_success": "{count}個のボーンを親ボーンに正常に結合しました",
+    "Tools.transforms_applied": "変形が正常に適用されました",
+    "Tools.shapekey_tolerance": "シェイプキーの許容値",
+    "Tools.shapekey_tolerance_desc": "シェイプキーを使用済みと判断する最小差分",
+    "Tools.shapekeys_removed": "{count}個の未使用シェイプキーを削除しました",
+
+    "MMD.label": "MMDツール",
+    "MMD.bone_standardization": "ボーン標準化",
+    "MMD.weight_processing": "ウェイト処理",
+    "MMD.hierarchy": "ボーン階層",
+    "MMD.cleanup": "クリーンアップ",
+    "MMD.no_armature": "アーマチュアが選択されていません",
+    "MMD.no_meshes": "メッシュが見つかりません",
+    "MMD.validation.rigify_unsupported": "Rigifyアーマチュアはサポートされていません",
+    "MMD.validation.multi_user_mesh": "複数ユーザーメッシュが検出されました: {mesh}",
+    "MMD.bones_standardized": "ボーンが正常に標準化されました",
+    "MMD.weights_processed": "ウェイトが正常に処理されました",
+    "MMD.hierarchy_fixed": "ボーン階層が正常に修正されました",
+    "MMD.hierarchy_validation_warning": "一部の階層関係を検証できませんでした",
+    "MMD.cleanup_completed": "アーマチュアのクリーンアップが完了しました",
+    "MMD.process_twist_bones": "ツイストボーンを処理",
+    "MMD.process_twist_bones_desc": "ツイストボーンの重みを親ボーンに転送",
+    "MMD.connect_bones": "ボーンを接続",
+    "MMD.connect_bones_desc": "適切な場所でボーンチェーンを接続",
+
+    "Visemes.panel_label": "ビセーム",
+    "Visemes.shape_selection": "シェイプキー選択",
+    "Visemes.controls": "ビセームコントロール",
+    "Visemes.no_shapekeys": "シェイプキーのあるメッシュを選択してください",
+    "Visemes.mouth_a": "A形状",
+    "Visemes.mouth_a_desc": "'A'音のシェイプキー",
+    "Visemes.mouth_o": "O形状",
+    "Visemes.mouth_o_desc": "'O'音のシェイプキー",
+    "Visemes.mouth_ch": "CH形状",
+    "Visemes.mouth_ch_desc": "'CH'音のシェイプキー",
+    "Visemes.shape_intensity": "形状の強度",
+    "Visemes.shape_intensity_desc": "ビセーム形状の強度乗数",
+    "Visemes.start_preview": "プレビュー開始",
+    "Visemes.stop_preview": "プレビュー停止",
+    "Visemes.preview_mode_desc": "ビセームプレビューモードの切り替え",
+    "Visemes.preview_selection": "プレビュー選択",
+    "Visemes.preview_selection_desc": "プレビューするビセームを選択",
+    "Visemes.preview_label": "ビセームプレビュー",
+    "Visemes.preview_desc": "ビューポートでビセーム形状をプレビュー",
+    "Visemes.create_label": "ビセームを作成",
+    "Visemes.create_desc": "VRCビセームシェイプキーを作成",
+    "Visemes.error.no_shapekeys": "メッシュにシェイプキーがありません",
+    "Visemes.error.select_shapekeys": "A、O、CHのシェイプキーを選択してください",
+    "Visemes.success": "ビセームが正常に作成されました",
+    "Visemes.mesh_select": "メッシュを選択",
+    "Visemes.mesh_select_desc": "ビセームを作成するメッシュを選択",
+
+    "EyeTracking.label": "アイトラッキング",
+    "EyeTracking.setup": "アイトラッキング設定",
+    "EyeTracking.mesh_select": "メッシュ選択",
+    "EyeTracking.bones": "ボーン選択",
+    "EyeTracking.head_bone": "頭部ボーン",
+    "EyeTracking.eye_left": "左目ボーン",
+    "EyeTracking.eye_right": "右目ボーン",
+    "EyeTracking.shapekeys": "シェイプキー選択",
+    "EyeTracking.options": "オプション",
+    "EyeTracking.rotation": "目の回転",
+    "EyeTracking.rotation.x": "垂直回転",
+    "EyeTracking.rotation.y": "水平回転",
+    "EyeTracking.adjust": "目の調整",
+    "EyeTracking.blinking": "まばたきコントロール",
+    "EyeTracking.no_shapekeys": "選択したメッシュにシェイプキーが見つかりません",
+    "EyeTracking.no_armature": "アーマチュアが選択されていません",
+    "EyeTracking.no_mesh": "メッシュが見つかりません",
+    "EyeTracking.create.label": "アイトラッキングを作成",
+    "EyeTracking.create.desc": "アイトラッキングのボーンとシェイプキーを設定",
+    "EyeTracking.testing.start.label": "テスト開始",
+    "EyeTracking.testing.start.desc": "アイトラッキングテストモードを開始",
+    "EyeTracking.testing.stop.label": "テスト停止",
+    "EyeTracking.testing.stop.desc": "アイトラッキングテストモードを終了",
+    "EyeTracking.reset.label": "アイトラッキングをリセット",
+    "EyeTracking.reset.desc": "すべてのアイトラッキング設定をリセット",
+    "EyeTracking.rotate.label": "目のボーンを回転",
+    "EyeTracking.rotate.desc": "VRChat互換性のために目のボーンを回転",
+    "EyeTracking.iris.label": "虹彩の高さを調整",
+    "EyeTracking.iris.desc": "虹彩の頂点の高さを調整",
+    "EyeTracking.blink.test.label": "まばたきテスト",
+    "EyeTracking.blink.test.desc": "まばたきのシェイプキーをテスト",
+    "EyeTracking.lowerlid.test.label": "下まぶたテスト",
+    "EyeTracking.lowerlid.test.desc": "下まぶたのシェイプキーをテスト",
+    "EyeTracking.blink.reset.label": "まばたきテストをリセット",
+    "EyeTracking.blink.reset.desc": "まばたきテストの値をリセット",
+    "EyeTracking.validation.noArmature": "シーンにアーマチュアが見つかりません",
+    "EyeTracking.validation.noMesh": "メッシュ'{mesh}'が見つかりません",
+    "EyeTracking.validation.noShapekeys": "選択したメッシュにシェイプキーがありません",
+    "EyeTracking.validation.leftEye": "左目",
+    "EyeTracking.validation.rightEye": "右目",
+    "EyeTracking.validation.missingGroups": "不足している頂点グループ: {groups}",
+    "EyeTracking.validation.missingBones": "必要なボーンが不足: {bones}",
+    "EyeTracking.validation.success": "アイトラッキング設定が正常に検証されました",
+    "EyeTracking.error.noMesh": "アイトラッキング用のメッシュが選択されていません",
+    "EyeTracking.error.noVertexGroup": "ボーン用の頂点グループが見つかりません: {bone}",
+    "EyeTracking.error.noShapeSelected": "必要なすべてのシェイプキーを選択してください",
+    "EyeTracking.success": "アイトラッキング設定が正常に完了しました",
+    "EyeTracking.mode_select": "モード選択",
+    "EyeTracking.mesh_setup": "メッシュ設定",
+    "EyeTracking.bone_setup": "ボーン設定",
+    "EyeTracking.shapekey_setup": "シェイプキー設定",
+    "EyeTracking.testing": "テストモード",
+    "EyeTracking.rotation_controls": "目の回転コントロール",
+    "EyeTracking.adjustments": "目の調整",
+    "EyeTracking.blink_testing": "まばたきテスト",
+    "EyeTracking.wink_left": "左目のウィンク",
+    "EyeTracking.wink_right": "右目のウィンク",
+    "EyeTracking.lowerlid_left": "左下まぶた",
+    "EyeTracking.lowerlid_right": "右下まぶた",
+    "EyeTracking.mode.creation": "作成モード",
+    "EyeTracking.mode.testing": "テストモード",
+    "EyeTracking.disable_blinking": "まばたきを無効化",
+    "EyeTracking.disable_movement": "目の動きを無効化",
+    "EyeTracking.distance": "目の距離",
+    "EyeTracking.distance_desc": "目の間の距離を調整",
+    "EyeTracking.mode": "アイトラッキングモード",
+    "EyeTracking.mesh_name": "メッシュ",
+    "EyeTracking.mesh_name_desc": "アイトラッキング用のメッシュを選択",
+    "EyeTracking.head_bone_desc": "頭部ボーンを選択",
+    "EyeTracking.eye_left_desc": "左目のボーンを選択",
+    "EyeTracking.eye_right_desc": "右目のボーンを選択",
+    "EyeTracking.type": "アイトラッキングタイプ",
+    "EyeTracking.type_desc": "作成するアイトラッキング設定のタイプを選択",
+    "EyeTracking.create.av3.label": "AV3アイトラッキングを作成",
+    "EyeTracking.create.av3.desc": "VRChat Avatar 3.0用のアイトラッキングを設定",
+    "EyeTracking.create.sdk2.label": "SDK2アイトラッキングを作成",
+    "EyeTracking.create.sdk2.desc": "VRChat SDK2用のアイトラッキングを設定",
+    "EyeTracking.sdk_version": "SDKバージョン",
+    "EyeTracking.type.av3": "Avatar 3.0",
+    "EyeTracking.type.av3_desc": "VRChat Avatar 3.0アイトラッキング設定",
+    "EyeTracking.type.sdk2": "SDK2（レガシー）",
+    "EyeTracking.type.sdk2_desc": "VRChat SDK2アイトラッキング設定",
+    "EyeTracking.adjust.label": "目の位置を調整",
+    "EyeTracking.adjust.desc": "頂点グループに基づいて目のボーンの位置を調整",
+
+    "CustomPanel.label": "カスタムアバターツール",
+    "CustomPanel.merge_mode": "結合モード",
+    "CustomPanel.mesh_selection": "メッシュ選択",
+    "CustomPanel.select_mesh": "メッシュを選択",
+    "CustomPanel.select_bone": "ボーンを選択",
+    "CustomPanel.select_armature": "アーマチュアを選択",
+    "CustomPanel.mode.armature": "アーマチュア",
+    "CustomPanel.mode.armature_desc": "アーマチュアを結合",
+    "CustomPanel.mode.mesh": "メッシュ",
+    "CustomPanel.mode.mesh_desc": "メッシュをアーマチュアに接続",
+
+    "AttachMesh.label": "メッシュを接続",
+    "AttachMesh.desc": "自動ウェイト設定でメッシュをアーマチュアボーンに接続",
+    "AttachMesh.search_desc": "接続するメッシュを検索",
+    "AttachMesh.select": "接続するメッシュを選択",
+    "AttachMesh.select_desc": "アーマチュアに接続するメッシュを選択",
+    "AttachMesh.success": "メッシュが正常に接続されました",
+    "AttachMesh.warn_no_armature": "アーマチュアとメッシュを選択してください",
+    "AttachMesh.validate_transforms": "メッシュの変形を検証中",
+    "AttachMesh.validate_name": "メッシュ名を検証中",
+    "AttachMesh.parent_mesh": "メッシュをアーマチュアの子に設定中",
+    "AttachMesh.setup_weights": "頂点ウェイトを設定中",
+    "AttachMesh.create_bone": "接続用ボーンを作成中",
+    "AttachMesh.position_bone": "ボーンを配置中",
+    "AttachMesh.add_modifier": "アーマチュアモディファイアを追加中",
+    "AttachMesh.error.bone_not_found": "接続ボーン'{bone}'が見つかりません",
+    "AttachMesh.error.mesh_not_found": "メッシュが見つかりません",
+    "AttachMesh.error.non_uniform_scale": "メッシュに不均一なスケールがあります。スケールを適用してください",
+    "AttachBone.search_desc": "対象のボーンを検索",
+    "AttachBone.select": "対象のボーンを選択",
+    "AttachBone.select_desc": "メッシュを接続するボーンを選択",
+
+    "MergeArmature.label": "アーマチュアの結合",
+    "MergeArmature.desc": "2つのアーマチュアを結合",
+    "MergeArmature.options": "結合オプション",
+    "MergeArmature.warn_two": "結合には少なくとも2つのアーマチュアが必要です",
+    "MergeArmature.into": "結合先",
+    "MergeArmature.into_desc": "結合先のターゲットアーマチュア",
+    "MergeArmature.into_search_desc": "結合先のアーマチュアを検索",
+    "MergeArmature.from": "結合元",
+    "MergeArmature.from_desc": "結合元のソースアーマチュア",
+    "MergeArmature.from_search_desc": "結合元のアーマチュアを検索",
+    "MergeArmature.error.not_found": "アーマチュア'{name}'が見つかりません",
+    "MergeArmature.error.transforms_not_aligned": "このアーマチュアを結合するには変形を適用する必要があります。手動で行うか、変形適用のチェックマークを使用してください",
+    "MergeArmature.error.check_transforms": "親の変形を確認してください",
+    "MergeArmature.error.fix_parents": "親子関係を修正してください",
+    "MergeArmature.progress.removing_rigidbodies": "剛体とジョイントを削除中",
+    "MergeArmature.progress.validating": "アーマチュアを検証中",
+    "MergeArmature.progress.merging": "アーマチュアを結合中",
+    "MergeArmature.success": "アーマチュアが正常に結合されました",
+    "MergeArmature.merge_all": "同名ボーンを結合",
+    "MergeArmature.merge_all_desc": "名前が一致するボーンを結合",
+    "MergeArmature.apply_transforms": "変形を適用",
+    "MergeArmature.apply_transforms_desc": "結合前にすべての変形を適用",
+    "MergeArmature.join_meshes": "メッシュを結合",
+    "MergeArmature.join_meshes_desc": "結合後にメッシュを結合",
+    "MergeArmature.remove_zero_weights": "重みなしを削除",
+    "MergeArmature.remove_zero_weights_desc": "重みのない頂点グループを削除",
+    "MergeArmature.cleanup_shape_keys": "シェイプキーをクリーン",
+    "MergeArmature.cleanup_shape_keys_desc": "未使用のシェイプキーを削除",
+
+    "Settings.label": "設定",
+    "Settings.language": "言語",
+    "Settings.language_desc": "インターフェース言語を選択",
+    "Settings.validation_mode": "検証モード",
+    "Settings.validation_mode_desc": "アーマチュアの検証の厳密さを選択",
+    "Settings.validation_mode.strict": "厳密",
+    "Settings.validation_mode.strict_desc": "ボーン階層と対称性を含む完全な検証",
+    "Settings.validation_mode.basic": "基本",
+    "Settings.validation_mode.basic_desc": "必須ボーンのみチェック",
+    "Settings.validation_mode.none": "なし",
+    "Settings.validation_mode.none_desc": "アーマチュアの検証を行わない",
+    "Settings.debug": "デバッグ設定",
+    "Settings.logging": "ログ記録",
+    "Settings.enable_logging": "デバッグログを有効化",
+    "Settings.enable_logging_desc": "トラブルシューティング用の詳細ログを有効化",
+    "Settings.logging_enabled": "デバッグログが有効になりました",
+    "Settings.logging_disabled": "デバッグログが無効になりました",
+    "Language.auto": "自動",
+    "Language.en_US": "英語",
+    "Language.ja_JP": "日本語",
+    "Language.ko_KR": "韓国語",
+    "Language.changed.title": "言語が変更されました",
+    "Language.changed.success": "言語が正常に変更されました！",
+    "Language.changed.restart": "一部のUI要素の更新にはBlenderの再起動が必要な場合があります"
   }
 }
\ No newline at end of file
diff --git a/resources/translations/ko_KR.json b/resources/translations/ko_KR.json
new file mode 100644
index 0000000..28ce1ed
--- /dev/null
+++ b/resources/translations/ko_KR.json
@@ -0,0 +1,408 @@
+{
+    "authors": ["Avatar Toolkit Team"],
+    "messages": {
+      "AvatarToolkit.label": "아바타 툴킷 (알파 0.1.1)",
+      "AvatarToolkit.desc1": "아바타 툴킷은 초기 액세스 단계입니다",
+      "AvatarToolkit.desc2": "문제가 발생할 수 있으며, 문제를 발견하시면", 
+      "AvatarToolkit.desc3": "Github에 보고해 주시기 바랍니다.",
+  
+      "Updater.label": "업데이터",
+      "Updater.CheckForUpdateButton.label": "업데이트 확인",
+      "Updater.CheckForUpdateButton.label_alt": "사용 가능한 업데이트 없음",
+      "Updater.UpdateToLatestButton.label": "{name}으로 업데이트",
+      "Updater.UpdateToSelectedButton.label": "업데이트",
+      "Updater.currentVersion": "현재 버전: {name}",
+      "Updater.selectVersion": "버전 선택",
+      "Updater.CheckForUpdateButton.desc": "사용 가능한 업데이트 확인",
+      "UpdateToLatestButton.desc": "최신 버전으로 업데이트",
+      "UpdateNotificationPopup.label": "업데이트 알림",
+      "UpdateNotificationPopup.desc": "사용 가능한 업데이트 알림",
+      "UpdateNotificationPopup.newUpdate": "새 업데이트 사용 가능: {version}",
+      "RestartBlenderPopup.label": "블렌더 재시작",
+      "RestartBlenderPopup.desc": "업데이트를 완료하려면 블렌더를 재시작하세요",
+      "RestartBlenderPopup.message": "업데이트 성공! 블렌더를 재시작해 주세요.",
+      "check_for_update.cantCheck": "업데이트를 확인할 수 없습니다",
+      "download_file.cantConnect": "업데이트 서버에 연결할 수 없습니다",
+      "download_file.cantFindZip": "업데이트 파일을 찾을 수 없습니다",
+      "download_file.cantFindAvatarToolkit": "업데이트 패키지에서 아바타 툴킷 파일을 찾을 수 없습니다",
+  
+      "QuickAccess.label": "빠른 접근",
+      "QuickAccess.select_armature": "아마추어 선택",
+      "QuickAccess.valid_armature": "유효한 아마추어",
+      "QuickAccess.bones_count": "본: {count}개",
+      "QuickAccess.pose_bones_available": "포즈 본: 사용 가능",
+      "QuickAccess.pose_controls": "포즈 컨트롤",
+      "QuickAccess.import_export": "가져오기/내보내기",
+      "QuickAccess.import": "가져오기",
+      "QuickAccess.export": "내보내기", 
+      "QuickAccess.export_fbx": "FBX 내보내기",
+      "QuickAccess.export_resonite": "Resonite로 내보내기",
+      "QuickAccess.start_pose_mode.label": "포즈 모드 시작",
+      "QuickAccess.start_pose_mode.desc": "선택한 아마추어의 포즈 모드 진입",
+      "QuickAccess.stop_pose_mode.label": "포즈 모드 종료",
+      "QuickAccess.stop_pose_mode.desc": "포즈 모드 종료 및 변형 초기화",
+      "QuickAccess.apply_pose_as_shapekey.label": "포즈를 쉐이프 키로 적용",
+      "QuickAccess.apply_pose_as_shapekey.desc": "현재 포즈로 새 쉐이프 키 생성",
+      "QuickAccess.apply_pose_as_rest.label": "포즈를 기본 자세로 적용",
+      "QuickAccess.apply_pose_as_rest.desc": "현재 포즈를 기본 자세로 적용",
+      "QuickAccess.apply_armature_failed": "아마추어 수정 적용 실패",
+      "QuickAccess.validation_basic_warning": "제한된 검증 활성화됨",
+      "QuickAccess.validation_basic_details": "필수 본 구조만 검증됨",
+      "QuickAccess.validation_none_warning": "검증 비활성화됨",
+      "QuickAccess.validation_none_details": "아마추어 검증이 수행되지 않음",
+  
+      "PoseMode.error.start": "포즈 모드 시작 실패: {error}",
+      "PoseMode.error.stop": "포즈 모드 종료 실패: {error}",
+      "PoseMode.error.shapekey": "포즈를 쉐이프 키로 적용 실패: {error}",
+      "PoseMode.error.rest_pose": "포즈를 기본 자세로 적용 실패: {error}",
+      "PoseMode.shapekey.name": "쉐이프 키 이름",
+      "PoseMode.shapekey.description": "새 쉐이프 키의 이름",
+      "PoseMode.shapekey.default": "포즈_쉐이프키",
+      "PoseMode.skipped_meshes": "일부 메시가 건너뛰어짐:\n{message}",
+      "PoseMode.basis": "기본",
+  
+      "Armature.validation.no_armature": "선택된 아마추어 없음",
+      "Armature.validation.not_armature": "선택된 오브젝트가 아마추어가 아님",
+      "Armature.validation.no_bones": "아마추어에 본이 없음",
+      "Armature.validation.basic_check_failed": "기본 아마추어 검증 실패",
+      "Armature.validation.missing_bones": "필수 본 누락: {bones}",
+      "Armature.validation.invalid_hierarchy": "{parent}와 {child} 사이의 잘못된 본 계층 구조",
+      "Armature.validation.asymmetric_bones": "{bone}의 대칭 본 누락",
+      "Armature.validation.asymmetric_hand_wrist": "손/손목의 대칭 본 누락",
+  
+      "Mesh.validation.no_data": "메시 데이터 없음",
+      "Mesh.validation.no_vertex_groups": "버텍스 그룹 없음",
+      "Mesh.validation.no_armature_modifier": "아마추어 모디파이어 없음",
+      "Mesh.validation.valid": "포즈 작업에 유효한 메시",
+  
+      "Operation.pose_applied": "포즈가 성공적으로 적용됨",
+  
+      "Scene.avatar_toolkit_updater_version_list.name": "버전 목록",
+      "Scene.avatar_toolkit_updater_version_list.description": "사용 가능한 버전 목록",
+  
+      "Optimization.label": "최적화",
+      "Optimization.materials_title": "재질",
+      "Optimization.cleanup_title": "메시 정리",
+      "Optimization.join_meshes_title": "메시 결합",
+      "Optimization.combine_materials": "재질 결합",
+      "Optimization.combine_materials_desc": "드로우 콜을 줄이기 위해 유사한 재질 결합",
+      "Optimization.remove_doubles": "중복 제거",
+      "Optimization.remove_doubles_desc": "중복된 버텍스 제거",
+      "Optimization.remove_doubles_advanced": "고급",
+      "Optimization.remove_doubles_advanced_desc": "고급 옵션으로 중복 버텍스 제거",
+      "Optimization.join_all_meshes": "전체 결합",
+      "Optimization.join_all_meshes_desc": "씬의 모든 메시 결합",
+      "Optimization.join_selected_meshes": "선택 결합",
+      "Optimization.join_selected_meshes_desc": "선택된 메시만 결합",
+      "Optimization.no_meshes": "최적화할 메시를 찾을 수 없음",
+      "Optimization.materials_combined": "{combined}개의 재질 결합, {cleaned}개의 슬롯 정리, {removed}개의 미사용 데이터 블록 제거됨",
+      "Optimization.error.combine_materials": "재질 결합 실패: {error}",
+      "Optimization.materials_total": "전체 재질: {count}개",
+      "Optimization.materials_duplicates": "잠재적 중복: {count}개",
+      "Optimization.no_materials": "메시에서 재질을 찾을 수 없음",
+      "Optimization.error.consolidation": "재질 통합 실패. 콘솔에서 세부 정보 확인",
+      "Optimization.combining_materials": "유사한 재질 결합 중...",
+      "Optimization.cleaning_slots": "재질 슬롯 정리 중...",
+      "Optimization.removing_unused": "미사용 재질 제거 중...",
+      "Optimization.selecting_meshes": "메시 선택 중...",
+      "Optimization.joining_meshes": "메시 결합 중...",
+      "Optimization.applying_transforms": "변형 적용 중...",
+      "Optimization.fixing_uvs": "UV 좌표 수정 중...",
+      "Optimization.finalizing": "마무리 중...",
+      "Optimization.meshes_joined": "모든 메시가 성공적으로 결합됨",
+      "Optimization.selected_meshes_joined": "선택된 메시가 성공적으로 결합됨",
+      "Optimization.no_mesh_selected": "선택된 메시 없음",
+      "Optimization.select_at_least_two": "최소 두 개의 메시를 선택하세요",
+      "Optimization.error.join_meshes": "메시 결합 실패: {error}",
+      "Optimization.error.join_selected": "선택된 메시 결합 실패: {error}",
+      "Optimization.merge_distance": "병합 거리",
+      "Optimization.merge_distance_desc": "버텍스를 병합할 거리",
+      "Optimization.remove_doubles_warning": "이 과정은 시간이 오래 걸릴 수 있습니다",
+      "Optimization.remove_doubles_wait": "이 작업 중에는 블렌더가 응답하지 않을 수 있습니다",
+      "Optimization.error.remove_doubles": "중복 제거 실패: {error}",
+      "Optimization.no_armature": "선택된 아마추어 없음",
+      "Optimization.processing_mesh": "메시 처리 중: {name}",
+      "Optimization.processing_shapekey": "쉐이프 키 처리 중: {name}",
+      "Optimization.remove_doubles_completed": "중복 제거가 성공적으로 완료됨",
+  
+      "Tools.label": "도구",
+      "Tools.general_title": "일반 도구",
+      "Tools.convert_resonite": "Resonite로 변환",
+      "Tools.convert_resonite_desc": "Resonite에서 사용할 모델 변환",
+      "Tools.convert_resonite.operation": "Resonite로 변환 중",
+      "Tools.separate_title": "분리 도구",
+      "Tools.separate_materials": "재질별",
+      "Tools.separate_materials_desc": "재질별로 메시 분리",
+      "Tools.separate_loose": "분리된 부분",
+      "Tools.separate_loose_desc": "분리된 부분으로 메시 분리",
+      "Tools.separate_materials_success": "메시가 재질별로 성공적으로 분리됨",
+      "Tools.separate_loose_success": "메시가 분리된 부분으로 성공적으로 분리됨",
+      "Tools.bone_title": "본 도구",
+      "Tools.create_digitigrade": "디지티그레이드 다리 생성",
+      "Tools.create_digitigrade_desc": "다리를 디지티그레이드 설정으로 변환",
+      "Tools.digitigrade": "디지티그레이드 다리 생성",
+      "Tools.digitigrade_desc": "선택된 다리 본을 디지티그레이드 설정으로 변환",
+      "Tools.digitigrade_error": "디지티그레이드 다리 생성 실패: {error}",
+      "Tools.digitigrade_success": "디지티그레이드 다리 설정 생성 성공",
+      "Tools.processing_leg": "다리 본 처리 중: {bone}",
+      "Tools.merge_twist_bones": "트위스트 본 유지",
+      "Tools.merge_twist_bones_desc": "체크하면 가중치가 0이어도 트위스트 본 유지",
+      "Tools.clean_weights": "0 가중치 본 제거",
+      "Tools.clean_weights_desc": "버텍스 가중치가 없는 본 제거",
+      "Tools.clean_constraints": "본 제약 조건 삭제",
+      "Tools.clean_constraints_desc": "아마추어에서 모든 본 제약 조건 제거",
+      "Tools.clean_constraints_success": "{count}개의 본 제약 조건 제거됨",
+      "Tools.processing_bone_constraints": "본의 제약 조건 제거 중: {bone}",
+      "Tools.clean_weights_success": "{count}개의 0 가중치 본 제거됨",
+      "Tools.clean_weights_threshold": "가중치 임계값",
+      "Tools.clean_weights_threshold_desc": "본이 가중치를 가진 것으로 간주할 최소값",
+      "Tools.merge_title": "병합 도구",
+      "Tools.merge_to_active": "활성 본으로 병합",
+      "Tools.merge_to_active_desc": "선택된 본을 활성 본으로 병합",
+      "Tools.merge_to_parent": "부모로 병합",
+      "Tools.merge_to_parent_desc": "본을 각각의 부모로 병합",
+      "Tools.connect_bones": "본 연결",
+      "Tools.connect_bones_desc": "체인에서 연결되지 않은 본 연결",
+      "Tools.additional_title": "추가 도구",
+      "Tools.apply_transforms": "변형 적용",
+      "Tools.apply_transforms_desc": "오브젝트에 모든 변형 적용",
+      "Tools.clean_shapekeys": "미사용 쉐이프키 제거",
+      "Tools.clean_shapekeys_desc": "메시에서 미사용 쉐이프 키 제거",
+      "Tools.bones_translated_success": "모든 본이 성공적으로 변환됨",
+      "Tools.bones_translated_with_fails": "변환 완료됨 (변환되지 않은 본 {translate_bone_fails}개)",
+      "Tools.storing_transforms": "본 변형 저장 중...",
+      "Tools.analyzing_weights": "버텍스 가중치 분석 중...",
+      "Tools.removing_bones": "가중치 없는 본 제거 중...",
+      "Tools.verifying_hierarchy": "본 계층 구조 확인 중...",
+      "Tools.connect_bones_min_distance": "최소 거리",
+      "Tools.connect_bones_min_distance_desc": "본 연결을 시도할 최소 거리",
+      "Tools.connect_bones_success": "{count}개의 본 연결됨",
+      "Tools.merge_weights_threshold": "가중치 전송 임계값",
+      "Tools.merge_weights_threshold_desc": "본 병합 시 전송할 최소 가중치 값",
+      "Tools.no_bones_selected": "병합할 본이 선택되지 않음",
+      "Tools.no_bones_with_parent": "부모가 있는 선택된 본을 찾을 수 없음",
+      "Tools.merge_to_active_success": "{count}개의 본을 활성 본으로 성공적으로 병합함",
+      "Tools.merge_to_parent_success": "{count}개의 본을 부모로 성공적으로 병합함",
+      "Tools.transforms_applied": "변형이 성공적으로 적용됨",
+      "Tools.shapekey_tolerance": "쉐이프 키 허용 오차",
+      "Tools.shapekey_tolerance_desc": "쉐이프 키를 사용된 것으로 간주할 최소 차이",
+      "Tools.shapekeys_removed": "{count}개의 미사용 쉐이프 키 제거됨",
+  
+      "MMD.label": "MMD 도구",
+      "MMD.bone_standardization": "본 표준화",
+      "MMD.weight_processing": "가중치 처리",
+      "MMD.hierarchy": "본 계층 구조",
+      "MMD.cleanup": "정리",
+      "MMD.no_armature": "선택된 아마추어 없음",
+      "MMD.no_meshes": "메시를 찾을 수 없음",
+      "MMD.validation.rigify_unsupported": "Rigify 아마추어는 지원되지 않음",
+      "MMD.validation.multi_user_mesh": "다중 사용자 메시 감지됨: {mesh}",
+      "MMD.bones_standardized": "본이 성공적으로 표준화됨",
+      "MMD.weights_processed": "가중치가 성공적으로 처리됨",
+      "MMD.hierarchy_fixed": "본 계층 구조가 성공적으로 수정됨",
+      "MMD.hierarchy_validation_warning": "일부 계층 관계를 검증할 수 없음",
+      "MMD.cleanup_completed": "아마추어 정리 완료",
+      "MMD.process_twist_bones": "트위스트 본 처리",
+      "MMD.process_twist_bones_desc": "트위스트 본의 가중치를 부모 본으로 전송",
+      "MMD.connect_bones": "본 연결",
+      "MMD.connect_bones_desc": "적절한 경우 체인의 본 연결",
+  
+      "Visemes.panel_label": "비셈",
+      "Visemes.shape_selection": "쉐이프 키 선택",
+      "Visemes.controls": "비셈 컨트롤",
+      "Visemes.no_shapekeys": "쉐이프 키가 있는 메시 선택",
+      "Visemes.mouth_a": "A 모양",
+      "Visemes.mouth_a_desc": "'A' 소리를 위한 쉐이프 키",
+      "Visemes.mouth_o": "O 모양",
+      "Visemes.mouth_o_desc": "'O' 소리를 위한 쉐이프 키",
+      "Visemes.mouth_ch": "CH 모양",
+      "Visemes.mouth_ch_desc": "'CH' 소리를 위한 쉐이프 키",
+      "Visemes.shape_intensity": "쉐이프 강도",
+      "Visemes.shape_intensity_desc": "비셈 쉐이프의 강도 배율",
+      "Visemes.start_preview": "미리보기 시작",
+      "Visemes.stop_preview": "미리보기 중지",
+      "Visemes.preview_mode_desc": "비셈 미리보기 모드 전환",
+      "Visemes.preview_selection": "미리보기 선택",
+      "Visemes.preview_selection_desc": "미리볼 비셈 선택",
+      "Visemes.preview_label": "비셈 미리보기",
+      "Visemes.preview_desc": "뷰포트에서 비셈 쉐이프 미리보기",
+      "Visemes.create_label": "비셈 생성",
+      "Visemes.create_desc": "VRC 비셈 쉐이프 키 생성",
+      "Visemes.error.no_shapekeys": "메시에 쉐이프 키가 없음",
+      "Visemes.error.select_shapekeys": "A, O, CH 쉐이프 키를 선택하세요",
+      "Visemes.success": "비셈이 성공적으로 생성됨",
+      "Visemes.mesh_select": "메시 선택",
+      "Visemes.mesh_select_desc": "비셈을 생성할 메시 선택",
+  
+      "EyeTracking.label": "시선 추적",
+      "EyeTracking.setup": "시선 추적 설정",
+      "EyeTracking.mesh_select": "메시 선택",
+      "EyeTracking.bones": "본 선택",
+      "EyeTracking.head_bone": "머리 본",
+      "EyeTracking.eye_left": "왼쪽 눈 본",
+      "EyeTracking.eye_right": "오른쪽 눈 본",
+      "EyeTracking.shapekeys": "쉐이프 키 선택",
+      "EyeTracking.options": "옵션",
+      "EyeTracking.rotation": "눈 회전",
+      "EyeTracking.rotation.x": "수직 회전",
+      "EyeTracking.rotation.y": "수평 회전",
+      "EyeTracking.adjust": "눈 조정",
+      "EyeTracking.blinking": "깜빡임 컨트롤",
+      "EyeTracking.no_shapekeys": "선택된 메시에서 쉐이프 키를 찾을 수 없음",
+      "EyeTracking.no_armature": "선택된 아마추어 없음",
+      "EyeTracking.no_mesh": "메시를 찾을 수 없음",
+      "EyeTracking.create.label": "시선 추적 생성",
+      "EyeTracking.create.desc": "시선 추적 본과 쉐이프 키 설정",
+      "EyeTracking.testing.start.label": "테스트 시작",
+      "EyeTracking.testing.start.desc": "시선 추적 테스트 모드 진입",
+      "EyeTracking.testing.stop.label": "테스트 중지",
+      "EyeTracking.testing.stop.desc": "시선 추적 테스트 모드 종료",
+      "EyeTracking.reset.label": "시선 추적 초기화",
+      "EyeTracking.reset.desc": "모든 시선 추적 설정 초기화",
+      "EyeTracking.rotate.label": "눈 본 회전",
+      "EyeTracking.rotate.desc": "VRChat 호환성을 위한 눈 본 회전",
+      "EyeTracking.iris.label": "홍채 높이 조정",
+      "EyeTracking.iris.desc": "홍채 버텍스의 높이 조정",
+      "EyeTracking.blink.test.label": "깜빡임 테스트",
+      "EyeTracking.blink.test.desc": "눈 깜빡임 쉐이프 키 테스트",
+      "EyeTracking.lowerlid.test.label": "아래 눈꺼풀 테스트",
+      "EyeTracking.lowerlid.test.desc": "아래 눈꺼풀 쉐이프 키 테스트",
+      "EyeTracking.blink.reset.label": "깜빡임 테스트 초기화",
+      "EyeTracking.blink.reset.desc": "깜빡임 테스트 값 초기화",
+      "EyeTracking.validation.noArmature": "씬에서 아마추어를 찾을 수 없음",
+      "EyeTracking.validation.noMesh": "메시 '{mesh}'를 찾을 수 없음",
+      "EyeTracking.validation.noShapekeys": "선택된 메시에 쉐이프 키가 없음",
+      "EyeTracking.validation.leftEye": "왼쪽 눈",
+      "EyeTracking.validation.rightEye": "오른쪽 눈",
+      "EyeTracking.validation.missingGroups": "누락된 버텍스 그룹: {groups}",
+      "EyeTracking.validation.missingBones": "필요한 본 누락: {bones}",
+      "EyeTracking.validation.success": "시선 추적 설정이 성공적으로 검증됨",
+      "EyeTracking.error.noMesh": "시선 추적을 위한 메시가 선택되지 않음",
+      "EyeTracking.error.noVertexGroup": "본을 위한 버텍스 그룹을 찾을 수 없음: {bone}",
+      "EyeTracking.error.noShapeSelected": "필요한 모든 쉐이프 키를 선택하세요",
+      "EyeTracking.success": "시선 추적 설정이 성공적으로 완료됨",
+      "EyeTracking.mode_select": "모드 선택",
+      "EyeTracking.mesh_setup": "메시 설정",
+      "EyeTracking.bone_setup": "본 설정",
+      "EyeTracking.shapekey_setup": "쉐이프 키 설정",
+      "EyeTracking.testing": "테스트 모드",
+      "EyeTracking.rotation_controls": "눈 회전 컨트롤",
+      "EyeTracking.adjustments": "눈 조정",
+      "EyeTracking.blink_testing": "깜빡임 테스트",
+      "EyeTracking.wink_left": "왼쪽 윙크",
+      "EyeTracking.wink_right": "오른쪽 윙크",
+      "EyeTracking.lowerlid_left": "왼쪽 아래 눈꺼풀",
+      "EyeTracking.lowerlid_right": "오른쪽 아래 눈꺼풀",
+      "EyeTracking.mode.creation": "생성 모드",
+      "EyeTracking.mode.testing": "테스트 모드",
+      "EyeTracking.disable_blinking": "눈 깜빡임 비활성화",
+      "EyeTracking.disable_movement": "눈 움직임 비활성화",
+      "EyeTracking.distance": "눈 거리",
+      "EyeTracking.distance_desc": "눈 사이의 거리 조정",
+      "EyeTracking.mode": "시선 추적 모드",
+      "EyeTracking.mesh_name": "메시",
+      "EyeTracking.mesh_name_desc": "시선 추적을 위한 메시 선택",
+      "EyeTracking.head_bone_desc": "머리 본 선택",
+      "EyeTracking.eye_left_desc": "왼쪽 눈 본 선택",
+      "EyeTracking.eye_right_desc": "오른쪽 눈 본 선택",
+      "EyeTracking.type": "시선 추적 유형",
+      "EyeTracking.type_desc": "생성할 시선 추적 설정 유형 선택",
+      "EyeTracking.create.av3.label": "AV3 시선 추적 생성",
+      "EyeTracking.create.av3.desc": "VRChat Avatar 3.0용 시선 추적 설정",
+      "EyeTracking.create.sdk2.label": "SDK2 시선 추적 생성",
+      "EyeTracking.create.sdk2.desc": "VRChat SDK2용 시선 추적 설정",
+      "EyeTracking.sdk_version": "SDK 버전",
+      "EyeTracking.type.av3": "Avatar 3.0",
+      "EyeTracking.type.av3_desc": "VRChat Avatar 3.0 시선 추적 설정",
+      "EyeTracking.type.sdk2": "SDK2 (레거시)",
+      "EyeTracking.type.sdk2_desc": "VRChat SDK2 시선 추적 설정",
+      "EyeTracking.adjust.label": "눈 위치 조정",
+      "EyeTracking.adjust.desc": "버텍스 그룹을 기반으로 눈 본 위치 조정",
+  
+      "CustomPanel.label": "커스텀 아바타 도구",
+      "CustomPanel.merge_mode": "병합 모드",
+      "CustomPanel.mesh_selection": "메시 선택",
+      "CustomPanel.select_mesh": "메시 선택",
+      "CustomPanel.select_bone": "본 선택",
+      "CustomPanel.select_armature": "아마추어 선택",
+      "CustomPanel.mode.armature": "아마추어",
+      "CustomPanel.mode.armature_desc": "아마추어 함께 병합",
+      "CustomPanel.mode.mesh": "메시",
+      "CustomPanel.mode.mesh_desc": "메시를 아마추어에 부착",
+  
+      "AttachMesh.label": "메시 부착",
+      "AttachMesh.desc": "자동 가중치 설정으로 메시를 아마추어 본에 부착",
+      "AttachMesh.search_desc": "부착할 메시 검색",
+      "AttachMesh.select": "부착할 메시 선택",
+      "AttachMesh.select_desc": "아마추어에 부착할 메시 선택",
+      "AttachMesh.success": "메시가 성공적으로 부착됨",
+      "AttachMesh.warn_no_armature": "부착할 아마추어와 메시를 선택하세요",
+      "AttachMesh.validate_transforms": "메시 변형 검증 중",
+      "AttachMesh.validate_name": "메시 이름 검증 중",
+      "AttachMesh.parent_mesh": "메시를 아마추어에 페어런팅",
+      "AttachMesh.setup_weights": "버텍스 가중치 설정 중",
+      "AttachMesh.create_bone": "부착 본 생성 중",
+      "AttachMesh.position_bone": "본 위치 지정 중",
+      "AttachMesh.add_modifier": "아마추어 모디파이어 추가 중",
+      "AttachMesh.error.bone_not_found": "부착 본 '{bone}'을(를) 찾을 수 없음",
+      "AttachMesh.error.mesh_not_found": "메시를 찾을 수 없음",
+      "AttachMesh.error.non_uniform_scale": "메시에 비균일 스케일이 있습니다. 스케일을 적용하세요",
+      "AttachBone.search_desc": "대상 본 검색",
+      "AttachBone.select": "대상 본 선택",
+      "AttachBone.select_desc": "메시를 부착할 본 선택",
+  
+      "MergeArmature.label": "아마추어 병합",
+      "MergeArmature.desc": "두 아마추어 병합",
+      "MergeArmature.options": "병합 옵션",
+      "MergeArmature.warn_two": "병합하려면 최소 두 개의 아마추어가 필요합니다",
+      "MergeArmature.into": "병합 대상",
+      "MergeArmature.into_desc": "병합할 대상 아마추어",
+      "MergeArmature.into_search_desc": "대상 아마추어 검색",
+      "MergeArmature.from": "병합 소스",
+      "MergeArmature.from_desc": "병합할 소스 아마추어",
+      "MergeArmature.from_search_desc": "소스 아마추어 검색",
+      "MergeArmature.error.not_found": "아마추어 '{name}'을(를) 찾을 수 없음",
+      "MergeArmature.error.transforms_not_aligned": "이 아마추어를 병합하려면 변형을 적용해야 합니다. 수동 방법이나 변형 적용 체크박스를 통해 수행하세요",
+      "MergeArmature.error.check_transforms": "부모 변형을 확인하세요",
+      "MergeArmature.error.fix_parents": "부모 관계를 수정하세요",
+      "MergeArmature.progress.removing_rigidbodies": "강체와 조인트 제거 중",
+      "MergeArmature.progress.validating": "아마추어 검증 중",
+      "MergeArmature.progress.merging": "아마추어 병합 중",
+      "MergeArmature.success": "아마추어가 성공적으로 병합됨",
+      "MergeArmature.merge_all": "동일한 본 병합",
+      "MergeArmature.merge_all_desc": "일치하는 이름의 본 병합",
+      "MergeArmature.apply_transforms": "변형 적용",
+      "MergeArmature.apply_transforms_desc": "병합 전 모든 변형 적용",
+      "MergeArmature.join_meshes": "메시 결합",
+      "MergeArmature.join_meshes_desc": "병합 후 메시 결합",
+      "MergeArmature.remove_zero_weights": "0 가중치 제거",
+      "MergeArmature.remove_zero_weights_desc": "가중치가 없는 버텍스 그룹 제거",
+      "MergeArmature.cleanup_shape_keys": "쉐이프 키 정리",
+      "MergeArmature.cleanup_shape_keys_desc": "미사용 쉐이프 키 제거",
+  
+      "Settings.label": "설정",
+      "Settings.language": "언어",
+      "Settings.language_desc": "인터페이스 언어 선택",
+      "Settings.validation_mode": "검증 모드",
+      "Settings.validation_mode_desc": "아마추어 검증의 엄격성 선택",
+      "Settings.validation_mode.strict": "엄격",
+      "Settings.validation_mode.strict_desc": "본 계층 구조와 대칭성을 포함한 전체 검증",
+      "Settings.validation_mode.basic": "기본",
+      "Settings.validation_mode.basic_desc": "필수 본 확인만",
+      "Settings.validation_mode.none": "없음",
+      "Settings.validation_mode.none_desc": "아마추어 검증 없음",
+      "Settings.debug": "디버그 설정",
+      "Settings.logging": "로깅",
+      "Settings.enable_logging": "디버그 로깅 활성화",
+      "Settings.enable_logging_desc": "문제 해결을 위한 상세 디버그 로깅 활성화",
+      "Settings.logging_enabled": "디버그 로깅이 활성화됨",
+      "Settings.logging_disabled": "디버그 로깅이 비활성화됨",
+      "Language.auto": "자동",
+      "Language.en_US": "영어",
+      "Language.ja_JP": "일본어",
+      "Language.ko_KR": "한국어",
+      "Language.changed.title": "언어 변경됨",
+      "Language.changed.success": "언어가 성공적으로 변경됨!",
+      "Language.changed.restart": "일부 UI 요소는 블렌더 재시작이 필요할 수 있음"
+    }
+  }
\ No newline at end of file
diff --git a/ui/custom_avatar_panel.py b/ui/custom_avatar_panel.py
index 9c2c378..1db821f 100644
--- a/ui/custom_avatar_panel.py
+++ b/ui/custom_avatar_panel.py
@@ -1,6 +1,6 @@
 import bpy
-from typing import Set
-from bpy.types import Panel, Context, UILayout, Operator
+from typing import Set, List, Tuple, Any
+from bpy.types import Panel, Context, UILayout, Operator, Event, WindowManager
 from .main_panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
 from ..core.translations import t
 from ..core.common import (
@@ -11,10 +11,11 @@
 )
 
 class AvatarToolkit_OT_SearchMergeArmatureInto(Operator):
-    bl_idname = "avatar_toolkit.search_merge_armature_into"
-    bl_label = ""
-    bl_description = t('MergeArmature.into_search_desc')
-    bl_property = "search_merge_armature_into_enum"
+    """Search operator for selecting target armature to merge into"""
+    bl_idname: str = "avatar_toolkit.search_merge_armature_into"
+    bl_label: str = ""
+    bl_description: str = t('MergeArmature.into_search_desc')
+    bl_property: str = "search_merge_armature_into_enum"
 
     search_merge_armature_into_enum: bpy.props.EnumProperty(
         name=t('MergeArmature.into'),
@@ -22,19 +23,20 @@ class AvatarToolkit_OT_SearchMergeArmatureInto(Operator):
         items=get_armature_list
     )
 
-    def execute(self, context):
+    def execute(self, context: Context) -> Set[str]:
         context.scene.avatar_toolkit.merge_armature_into = self.search_merge_armature_into_enum
         return {'FINISHED'}
 
-    def invoke(self, context, event):
+    def invoke(self, context: Context, event: Event) -> Set[str]:
         context.window_manager.invoke_search_popup(self)
         return {'FINISHED'}
 
 class AvatarToolkit_OT_SearchMergeArmature(Operator):
-    bl_idname = "avatar_toolkit.search_merge_armature"
-    bl_label = ""
-    bl_description = t('MergeArmature.from_search_desc')
-    bl_property = "search_merge_armature_enum"
+    """Search operator for selecting source armature to merge from"""
+    bl_idname: str = "avatar_toolkit.search_merge_armature"
+    bl_label: str = ""
+    bl_description: str = t('MergeArmature.from_search_desc')
+    bl_property: str = "search_merge_armature_enum"
 
     search_merge_armature_enum: bpy.props.EnumProperty(
         name=t('MergeArmature.from'),
@@ -42,44 +44,46 @@ class AvatarToolkit_OT_SearchMergeArmature(Operator):
         items=get_armature_list
     )
 
-    def execute(self, context):
+    def execute(self, context: Context) -> Set[str]:
         context.scene.avatar_toolkit.merge_armature = self.search_merge_armature_enum
         return {'FINISHED'}
 
-    def invoke(self, context, event):
+    def invoke(self, context: Context, event: Event) -> Set[str]:
         context.window_manager.invoke_search_popup(self)
         return {'FINISHED'}
 
 class AvatarToolkit_OT_SearchAttachMesh(Operator):
-    bl_idname = "avatar_toolkit.search_attach_mesh"
-    bl_label = ""
-    bl_description = t('AttachMesh.search_desc')
-    bl_property = "search_attach_mesh_enum"
+    """Search operator for selecting mesh to attach to armature"""
+    bl_idname: str = "avatar_toolkit.search_attach_mesh"
+    bl_label: str = ""
+    bl_description: str = t('AttachMesh.search_desc')
+    bl_property: str = "search_attach_mesh_enum"
 
     search_attach_mesh_enum: bpy.props.EnumProperty(
         name=t('AttachMesh.select'),
         description=t('AttachMesh.select_desc'),
         items=lambda self, context: [
-            (obj.name, obj.name, "")
+            (obj.name, obj.name, "") 
             for obj in bpy.data.objects 
             if obj.type == 'MESH' 
             and not any(mod.type == 'ARMATURE' for mod in obj.modifiers)
         ]
     )
 
-    def execute(self, context):
+    def execute(self, context: Context) -> Set[str]:
         context.scene.avatar_toolkit.attach_mesh = self.search_attach_mesh_enum
         return {'FINISHED'}
 
-    def invoke(self, context, event):
+    def invoke(self, context: Context, event: Event) -> Set[str]:
         context.window_manager.invoke_search_popup(self)
         return {'FINISHED'}
 
 class AvatarToolkit_OT_SearchAttachBone(Operator):
-    bl_idname = "avatar_toolkit.search_attach_bone"
-    bl_label = ""
-    bl_description = t('AttachBone.search_desc')
-    bl_property = "search_attach_bone_enum"
+    """Search operator for selecting bone to attach mesh to"""
+    bl_idname: str = "avatar_toolkit.search_attach_bone"
+    bl_label: str = ""
+    bl_description: str = t('AttachBone.search_desc')
+    bl_property: str = "search_attach_bone_enum"
 
     search_attach_bone_enum: bpy.props.EnumProperty(
         name=t('AttachBone.select'),
@@ -90,26 +94,27 @@ class AvatarToolkit_OT_SearchAttachBone(Operator):
         ] if get_active_armature(context) else []
     )
 
-    def execute(self, context):
+    def execute(self, context: Context) -> Set[str]:
         context.scene.avatar_toolkit.attach_bone = self.search_attach_bone_enum
         return {'FINISHED'}
 
-    def invoke(self, context, event):
+    def invoke(self, context: Context, event: Event) -> Set[str]:
         context.window_manager.invoke_search_popup(self)
         return {'FINISHED'}
 
 class AvatarToolKit_PT_CustomPanel(Panel):
     """Panel containing tools for custom avatar creation and merging"""
-    bl_label = t('CustomPanel.label')
-    bl_idname = "VIEW3D_PT_avatar_toolkit_custom"
-    bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_category = CATEGORY_NAME
-    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
-    bl_order = 4
-    bl_options = {'DEFAULT_CLOSED'}
+    bl_label: str = t('CustomPanel.label')
+    bl_idname: str = "VIEW3D_PT_avatar_toolkit_custom"
+    bl_space_type: str = 'VIEW_3D'
+    bl_region_type: str = 'UI'
+    bl_category: str = CATEGORY_NAME
+    bl_parent_id: str = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
+    bl_order: int = 4
+    bl_options: Set[str] = {'DEFAULT_CLOSED'}
 
     def draw(self, context: Context) -> None:
+        """Draw the custom avatar panel UI"""
         layout: UILayout = self.layout
         toolkit = context.scene.avatar_toolkit
 
@@ -129,6 +134,7 @@ def draw(self, context: Context) -> None:
             self.draw_mesh_tools(layout, context)
 
     def draw_armature_tools(self, layout: UILayout, context: Context) -> None:
+        """Draw the armature merging tools section"""
         toolkit = context.scene.avatar_toolkit
         
         # Merge Settings Box
@@ -148,13 +154,13 @@ def draw_armature_tools(self, layout: UILayout, context: Context) -> None:
         col.separator(factor=0.5)
         
         # Group related options together
-        transform_col = col.column(align=True)
+        transform_col: UILayout = col.column(align=True)
         transform_col.prop(toolkit, "merge_all_bones")
         transform_col.prop(toolkit, "apply_transforms")
         
         col.separator(factor=0.5)
         
-        cleanup_col = col.column(align=True)
+        cleanup_col: UILayout = col.column(align=True)
         cleanup_col.prop(toolkit, "join_meshes")
         cleanup_col.prop(toolkit, "remove_zero_weights")
         cleanup_col.prop(toolkit, "cleanup_shape_keys")
@@ -178,12 +184,13 @@ def draw_armature_tools(self, layout: UILayout, context: Context) -> None:
 
         # Merge button with emphasis
         merge_box: UILayout = layout.box()
-        col = merge_box.column(align=True)
-        row = col.row(align=True)
+        col: UILayout = merge_box.column(align=True)
+        row: UILayout = col.row(align=True)
         row.scale_y = 1.5
         row.operator("avatar_toolkit.merge_armatures", icon='ARMATURE_DATA')
 
     def draw_mesh_tools(self, layout: UILayout, context: Context) -> None:
+        """Draw the mesh attachment tools section"""
         toolkit = context.scene.avatar_toolkit
         
         # Mesh Tools Box
@@ -220,8 +227,7 @@ def draw_mesh_tools(self, layout: UILayout, context: Context) -> None:
 
         # Attach button with emphasis
         attach_box: UILayout = layout.box()
-        col = attach_box.column(align=True)
-        row = col.row(align=True)
+        col: UILayout = attach_box.column(align=True)
+        row: UILayout = col.row(align=True)
         row.scale_y = 1.5
         row.operator("avatar_toolkit.attach_mesh", icon='ARMATURE_DATA')
-
diff --git a/ui/eye_tracking_panel.py b/ui/eye_tracking_panel.py
index ffb59fe..1178bc9 100644
--- a/ui/eye_tracking_panel.py
+++ b/ui/eye_tracking_panel.py
@@ -1,6 +1,6 @@
 import bpy
 from typing import Set
-from bpy.types import Panel, Context, UILayout, Operator
+from bpy.types import Panel, Context, UILayout, Operator, Event, WindowManager
 from .main_panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
 from ..core.translations import t
 from ..core.common import get_active_armature, get_all_meshes
@@ -20,32 +20,32 @@
 
 class AvatarToolKit_PT_EyeTrackingPanel(Panel):
     """Panel containing eye tracking setup and testing tools"""
-    bl_label = t("EyeTracking.label")
-    bl_idname = "VIEW3D_PT_avatar_toolkit_eye_tracking"
-    bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_category = CATEGORY_NAME
-    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
-    bl_order = 6
-    bl_options = {'DEFAULT_CLOSED'}
+    bl_label: str = t("EyeTracking.label")
+    bl_idname: str = "VIEW3D_PT_avatar_toolkit_eye_tracking"
+    bl_space_type: str = 'VIEW_3D'
+    bl_region_type: str = 'UI'
+    bl_category: str = CATEGORY_NAME
+    bl_parent_id: str = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
+    bl_order: int = 6
+    bl_options: Set[str] = {'DEFAULT_CLOSED'}
 
     def draw(self, context: Context) -> None:
         """Draw the eye tracking panel interface"""
-        layout = self.layout
+        layout: UILayout = self.layout
         toolkit = context.scene.avatar_toolkit
 
         # SDK Version Selection Box
-        sdk_box = layout.box()
-        col = sdk_box.column(align=True)
+        sdk_box: UILayout = layout.box()
+        col: UILayout = sdk_box.column(align=True)
         col.label(text=t("EyeTracking.sdk_version"), icon='PRESET')
         col.separator(factor=0.5)
-        row = col.row(align=True)
+        row: UILayout = col.row(align=True)
         row.prop(toolkit, "eye_tracking_type", expand=True)
 
         if toolkit.eye_tracking_type == 'SDK2':
             # Mode Selection Box
-            mode_box = layout.box()
-            col = mode_box.column(align=True)
+            mode_box: UILayout = layout.box()
+            col: UILayout = mode_box.column(align=True)
             col.label(text=t("EyeTracking.setup"), icon='TOOL_SETTINGS')
             col.separator(factor=0.5)
             col.prop(toolkit, "eye_mode", expand=True)
@@ -59,11 +59,12 @@ def draw(self, context: Context) -> None:
             self.draw_av3_setup(context, layout)
 
     def draw_av3_setup(self, context: Context, layout: UILayout) -> None:
+        """Draw the AV3 eye tracking setup interface"""
         toolkit = context.scene.avatar_toolkit
 
         # Bone Setup Box
-        bone_box = layout.box()
-        col = bone_box.column(align=True)
+        bone_box: UILayout = layout.box()
+        col: UILayout = bone_box.column(align=True)
         col.label(text=t("EyeTracking.bone_setup"), icon='BONE_DATA')
         col.separator(factor=0.5)
 
@@ -76,16 +77,17 @@ def draw_av3_setup(self, context: Context, layout: UILayout) -> None:
             col.label(text=t("EyeTracking.no_armature"), icon='ERROR')
 
         # Create Button
-        row = layout.row(align=True)
+        row: UILayout = layout.row(align=True)
         row.scale_y = 1.5
         row.operator(CreateEyesAV3Button.bl_idname, icon='PLAY')
 
     def draw_creation_mode(self, context: Context, layout: UILayout) -> None:
+        """Draw the eye tracking creation mode interface"""
         toolkit = context.scene.avatar_toolkit
 
         # Bone Setup Box
-        bone_box = layout.box()
-        col = bone_box.column(align=True)
+        bone_box: UILayout = layout.box()
+        col: UILayout = bone_box.column(align=True)
         col.label(text=t("EyeTracking.bone_setup"), icon='BONE_DATA')
         col.separator(factor=0.5)
 
@@ -98,15 +100,15 @@ def draw_creation_mode(self, context: Context, layout: UILayout) -> None:
             col.label(text=t("EyeTracking.no_armature"), icon='ERROR')
 
         # Mesh Setup Box
-        mesh_box = layout.box()
-        col = mesh_box.column(align=True)
+        mesh_box: UILayout = layout.box()
+        col: UILayout = mesh_box.column(align=True)
         col.label(text=t("EyeTracking.mesh_setup"), icon='MESH_DATA')
         col.separator(factor=0.5)
         col.prop_search(toolkit, "mesh_name_eye", bpy.data, "objects", text="")
 
         # Shape Key Setup Box
-        shape_box = layout.box()
-        col = shape_box.column(align=True)
+        shape_box: UILayout = layout.box()
+        col: UILayout = shape_box.column(align=True)
         col.label(text=t("EyeTracking.shapekey_setup"), icon='SHAPEKEY_DATA')
         col.separator(factor=0.5)
 
@@ -120,8 +122,8 @@ def draw_creation_mode(self, context: Context, layout: UILayout) -> None:
             col.label(text=t("EyeTracking.no_shapekeys"), icon='ERROR')
 
         # Options Box
-        options_box = layout.box()
-        col = options_box.column(align=True)
+        options_box: UILayout = layout.box()
+        col: UILayout = options_box.column(align=True)
         col.label(text=t("EyeTracking.options"), icon='SETTINGS')
         col.separator(factor=0.5)
         col.prop(toolkit, "disable_eye_blinking")
@@ -130,26 +132,27 @@ def draw_creation_mode(self, context: Context, layout: UILayout) -> None:
             col.prop(toolkit, "eye_distance")
 
         # Create Button
-        row = layout.row(align=True)
+        row: UILayout = layout.row(align=True)
         row.scale_y = 1.5
         row.operator(CreateEyesSDK2Button.bl_idname, icon='PLAY')
 
     def draw_testing_mode(self, context: Context, layout: UILayout) -> None:
+        """Draw the eye tracking testing mode interface"""
         toolkit = context.scene.avatar_toolkit
 
         if context.mode != 'POSE':
             # Testing Start Box
-            test_box = layout.box()
-            col = test_box.column(align=True)
+            test_box: UILayout = layout.box()
+            col: UILayout = test_box.column(align=True)
             col.label(text=t("EyeTracking.testing"), icon='PLAY')
             col.separator(factor=0.5)
-            row = col.row(align=True)
+            row: UILayout = col.row(align=True)
             row.scale_y = 1.5
             row.operator(StartTestingButton.bl_idname, icon='PLAY')
         else:
             # Eye Rotation Box
-            rotation_box = layout.box()
-            col = rotation_box.column(align=True)
+            rotation_box: UILayout = layout.box()
+            col: UILayout = rotation_box.column(align=True)
             col.label(text=t("EyeTracking.rotation_controls"), icon='DRIVER_ROTATIONAL_DIFFERENCE')
             col.separator(factor=0.5)
             col.prop(toolkit, "eye_rotation_x", text=t("EyeTracking.rotation.x"))
@@ -157,31 +160,31 @@ def draw_testing_mode(self, context: Context, layout: UILayout) -> None:
             col.operator(ResetRotationButton.bl_idname, icon='LOOP_BACK')
 
             # Eye Adjustment Box
-            adjust_box = layout.box()
-            col = adjust_box.column(align=True)
+            adjust_box: UILayout = layout.box()
+            col: UILayout = adjust_box.column(align=True)
             col.label(text=t("EyeTracking.adjustments"), icon='MODIFIER')
             col.separator(factor=0.5)
             col.prop(toolkit, "eye_distance")
             col.operator(AdjustEyesButton.bl_idname, icon='CON_TRACKTO')
 
             # Blinking Test Box
-            blink_box = layout.box()
-            col = blink_box.column(align=True)
+            blink_box: UILayout = layout.box()
+            col: UILayout = blink_box.column(align=True)
             col.label(text=t("EyeTracking.blink_testing"), icon='HIDE_OFF')
             col.separator(factor=0.5)
-            row = col.row(align=True)
+            row: UILayout = col.row(align=True)
             row.prop(toolkit, "eye_blink_shape")
             row.operator(TestBlinking.bl_idname, icon='RESTRICT_VIEW_OFF')
-            row = col.row(align=True)
+            row: UILayout = col.row(align=True)
             row.prop(toolkit, "eye_lowerlid_shape")
             row.operator(TestLowerlid.bl_idname, icon='RESTRICT_VIEW_OFF')
             col.operator(ResetBlinkTest.bl_idname, icon='LOOP_BACK')
 
             # Stop Testing Button
-            row = layout.row(align=True)
+            row: UILayout = layout.row(align=True)
             row.scale_y = 1.5
             row.operator(StopTestingButton.bl_idname, icon='PAUSE')
 
         # Reset Button
-        row = layout.row(align=True)
+        row: UILayout = layout.row(align=True)
         row.operator(ResetEyeTrackingButton.bl_idname, icon='FILE_REFRESH')
diff --git a/ui/visemes_panel.py b/ui/visemes_panel.py
index d79d041..5de266f 100644
--- a/ui/visemes_panel.py
+++ b/ui/visemes_panel.py
@@ -1,6 +1,8 @@
-from bpy.types import Panel, Context, UILayout
+import bpy
+from bpy.types import Panel, Context, UILayout, Object, ShapeKey
 from ..core.translations import t
 from .main_panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
+from ..core.common import get_active_armature
 
 class AvatarToolKit_PT_VisemesPanel(Panel):
     """Panel containing viseme creation and preview tools"""
@@ -11,26 +13,39 @@ class AvatarToolKit_PT_VisemesPanel(Panel):
     bl_category: str = CATEGORY_NAME
     bl_parent_id: str = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
     bl_order: int = 5
-    bl_options = {'DEFAULT_CLOSED'}
+    bl_options: set[str] = {'DEFAULT_CLOSED'}
 
     def draw(self, context: Context) -> None:
-        """Draw the visemes panel interface"""
+        """Draw the visemes panel interface with shape key selection and preview controls"""
         layout: UILayout = self.layout
         props = context.scene.avatar_toolkit
-        
-        # Check for valid mesh with shape keys
-        if not context.active_object or context.active_object.type != 'MESH' or not context.active_object.data.shape_keys:
+
+        # Mesh Selection Box
+        mesh_box: UILayout = layout.box()
+        col: UILayout = mesh_box.column(align=True)
+        col.label(text=t("Visemes.mesh_select"), icon='OUTLINER_OB_MESH')
+        col.separator(factor=0.5)
+
+        armature = get_active_armature(context)
+        if armature:
+            col.prop_search(props, "viseme_mesh", bpy.data, "objects", text="")
+        else:
+            col.label(text=t("Visemes.no_armature"), icon='ERROR')
+
+        # Get selected mesh
+        mesh_obj = bpy.data.objects.get(props.viseme_mesh)
+        if not mesh_obj or not mesh_obj.data.shape_keys:
             layout.label(text=t("Visemes.no_shapekeys"))
             return
-            
-        # Shape Key Selection Box
+
+        # Shape Key Selection Box    
         shape_box: UILayout = layout.box()
         col: UILayout = shape_box.column(align=True)
         col.label(text=t("Visemes.shape_selection"), icon='SHAPEKEY_DATA')
         col.separator(factor=0.5)
         
         # Shape key selection with valid data
-        shape_keys = context.active_object.data.shape_keys
+        shape_keys: ShapeKey = mesh_obj.data.shape_keys
         col.prop_search(props, "mouth_a", shape_keys, "key_blocks", text=t("Visemes.mouth_a"))
         col.prop_search(props, "mouth_o", shape_keys, "key_blocks", text=t("Visemes.mouth_o"))
         col.prop_search(props, "mouth_ch", shape_keys, "key_blocks", text=t("Visemes.mouth_ch"))
@@ -41,7 +56,7 @@ def draw(self, context: Context) -> None:
         
         # Preview Box
         preview_box: UILayout = layout.box()
-        col = preview_box.column(align=True)
+        col: UILayout = preview_box.column(align=True)
         col.label(text=t("Visemes.preview_label"), icon='HIDE_OFF')
         col.separator(factor=0.5)
 
@@ -49,12 +64,12 @@ def draw(self, context: Context) -> None:
             col.prop(props, "viseme_preview_selection", text="")
             col.separator()
 
-        preview_text = t("Visemes.stop_preview") if props.viseme_preview_mode else t("Visemes.start_preview")
+        preview_text: str = t("Visemes.stop_preview") if props.viseme_preview_mode else t("Visemes.start_preview")
         col.operator("avatar_toolkit.preview_visemes", text=preview_text, icon='HIDE_OFF')
 
         # Create Box
         create_box: UILayout = layout.box()
-        col = create_box.column(align=True)
+        col: UILayout = create_box.column(align=True)
         col.label(text=t("Visemes.create_label"), icon='ADD')
         col.separator(factor=0.5)
         col.operator("avatar_toolkit.create_visemes", icon='ADD')