diff --git a/vfolders2/vFolders/VFolders.cs b/vfolders2/vFolders/VFolders.cs
index 2791165..4510e12 100644
--- a/vfolders2/vFolders/VFolders.cs
+++ b/vfolders2/vFolders/VFolders.cs
@@ -97,7 +97,7 @@ namespace VFolders
                 var maxScrollPos = 20;
 
 
-                var scrollPos = window.GetMemberValue(isOneColumn ? "m_AssetTree" : "m_FolderTree").GetMemberValue<UnityEditor.IMGUI.Controls.TreeViewState<int>>("state").scrollPos.y;
+                var scrollPos = window.GetMemberValue(isOneColumn ? "m_AssetTree" : "m_FolderTree").GetMemberValue<UnityEditor.IMGUI.Controls.TreeViewState>("state").scrollPos.y;
 
                 var opacity = ((scrollPos - minScrollPos) / (maxScrollPos - minScrollPos)).Clamp01();
 
@@ -886,7 +886,7 @@ namespace VFolders
 
         }
 
-        public static TreeViewItem<int> lastHoveredTreeItem;
+        public static TreeViewItem lastHoveredTreeItem;
 
         public static Rect lastHoveredRowRect_screenSpace;
 
diff --git a/vfolders2/vFolders/VFoldersController.cs b/vfolders2/vFolders/VFoldersController.cs
index b0a9114..d15ecb3 100644
--- a/vfolders2/vFolders/VFoldersController.cs
+++ b/vfolders2/vFolders/VFoldersController.cs
@@ -148,7 +148,7 @@ namespace VFolders
 
 
 
-            var treeViewState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state");
+            var treeViewState = treeViewController?.GetPropertyValue<TreeViewState>("state");
 
             currentScrollPos = treeViewState?.scrollPos.y ?? 0;
 
@@ -197,7 +197,7 @@ namespace VFolders
 
 
 
-        public void ToggleExpanded(TreeViewItem<int> item)
+        public void ToggleExpanded(TreeViewItem item)
         {
             SetExpanded_withAnimation(item.id, !expandedIds.Contains(item.id));
 
@@ -233,12 +233,12 @@ namespace VFolders
 
         }
 
-        public void Isolate(TreeViewItem<int> targetItem)
+        public void Isolate(TreeViewItem targetItem)
         {
 
-            List<TreeViewItem<int>> getParents(TreeViewItem<int> item)
+            List<TreeViewItem> getParents(TreeViewItem item)
             {
-                var parents = new List<TreeViewItem<int>>();
+                var parents = new List<TreeViewItem>();
 
                 while (item.parent != null)
                     parents.Add(item = item.parent);
@@ -251,11 +251,11 @@ namespace VFolders
 
 
 
-            var expandedVisibleItems = new List<TreeViewItem<int>>();
+            var expandedVisibleItems = new List<TreeViewItem>();
 
             foreach (var expandedId in expandedIds)
                 if (GetRowIndex(expandedId) is int rowIndex && rowIndex != -1)
-                    expandedVisibleItems.Add(treeViewControllerData.InvokeMethod<TreeViewItem<int>>("GetItem", rowIndex));
+                    expandedVisibleItems.Add(treeViewControllerData.InvokeMethod<TreeViewItem>("GetItem", rowIndex));
 
 
 
@@ -391,7 +391,7 @@ namespace VFolders
 
         public void SetScrollPos(float targetScrollPos)
         {
-            treeViewController.GetPropertyValue<TreeViewState<int>>("state").scrollPos = Vector2.up * targetScrollPos;
+            treeViewController.GetPropertyValue<TreeViewState>("state").scrollPos = Vector2.up * targetScrollPos;
         }
 
 
diff --git a/vfolders2/vFolders/VFoldersGUI.cs b/vfolders2/vFolders/VFoldersGUI.cs
index 7551f00..51333d7 100644
--- a/vfolders2/vFolders/VFoldersGUI.cs
+++ b/vfolders2/vFolders/VFoldersGUI.cs
@@ -50,7 +50,7 @@ namespace VFolders
 
 
 
-            TreeViewItem<int> treeItem = null;
+            TreeViewItem treeItem = null;
 
             var isRowSelected = false;
             var isRowBeingRenamed = false;
@@ -88,7 +88,7 @@ namespace VFolders
                     if (treeItem != null) return;
                     if (isFavorite || isFavoritesRoot) return;
 
-                    treeItem = treeViewController?.InvokeMethod<TreeViewItem<int>>("FindItem", instanceId);
+                    treeItem = treeViewController?.InvokeMethod<TreeViewItem>("FindItem", instanceId);
 
                 }
 
@@ -407,8 +407,8 @@ namespace VFolders
 
                     var depth = ((rowRect.x - 16) / 14).RoundToInt();
 
-                    bool isLastChild(TreeViewItem<int> item) => item.parent?.children?.LastOrDefault() == item;
-                    bool hasChilren(TreeViewItem<int> item) => item.children != null && item.children.Count > 0;
+                    bool isLastChild(TreeViewItem item) => item.parent?.children?.LastOrDefault() == item;
+                    bool hasChilren(TreeViewItem item) => item.children != null && item.children.Count > 0;
 
                     void calcVerticalGaps_beforeFirstRowDrawn()
                     {
@@ -1123,10 +1123,10 @@ namespace VFolders
             treeViewController = window.GetFieldValue(isTwoColumns ? "m_FolderTree" : "m_AssetTree");
             treeViewControllerData = treeViewController?.GetPropertyValue("data");
 
-            rows = treeViewControllerData?.InvokeMethod<IList<TreeViewItem<int>>>("GetRows");
+            rows = treeViewControllerData?.InvokeMethod<IList<TreeViewItem>>("GetRows");
 
 
-            var treeViewState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state");
+            var treeViewState = treeViewController?.GetPropertyValue<TreeViewState>("state");
 
             expandedIds = treeViewState?.expandedIDs ?? new List<int>();
 
@@ -1177,7 +1177,7 @@ namespace VFolders
         public object treeViewController;
         public object treeViewControllerData;
 
-        public IList<TreeViewItem<int>> rows;
+        public IList<TreeViewItem> rows;
 
         public List<int> expandedIds = new();
 
diff --git a/vfolders2/vFolders/VFoldersHistory.cs b/vfolders2/vFolders/VFoldersHistory.cs
index bae7ba9..2f928fc 100644
--- a/vfolders2/vFolders/VFoldersHistory.cs
+++ b/vfolders2/vFolders/VFoldersHistory.cs
@@ -216,7 +216,7 @@ namespace VFolders
 
 
 
-            var treeViewControllerState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state");
+            var treeViewControllerState = treeViewController?.GetPropertyValue<TreeViewState>("state");
 
             currentScrollPos = treeViewControllerState?.scrollPos.y ?? 0;