diff --git a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
index 93dfabd3..c0db5622 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
@@ -55,7 +55,26 @@ namespace SHADE
       {
         auto const& type = property.get_type();
 
-        if (type == rttr::type::get<SHVec4>())
+        if(type.is_enumeration())
+        {
+          auto enumAlign = type.get_enumeration();
+          auto names = enumAlign.get_names();
+          std::vector<const char*> list;
+          for(auto const& name : names)
+            list.push_back(name.data());
+          ComboBox(property.get_name().data(), list, [component, property]{return property.get_value(component).to_int();}, [component, property](int const& idx)
+          {
+            auto enumAlign = property.get_enumeration();
+            auto names = enumAlign.get_names();
+            
+            property.set_value(component, *(enumAlign.get_values().begin().operator++(idx)));
+          });
+        }
+        else if(type.is_arithmetic())
+        {
+          
+        }
+        else if (type == rttr::type::get<SHVec4>())
         {
           DragVec4(property.get_name().data(), { "X", "Y", "Z", "W" }, [component, property]() {return property.get_value(component).template convert<SHVec4>(); }, [component, property](SHVec4 vec) {return property.set_value(component, vec); });
         }
@@ -67,6 +86,7 @@ namespace SHADE
         {
           DragVec2(property.get_name().data(), { "X", "Y"}, [component, property]() {return property.get_value(component).template convert<SHVec2>(); }, [component, property](SHVec2 vec) {return property.set_value(component, vec); });
         }
+        
       }
     }
     else DrawContextMenu(component);
diff --git a/SHADE_Engine/src/Editor/SHEditorWidgets.hpp b/SHADE_Engine/src/Editor/SHEditorWidgets.hpp
index 1106a4e2..0c869c98 100644
--- a/SHADE_Engine/src/Editor/SHEditorWidgets.hpp
+++ b/SHADE_Engine/src/Editor/SHEditorWidgets.hpp
@@ -80,13 +80,13 @@ namespace SHADE
     return valueChanged;
   }
 
-    static bool DragVec2(const std::string& fieldLabel, std::vector<std::string>const& componentLabels, std::function<SHVec2(void)> get,
+  static bool DragVec2(const std::string& fieldLabel, std::vector<std::string>const& componentLabels, std::function<SHVec2(void)> get,
     std::function<void(SHVec2)> set, float speed = 0.1f, const char* displayFormat = "%.3f", float valueMin = 0.0f, float valueMax = 0.0f,
     ImGuiSliderFlags flags = 0)
   {
     SHVec2 values = get();
     bool changed = false;
-    if (DragN<float, 2>(fieldLabel, componentLabels, {&values.x, &values.y}, speed, displayFormat, valueMin, valueMax, flags))
+    if (DragN<float, 2>(fieldLabel, componentLabels, { &values.x, &values.y }, speed, displayFormat, valueMin, valueMax, flags))
     {
       changed = true;
     }
@@ -95,22 +95,22 @@ namespace SHADE
     {
       if (ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !ImGui::IsMouseDragging(ImGuiMouseButton_Left))
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec2>>(get(), values, set)), false);
-      else if(ImGui::IsMouseDragging(ImGuiMouseButton_Left))
+      else if (ImGui::IsMouseDragging(ImGuiMouseButton_Left))
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec2>>(get(), values, set)), true);
-      else if(ImGui::IsItemDeactivatedAfterEdit())
+      else if (ImGui::IsItemDeactivatedAfterEdit())
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec2>>(get(), values, set)), false);
     }
 
     return changed;
   }
 
-      static bool DragVec3(const std::string& fieldLabel, std::vector<std::string>const& componentLabels, std::function<SHVec3(void)> get,
+  static bool DragVec3(const std::string& fieldLabel, std::vector<std::string>const& componentLabels, std::function<SHVec3(void)> get,
     std::function<void(SHVec3)> set, float speed = 0.1f, const char* displayFormat = "%.3f", float valueMin = 0.0f, float valueMax = 0.0f,
     ImGuiSliderFlags flags = 0)
   {
     SHVec3 values = get();
     bool changed = false;
-    if (DragN<float, 3>(fieldLabel, componentLabels, {&values.x, &values.y, &values.z}, speed, displayFormat, valueMin, valueMax, flags))
+    if (DragN<float, 3>(fieldLabel, componentLabels, { &values.x, &values.y, &values.z }, speed, displayFormat, valueMin, valueMax, flags))
     {
       changed = true;
     }
@@ -119,22 +119,22 @@ namespace SHADE
     {
       if (ImGui::IsMouseDown(ImGuiMouseButton_Left) && !ImGui::IsMouseDragging(ImGuiMouseButton_Left, -0.2f))
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec3>>(get(), values, set)), false);
-      else if(ImGui::IsMouseDragging(ImGuiMouseButton_Left))
+      else if (ImGui::IsMouseDragging(ImGuiMouseButton_Left))
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec3>>(get(), values, set)), true);
-      else if(ImGui::IsItemDeactivatedAfterEdit())
+      else if (ImGui::IsItemDeactivatedAfterEdit())
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec3>>(get(), values, set)), false);
     }
 
     return changed;
   }
 
-        static bool DragVec4(const std::string& fieldLabel, std::vector<std::string>const& componentLabels, std::function<SHVec4(void)> get,
+  static bool DragVec4(const std::string& fieldLabel, std::vector<std::string>const& componentLabels, std::function<SHVec4(void)> get,
     std::function<void(SHVec4)> set, float speed = 0.1f, const char* displayFormat = "%.3f", float valueMin = 0.0f, float valueMax = 0.0f,
     ImGuiSliderFlags flags = 0)
   {
     SHVec4 values = get();
     bool changed = false;
-    if (DragN<float, 4>(fieldLabel, componentLabels, {&values.x, &values.y, &values.z, &values.w}, speed, displayFormat, valueMin, valueMax, flags))
+    if (DragN<float, 4>(fieldLabel, componentLabels, { &values.x, &values.y, &values.z, &values.w }, speed, displayFormat, valueMin, valueMax, flags))
     {
       changed = true;
     }
@@ -143,9 +143,9 @@ namespace SHADE
     {
       if (ImGui::IsMouseDown(ImGuiMouseButton_Left) && !ImGui::IsMouseDragging(ImGuiMouseButton_Left, -0.2f))
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec4>>(get(), values, set)), false);
-      else if(ImGui::IsMouseDragging(ImGuiMouseButton_Left))
+      else if (ImGui::IsMouseDragging(ImGuiMouseButton_Left))
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec4>>(get(), values, set)), true);
-      else if(ImGui::IsItemDeactivatedAfterEdit())
+      else if (ImGui::IsItemDeactivatedAfterEdit())
         SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<SHVec4>>(get(), values, set)), false);
     }
 
@@ -155,7 +155,7 @@ namespace SHADE
   //#==============================================================#
   //||                     Widget Extensions                      ||
   //#==============================================================#
-        
+
   static bool CheckBox(std::string const& label, std::function<bool(void)> get, std::function<void(bool const&)> set)
   {
     bool value = get();
@@ -293,6 +293,17 @@ namespace SHADE
     return false;
   }
 
-  
+  static bool ComboBox(const std::string& fieldLabel, std::vector<const char*> list, std::function<int(void)> get, std::function<void(int const&)> set)
+  {
+    int selected = get();
+    if (ImGui::Combo(fieldLabel.c_str(), &selected, list.data(), list.size()))
+    {
+      SHCommandManager::PerformCommand(std::reinterpret_pointer_cast<SHBaseCommand>(std::make_shared<SHCommand<int>>(get(), selected, set)), false);
+      return true;
+    }
+
+    return false;
+  }
+
 
 }//namespace SHADE