diff --git a/Pipfile b/Pipfile
index d2237a5e1..11d13816c 100644
--- a/Pipfile
+++ b/Pipfile
@@ -12,7 +12,7 @@ black = "*"
 docopt = "*"
 requests = "*"
 pygount = "*"
-pyyaml = "*"
+pyyaml = ">=5.4"
 
 [requires]
 python_version = "3.9"
diff --git a/Pipfile.lock b/Pipfile.lock
index 52fa160ac..f129cf9a5 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -60,22 +60,30 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97",
-                "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76",
-                "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2",
-                "sha256:6034f55dab5fea9e53f436aa68fa3ace2634918e8b5994d82f3621c04ff5ed2e",
-                "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648",
-                "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf",
-                "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f",
-                "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2",
-                "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee",
-                "sha256:ad9c67312c84def58f3c04504727ca879cb0013b2517c85a9a253f0cb6380c0a",
-                "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d",
-                "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c",
-                "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"
+                "sha256:02c78d77281d8f8d07a255e57abdbf43b02257f59f50cc6b636937d68efa5dd0",
+                "sha256:0dc9f2eb2e3c97640928dec63fd8dc1dd91e6b6ed236bd5ac00332b99b5c2ff9",
+                "sha256:124fd7c7bc1e95b1eafc60825f2daf67c73ce7b33f1194731240d24b0d1bf628",
+                "sha256:26fcb33776857f4072601502d93e1a619f166c9c00befb52826e7b774efaa9db",
+                "sha256:31ba07c54ef4a897758563e3a0fcc60077698df10180abe4b8165d9895c00ebf",
+                "sha256:3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a",
+                "sha256:52bf0930903818e600ae6c2901f748bc4869c0c406056f679ab9614e5d21a166",
+                "sha256:5a3f345acff76cad4aa9cb171ee76c590f37394186325d53d1aa25318b0d4a09",
+                "sha256:5e7ac4e0e79a53451dc2814f6876c2fa6f71452de1498bbe29c0b54b69a986f4",
+                "sha256:7242790ab6c20316b8e7bb545be48d7ed36e26bbe279fd56f2c4a12510e60b4b",
+                "sha256:737bd70e454a284d456aa1fa71a0b429dd527bcbf52c5c33f7c8eee81ac16b89",
+                "sha256:8635d53223b1f561b081ff4adecb828fd484b8efffe542edcfdff471997f7c39",
+                "sha256:8b818b6c5a920cbe4203b5a6b14256f0e5244338244560da89b7b0f1313ea4b6",
+                "sha256:8bf38641b4713d77da19e91f8b5296b832e4db87338d6aeffe422d42f1ca896d",
+                "sha256:a36a48a51e5471513a5aea920cdad84cbd56d70a5057cca3499a637496ea379c",
+                "sha256:b2243dd033fd02c01212ad5c601dafb44fbb293065f430b0d3dbf03f3254d615",
+                "sha256:cc547d3ead3754712223abb7b403f0a184e4c3eae18c9bb7fd15adef1597cc4b",
+                "sha256:cc552b6434b90d9dbed6a4f13339625dc466fd82597119897e9489c953acbc22",
+                "sha256:f3790156c606299ff499ec44db422f66f05a7363b39eb9d5b064f17bd7d7c47b",
+                "sha256:f7a21e3d99aa3095ef0553e7ceba36fb693998fbb1226f1392ce33681047465f",
+                "sha256:fdc6b2cb4b19e431994f25a9160695cc59a4e861710cc6fc97161c5e845fc579"
             ],
             "index": "pypi",
-            "version": "==5.3.1"
+            "version": "==5.4"
         },
         "requests": {
             "hashes": [
@@ -87,11 +95,10 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80",
-                "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"
+                "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df",
+                "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"
             ],
-            "index": "pypi",
-            "version": "==1.26.3"
+            "version": "==1.26.4"
         }
     },
     "develop": {
@@ -125,39 +132,37 @@
         },
         "isort": {
             "hashes": [
-                "sha256:c729845434366216d320e936b8ad6f9d681aab72dc7cbc2d51bedc3582f3ad1e",
-                "sha256:fff4f0c04e1825522ce6949973e83110a6e907750cd92d128b0d14aaaadbffdc"
+                "sha256:0a943902919f65c5684ac4e0154b1ad4fac6dcaa5d9f3426b732f1c8b5419be6",
+                "sha256:2bb1680aad211e3c9944dbce1d4ba09a989f04e238296c87fe2139faa26d655d"
             ],
-            "version": "==5.7.0"
+            "version": "==5.8.0"
         },
         "lazy-object-proxy": {
             "hashes": [
-                "sha256:1d33d6f789697f401b75ce08e73b1de567b947740f768376631079290118ad39",
-                "sha256:2f2de8f8ac0be3e40d17730e0600619d35c78c13a099ea91ef7fb4ad944ce694",
-                "sha256:3782931963dc89e0e9a0ae4348b44762e868ea280e4f8c233b537852a8996ab9",
-                "sha256:37d9c34b96cca6787fe014aeb651217944a967a5b165e2cacb6b858d2997ab84",
-                "sha256:38c3865bd220bd983fcaa9aa11462619e84a71233bafd9c880f7b1cb753ca7fa",
-                "sha256:429c4d1862f3fc37cd56304d880f2eae5bd0da83bdef889f3bd66458aac49128",
-                "sha256:522b7c94b524389f4a4094c4bf04c2b02228454ddd17c1a9b2801fac1d754871",
-                "sha256:57fb5c5504ddd45ed420b5b6461a78f58cbb0c1b0cbd9cd5a43ad30a4a3ee4d0",
-                "sha256:5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4",
-                "sha256:6f4e5e68b7af950ed7fdb594b3f19a0014a3ace0fedb86acb896e140ffb24302",
-                "sha256:71a1ef23f22fa8437974b2d60fedb947c99a957ad625f83f43fd3de70f77f458",
-                "sha256:8a44e9901c0555f95ac401377032f6e6af66d8fc1fbfad77a7a8b1a826e0b93c",
-                "sha256:b6577f15d5516d7d209c1a8cde23062c0f10625f19e8dc9fb59268859778d7d7",
-                "sha256:c8fe2d6ff0ff583784039d0255ea7da076efd08507f2be6f68583b0da32e3afb",
-                "sha256:cadfa2c2cf54d35d13dc8d231253b7985b97d629ab9ca6e7d672c35539d38163",
-                "sha256:cd1bdace1a8762534e9a36c073cd54e97d517a17d69a17985961265be6d22847",
-                "sha256:ddbdcd10eb999d7ab292677f588b658372aadb9a52790f82484a37127a390108",
-                "sha256:e7273c64bccfd9310e9601b8f4511d84730239516bada26a0c9846c9697617ef",
-                "sha256:e7428977763150b4cf83255625a80a23dfdc94d43be7791ce90799d446b4e26f",
-                "sha256:e960e8be509e8d6d618300a6c189555c24efde63e85acaf0b14b2cd1ac743315",
-                "sha256:ecb5dd5990cec6e7f5c9c1124a37cb2c710c6d69b0c1a5c4aa4b35eba0ada068",
-                "sha256:ef3f5e288aa57b73b034ce9c1f1ac753d968f9069cd0742d1d69c698a0167166",
-                "sha256:fa5b2dee0e231fa4ad117be114251bdfe6afe39213bd629d43deb117b6a6c40a",
-                "sha256:fa7fb7973c622b9e725bee1db569d2c2ee64d2f9a089201c5e8185d482c7352d"
+                "sha256:17e0967ba374fc24141738c69736da90e94419338fd4c7c7bef01ee26b339653",
+                "sha256:1fee665d2638491f4d6e55bd483e15ef21f6c8c2095f235fef72601021e64f61",
+                "sha256:22ddd618cefe54305df49e4c069fa65715be4ad0e78e8d252a33debf00f6ede2",
+                "sha256:24a5045889cc2729033b3e604d496c2b6f588c754f7a62027ad4437a7ecc4837",
+                "sha256:410283732af311b51b837894fa2f24f2c0039aa7f220135192b38fcc42bd43d3",
+                "sha256:4732c765372bd78a2d6b2150a6e99d00a78ec963375f236979c0626b97ed8e43",
+                "sha256:489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726",
+                "sha256:4f60460e9f1eb632584c9685bccea152f4ac2130e299784dbaf9fae9f49891b3",
+                "sha256:5743a5ab42ae40caa8421b320ebf3a998f89c85cdc8376d6b2e00bd12bd1b587",
+                "sha256:85fb7608121fd5621cc4377a8961d0b32ccf84a7285b4f1d21988b2eae2868e8",
+                "sha256:9698110e36e2df951c7c36b6729e96429c9c32b3331989ef19976592c5f3c77a",
+                "sha256:9d397bf41caad3f489e10774667310d73cb9c4258e9aed94b9ec734b34b495fd",
+                "sha256:b579f8acbf2bdd9ea200b1d5dea36abd93cabf56cf626ab9c744a432e15c815f",
+                "sha256:b865b01a2e7f96db0c5d12cfea590f98d8c5ba64ad222300d93ce6ff9138bcad",
+                "sha256:bf34e368e8dd976423396555078def5cfc3039ebc6fc06d1ae2c5a65eebbcde4",
+                "sha256:c6938967f8528b3668622a9ed3b31d145fab161a32f5891ea7b84f6b790be05b",
+                "sha256:d1c2676e3d840852a2de7c7d5d76407c772927addff8d742b9808fe0afccebdf",
+                "sha256:d7124f52f3bd259f510651450e18e0fd081ed82f3c08541dffc7b94b883aa981",
+                "sha256:d900d949b707778696fdf01036f58c9876a0d8bfe116e8d220cfd4b15f14e741",
+                "sha256:ebfd274dcd5133e0afae738e6d9da4323c3eb021b3e13052d8cbd0e457b1256e",
+                "sha256:ed361bb83436f117f9917d282a456f9e5009ea12fd6de8742d1a4752c3017e93",
+                "sha256:f5144c75445ae3ca2057faac03fda5a902eff196702b0a24daf1d6ce0650514b"
             ],
-            "version": "==1.5.2"
+            "version": "==1.6.0"
         },
         "mccabe": {
             "hashes": [
diff --git a/bin/engines/CPY378/pyRevitLabs.PythonNet.dll b/bin/engines/CPY378/pyRevitLabs.PythonNet.dll
index 51f3d89a4..21d9f8639 100644
Binary files a/bin/engines/CPY378/pyRevitLabs.PythonNet.dll and b/bin/engines/CPY378/pyRevitLabs.PythonNet.dll differ
diff --git a/bin/engines/CPY385/pyRevitLabs.PythonNet.dll b/bin/engines/CPY385/pyRevitLabs.PythonNet.dll
index 647611126..6c95477be 100644
Binary files a/bin/engines/CPY385/pyRevitLabs.PythonNet.dll and b/bin/engines/CPY385/pyRevitLabs.PythonNet.dll differ
diff --git a/bin/engines/IPY2710/pyRevitLoader.dll b/bin/engines/IPY2710/pyRevitLoader.dll
index c53481d7d..e4c2d70a4 100644
Binary files a/bin/engines/IPY2710/pyRevitLoader.dll and b/bin/engines/IPY2710/pyRevitLoader.dll differ
diff --git a/bin/engines/IPY2710/pyRevitRunner.dll b/bin/engines/IPY2710/pyRevitRunner.dll
index ff466e8cb..767c89fdf 100644
Binary files a/bin/engines/IPY2710/pyRevitRunner.dll and b/bin/engines/IPY2710/pyRevitRunner.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Modules.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Modules.dll
index 123cfd693..0d2a51d77 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Modules.dll and b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Modules.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.SQLite.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.SQLite.dll
index df01c5aa9..e64c2b2b9 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.SQLite.dll and b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.SQLite.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Wpf.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Wpf.dll
index f2b6bd18f..cce203d42 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Wpf.dll and b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Wpf.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.dll
index 2231ad795..37af00aa3 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.dll and b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Dynamic.dll b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Dynamic.dll
index 0553a0061..b4cd3dc6a 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Dynamic.dll and b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Dynamic.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.Metadata.dll b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.Metadata.dll
index d4a64d2f4..78663c4e5 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.Metadata.dll and b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.Metadata.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.dll b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.dll
index 35c37b08f..419c78f82 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.dll and b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitLoader.dll b/bin/engines/IPY2711PR/pyRevitLoader.dll
index f71b057f4..d7bf90020 100644
Binary files a/bin/engines/IPY2711PR/pyRevitLoader.dll and b/bin/engines/IPY2711PR/pyRevitLoader.dll differ
diff --git a/bin/engines/IPY2711PR/pyRevitRunner.dll b/bin/engines/IPY2711PR/pyRevitRunner.dll
index 340651087..5326fbade 100644
Binary files a/bin/engines/IPY2711PR/pyRevitRunner.dll and b/bin/engines/IPY2711PR/pyRevitRunner.dll differ
diff --git a/bin/engines/IPY273/pyRevitLoader.dll b/bin/engines/IPY273/pyRevitLoader.dll
index 9603ae59a..6386fc38c 100644
Binary files a/bin/engines/IPY273/pyRevitLoader.dll and b/bin/engines/IPY273/pyRevitLoader.dll differ
diff --git a/bin/engines/IPY273/pyRevitRunner.dll b/bin/engines/IPY273/pyRevitRunner.dll
index 1e922a3fe..c7dfb0c8b 100644
Binary files a/bin/engines/IPY273/pyRevitRunner.dll and b/bin/engines/IPY273/pyRevitRunner.dll differ
diff --git a/bin/engines/IPY277/pyRevitLoader.dll b/bin/engines/IPY277/pyRevitLoader.dll
index 4a01bd63f..420c65219 100644
Binary files a/bin/engines/IPY277/pyRevitLoader.dll and b/bin/engines/IPY277/pyRevitLoader.dll differ
diff --git a/bin/engines/IPY277/pyRevitRunner.dll b/bin/engines/IPY277/pyRevitRunner.dll
index 46d9f9485..f9a89bec6 100644
Binary files a/bin/engines/IPY277/pyRevitRunner.dll and b/bin/engines/IPY277/pyRevitRunner.dll differ
diff --git a/bin/engines/IPY278/pyRevitLoader.dll b/bin/engines/IPY278/pyRevitLoader.dll
index 4950c4cb8..7e037799c 100644
Binary files a/bin/engines/IPY278/pyRevitLoader.dll and b/bin/engines/IPY278/pyRevitLoader.dll differ
diff --git a/bin/engines/IPY278/pyRevitRunner.dll b/bin/engines/IPY278/pyRevitRunner.dll
index 5d5cc2f86..7cdffdad4 100644
Binary files a/bin/engines/IPY278/pyRevitRunner.dll and b/bin/engines/IPY278/pyRevitRunner.dll differ
diff --git a/bin/engines/IPY279/pyRevitLoader.dll b/bin/engines/IPY279/pyRevitLoader.dll
index 9c40950a5..35ec2d833 100644
Binary files a/bin/engines/IPY279/pyRevitLoader.dll and b/bin/engines/IPY279/pyRevitLoader.dll differ
diff --git a/bin/engines/IPY279/pyRevitRunner.dll b/bin/engines/IPY279/pyRevitRunner.dll
index 067c138fe..2a6b97daa 100644
Binary files a/bin/engines/IPY279/pyRevitRunner.dll and b/bin/engines/IPY279/pyRevitRunner.dll differ
diff --git a/bin/pyRevitLabs.Common.dll b/bin/pyRevitLabs.Common.dll
index 0651a6fc4..7abb7a99b 100644
Binary files a/bin/pyRevitLabs.Common.dll and b/bin/pyRevitLabs.Common.dll differ
diff --git a/bin/pyRevitLabs.CommonCLI.dll b/bin/pyRevitLabs.CommonCLI.dll
index 70fe7c78f..32a26e1c0 100644
Binary files a/bin/pyRevitLabs.CommonCLI.dll and b/bin/pyRevitLabs.CommonCLI.dll differ
diff --git a/bin/pyRevitLabs.CommonWPF.dll b/bin/pyRevitLabs.CommonWPF.dll
index f075b9289..8ab888d8a 100644
Binary files a/bin/pyRevitLabs.CommonWPF.dll and b/bin/pyRevitLabs.CommonWPF.dll differ
diff --git a/bin/pyRevitLabs.DeffrelDB.dll b/bin/pyRevitLabs.DeffrelDB.dll
index 036ccd5ca..6aea97516 100644
Binary files a/bin/pyRevitLabs.DeffrelDB.dll and b/bin/pyRevitLabs.DeffrelDB.dll differ
diff --git a/bin/pyRevitLabs.Emojis.dll b/bin/pyRevitLabs.Emojis.dll
index 0e1d77a42..fac673a35 100644
Binary files a/bin/pyRevitLabs.Emojis.dll and b/bin/pyRevitLabs.Emojis.dll differ
diff --git a/bin/pyRevitLabs.Json.dll b/bin/pyRevitLabs.Json.dll
index c55904619..b060d416a 100644
Binary files a/bin/pyRevitLabs.Json.dll and b/bin/pyRevitLabs.Json.dll differ
diff --git a/bin/pyRevitLabs.Language.dll b/bin/pyRevitLabs.Language.dll
index b7d246c1f..ac89c251e 100644
Binary files a/bin/pyRevitLabs.Language.dll and b/bin/pyRevitLabs.Language.dll differ
diff --git a/bin/pyRevitLabs.MahAppsMetro.dll b/bin/pyRevitLabs.MahAppsMetro.dll
index 7a7f4e4b7..e8d309543 100644
Binary files a/bin/pyRevitLabs.MahAppsMetro.dll and b/bin/pyRevitLabs.MahAppsMetro.dll differ
diff --git a/bin/pyRevitLabs.NLog.dll b/bin/pyRevitLabs.NLog.dll
index dd8083279..69c5e569c 100644
Binary files a/bin/pyRevitLabs.NLog.dll and b/bin/pyRevitLabs.NLog.dll differ
diff --git a/bin/pyRevitLabs.PyRevit.dll b/bin/pyRevitLabs.PyRevit.dll
index accdcaa69..6275ad079 100644
Binary files a/bin/pyRevitLabs.PyRevit.dll and b/bin/pyRevitLabs.PyRevit.dll differ
diff --git a/bin/pyRevitLabs.TargetApps.AutoCAD.dll b/bin/pyRevitLabs.TargetApps.AutoCAD.dll
index 3c4f4747f..39be11214 100644
Binary files a/bin/pyRevitLabs.TargetApps.AutoCAD.dll and b/bin/pyRevitLabs.TargetApps.AutoCAD.dll differ
diff --git a/bin/pyRevitLabs.TargetApps.Navisworks.dll b/bin/pyRevitLabs.TargetApps.Navisworks.dll
index 15c44bcff..9a5714735 100644
Binary files a/bin/pyRevitLabs.TargetApps.Navisworks.dll and b/bin/pyRevitLabs.TargetApps.Navisworks.dll differ
diff --git a/bin/pyRevitLabs.TargetApps.Revit.dll b/bin/pyRevitLabs.TargetApps.Revit.dll
index adbc68e34..8d38d3182 100644
Binary files a/bin/pyRevitLabs.TargetApps.Revit.dll and b/bin/pyRevitLabs.TargetApps.Revit.dll differ
diff --git a/bin/pyrevit-autocomplete.exe b/bin/pyrevit-autocomplete.exe
index 466a1f416..4969d3ac0 100644
Binary files a/bin/pyrevit-autocomplete.exe and b/bin/pyrevit-autocomplete.exe differ
diff --git a/bin/pyrevit-doctor.exe b/bin/pyrevit-doctor.exe
index f281407f7..443dd5e36 100644
Binary files a/bin/pyrevit-doctor.exe and b/bin/pyrevit-doctor.exe differ
diff --git a/bin/pyrevit-products.json b/bin/pyrevit-products.json
index dc009aca8..9ab49038b 100644
--- a/bin/pyrevit-products.json
+++ b/bin/pyrevit-products.json
@@ -1,4 +1,10 @@
 [
+ {
+  "product": "pyRevit",
+  "release": "4.8.7",
+  "version": "4.8.7",
+  "key": "{FED5DEF7-8D3B-4832-BB3E-55C10FCF9ACF}"
+ },
  {
   "product": "pyRevit",
   "release": "4.8.6",
@@ -227,6 +233,12 @@
   "version": "4.6.1",
   "key": "{EF91A585-DC0C-43B8-B88B-4C130F430E84}"
  },
+ {
+  "product": "pyRevit CLI",
+  "release": "4.8.7",
+  "version": "4.8.7",
+  "key": "{E61BB97E-6FF1-4706-A92E-D9F38EB9C77B}"
+ },
  {
   "product": "pyRevit CLI",
   "release": "4.8.6",
diff --git a/bin/pyrevit-stubsbuilder.exe b/bin/pyrevit-stubsbuilder.exe
index d26cd8950..192ea6233 100644
Binary files a/bin/pyrevit-stubsbuilder.exe and b/bin/pyrevit-stubsbuilder.exe differ
diff --git a/bin/pyrevit-telemetryserver.exe b/bin/pyrevit-telemetryserver.exe
index 103f89272..fbf210e34 100644
Binary files a/bin/pyrevit-telemetryserver.exe and b/bin/pyrevit-telemetryserver.exe differ
diff --git a/bin/pyrevit-toast.exe b/bin/pyrevit-toast.exe
index 3f8a3757e..2aef129e0 100644
Binary files a/bin/pyrevit-toast.exe and b/bin/pyrevit-toast.exe differ
diff --git a/bin/pyrevit.exe b/bin/pyrevit.exe
index 157dab8f1..8ef62107e 100644
Binary files a/bin/pyrevit.exe and b/bin/pyrevit.exe differ
diff --git a/dev/pyRevit/AssemblyVersion.cs b/dev/pyRevit/AssemblyVersion.cs
index e494462b3..7b22357f2 100644
--- a/dev/pyRevit/AssemblyVersion.cs
+++ b/dev/pyRevit/AssemblyVersion.cs
@@ -2,5 +2,5 @@
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("4.8.6")]
-[assembly: AssemblyFileVersion("4.8.6")]
+[assembly: AssemblyVersion("4.8.7")]
+[assembly: AssemblyFileVersion("4.8.7")]
diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs
index f75586b4f..035f8b0a9 100644
--- a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs
+++ b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs
@@ -80,6 +80,7 @@ internal static class PyRevitCLI {
         internal static bool IsHelpUsagePatternMode = false;
 
         // cli version property
+        public static string CLIPath => Assembly.GetExecutingAssembly().Location;
         public static Version CLIVersion => Assembly.GetExecutingAssembly().GetName().Version;
 
         // cli entry point:
@@ -218,12 +219,20 @@ private static void ProcessArguments() {
                 else if (all("open"))
                     PyRevitCLICloneCmds.OpenClone(TryGetValue("<clone_name>"));
 
-                else if (all("add"))
-                    PyRevitCLICloneCmds.RegisterClone(
-                        TryGetValue("<clone_name>"),
-                        TryGetValue("<clone_path>"),
-                        force: arguments["--force"].IsTrue
-                        );
+                else if (all("add")) {
+                    if(all("this"))
+                        PyRevitCLICloneCmds.RegisterClone(
+                            TryGetValue("<clone_name>"),
+                            Path.GetDirectoryName(CLIPath),
+                            force: arguments["--force"].IsTrue
+                            );
+                    else
+                        PyRevitCLICloneCmds.RegisterClone(
+                            TryGetValue("<clone_name>"),
+                            TryGetValue("<clone_path>"),
+                            force: arguments["--force"].IsTrue
+                            );
+                }
 
                 else if (all("forget"))
                     PyRevitCLICloneCmds.ForgetClone(
diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs
index b1369a1cd..4755ac3fe 100644
--- a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs
+++ b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs
@@ -97,6 +97,7 @@ internal static void
                             { "info",                   "Print info about clone" },
                             { "open",                   "Open clone directory in file browser" },
                             { "add",                    "Register an existing clone" },
+                            { "add this",               "Register clone that contains this utility" },
                             { "forget",                 "Forget a registered clone" },
                             { "rename",                 "Rename a clone" },
                             { "delete",                 "Delete a clone" },
@@ -116,6 +117,7 @@ internal static void
                             { "<tag_name>",             "Clone tag to rebase to" },
                             { "<commit_hash>",          "Clone commit rebase to" },
                             { "<origin_url>",           "New clone remote origin url" },
+                            { "--force",                "Just do it; I know what I am doing" },
                             { "--reset",                "Reset remote origin url to default" },
                             { "--clearconfigs",         "Clear pyRevit configurations." },
                             { "--all",                  "All clones" },
diff --git a/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt b/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt
index ebc2d8c3d..a507dc2a1 100644
--- a/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt
+++ b/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt
@@ -11,6 +11,7 @@ Usage:
 	pyrevit clone <clone_name> [--dest=<dest_path>] [--source=<repo_url>] [--branch=<branch_name>] [--log=<log_file>] [(--username=<username> --password=<password> | --token=<auth_token>)]
 	pyrevit clones [(-h | --help)]
 	pyrevit clones (info | open) <clone_name>
+	pyrevit clones add this <clone_name> [--force] [--log=<log_file>]
 	pyrevit clones add <clone_name> <clone_path> [--force] [--log=<log_file>]
 	pyrevit clones forget (--all | <clone_name>) [--log=<log_file>]
 	pyrevit clones rename <clone_name> <clone_new_name> [--log=<log_file>]
diff --git a/dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs b/dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs
index 0775ddf02..56f10697f 100644
--- a/dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs
+++ b/dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs
@@ -13,6 +13,7 @@
 using pyRevitLabs.Common.Extensions;
 using pyRevitLabs.NLog;
 using System.Linq;
+using System.Threading;
 
 namespace pyRevitLabs.Common {
     public static class CommonUtils {
@@ -29,6 +30,44 @@ public static bool VerifyFile(string filePath) {
             return false;
         }
 
+        // https://stackoverflow.com/a/937558/2350244
+        public static bool IsFileLocked(FileInfo file) {
+            try {
+                using (FileStream stream = file.Open(FileMode.Open, FileAccess.Read, FileShare.None)) {
+                    stream.Close();
+                }
+            }
+            catch (IOException) {
+                //the file is unavailable because it is:
+                //still being written to
+                //or being processed by another thread
+                //or does not exist (has already been processed)
+                return true;
+            }
+
+            //file is not locked
+            return false;
+        }
+
+        public static void VerifyFileAccessible(string filePath) {
+            // make sure file is accessible,
+            // try multiple times and wait a little in between
+            // fail after trying
+            var finfo = new FileInfo(filePath);
+
+            uint tries = 3;
+            do {
+                if (IsFileLocked(finfo)) {
+                    Thread.Sleep(200);
+                    tries--;
+                }
+                else
+                    return;
+            } while (tries > 0);
+
+            throw new PyRevitException("File is not accessible");
+        }
+
         public static bool VerifyPath(string path) {
             if (path != null && path != string.Empty)
                 return Directory.Exists(path);
@@ -157,8 +196,8 @@ public static string DownloadFile(string url, string destPath, string progressTo
                     //    while (client.IsBusy) ;
                     //}
                     //else {
-                        logger.Debug("Downloading \"{0}\"", url);
-                        client.DownloadFile(url, destPath);
+                    logger.Debug("Downloading \"{0}\"", url);
+                    client.DownloadFile(url, destPath);
                     //}
                 }
             }
diff --git a/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs b/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs
index e703694e0..5210228a1 100644
--- a/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs
+++ b/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs
@@ -93,6 +93,11 @@ public static string GetLoggedInUserName() {
             return null;
         }
 
+        public static bool IsRunAsElevated() {
+            WindowsIdentity id = WindowsIdentity.GetCurrent();
+            return id.Owner != id.User;
+        }
+
         public static bool IsRunAsAdmin() {
             WindowsIdentity id = WindowsIdentity.GetCurrent();
             WindowsPrincipal principal = new WindowsPrincipal(id);
diff --git a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfig.cs b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfig.cs
index aa9cce5f0..5c3286dbf 100644
--- a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfig.cs
+++ b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfig.cs
@@ -19,6 +19,7 @@ public class PyRevitConfig {
         public PyRevitConfig(string cfgFilePath) {
             if (cfgFilePath != null) {
                 if (CommonUtils.VerifyFile(cfgFilePath)) {
+                    CommonUtils.VerifyFileAccessible(cfgFilePath);
                     ConfigFilePath = cfgFilePath;
 
                     // INI formatting
diff --git a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfigs.cs b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfigs.cs
index fcece42f6..2ecd893a7 100644
--- a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfigs.cs
+++ b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfigs.cs
@@ -65,6 +65,7 @@ public static void SeedConfig(bool makeCurrentUserAsOwner = false, string setupF
             try {
                 if (File.Exists(sourceFile)) {
                     CommonUtils.EnsureFile(targetFile);
+                    CommonUtils.VerifyFileAccessible(targetFile);
                     File.Copy(sourceFile, targetFile, true);
 
                     if (makeCurrentUserAsOwner) {
diff --git a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs
index d35ab279c..2fd6788af 100644
--- a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs
+++ b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs
@@ -198,8 +198,9 @@ public static string FindConfigFileInDirectory(string sourcePath) {
         // @reviewed
         public static string ConfigFilePath {
             get {
-                var cfgFile = FindConfigFileInDirectory(PyRevitLabsConsts.PyRevitPath);
-                return cfgFile != null ? cfgFile : Path.Combine(PyRevitLabsConsts.PyRevitPath, DefaultConfigsFileName);
+                string configRoot = UserEnv.IsRunAsElevated() ? PyRevitLabsConsts.PyRevitProgramDataPath : PyRevitLabsConsts.PyRevitPath;
+                var cfgFile = FindConfigFileInDirectory(configRoot);
+                return cfgFile != null ? cfgFile : Path.Combine(configRoot, DefaultConfigsFileName);
             }
         }
 
diff --git a/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitAddons.cs b/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitAddons.cs
index 899a0d3ea..51c1abd95 100644
--- a/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitAddons.cs
+++ b/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitAddons.cs
@@ -54,6 +54,9 @@ public static string GetRevitAddonsFolder(int revitYear, bool allUsers = false)
         }
 
         public static string GetRevitAddonsFilePath(int revitYear, string addinFileName, bool allusers = false) {
+            if (UserEnv.IsRunAsElevated())
+                allusers = true;
+            
             var rootFolder =
                 allusers ? System.Environment.SpecialFolder.CommonApplicationData : System.Environment.SpecialFolder.ApplicationData;
             return Path.Combine(GetRevitAddonsFolder(revitYear, allUsers: allusers), addinFileName + ".addin");
diff --git a/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs b/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs
index d3c44a8aa..2d270bbc4 100644
--- a/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs
+++ b/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs
@@ -4,13 +4,26 @@
 using Autodesk.Revit.UI;
 using Autodesk.Revit.Attributes;
 
+/* Note:
+ * It is necessary that this code object do not have any references to IronPython.
+ * To ensure the correct version of IronPython dlls are loaded, the OnStartup()
+ * methods manually loads the IronPython assemblies before calling into the 
+ * ScriptExecutor that has IronPython references
+ */
 namespace PyRevitLoader {
     [Regeneration(RegenerationOption.Manual)]
     [Transaction(TransactionMode.Manual)]
     class PyRevitLoaderApplication : IExternalApplication {
+        public static string LoaderPath => Path.GetDirectoryName(typeof(PyRevitLoaderApplication).Assembly.Location);
+
         // Hook into Revit to allow starting a command.
         Result IExternalApplication.OnStartup(UIControlledApplication application) {
             try {
+                // load all engine assemblies
+                // this is to ensure pyRevit is loaded on its own assemblies
+                foreach (var engineDll in Directory.GetFiles(LoaderPath, "*.dll"))
+                    Assembly.LoadFrom(engineDll);
+                
                 return ExecuteStartupScript(application);
             }
             catch (Exception ex) {
diff --git a/dev/pyRevitLoader/Source/PyRevitRunnerApplication.cs b/dev/pyRevitLoader/Source/PyRevitRunnerApplication.cs
index 7e47c1c47..53d15f757 100644
--- a/dev/pyRevitLoader/Source/PyRevitRunnerApplication.cs
+++ b/dev/pyRevitLoader/Source/PyRevitRunnerApplication.cs
@@ -1,14 +1,29 @@
 using System;
+using System.IO;
+using System.Reflection;
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.UI;
 
+/* Note:
+ * It is necessary that this code object do not have any references to IronPython.
+ * To ensure the correct version of IronPython dlls are loaded, the OnStartup()
+ * methods manually loads the IronPython assemblies before calling into the 
+ * ScriptExecutor that has IronPython references
+ */
 namespace PyRevitRunner {
     [Regeneration(RegenerationOption.Manual)]
     [Transaction(TransactionMode.Manual)]
     class PyRevitRunnerApplication : IExternalApplication {
+        public static string LoaderPath => Path.GetDirectoryName(typeof(PyRevitRunnerApplication).Assembly.Location);
+
         // Hook into Revit to allow starting a command.
         Result IExternalApplication.OnStartup(UIControlledApplication application) {
             try {
+                // load all engine assemblies
+                // this is to ensure pyRevit is loaded on its own assemblies
+                foreach (var engineDll in Directory.GetFiles(LoaderPath, "*.dll"))
+                    Assembly.LoadFrom(engineDll);
+
                 return RegisterExternalCommand(application);
             }
             catch (Exception ex) {
diff --git a/dev/pyRevitWPFForms/pyRevitWPFForms.csproj b/dev/pyRevitWPFForms/pyRevitWPFForms.csproj
index c65a74c30..390593f37 100644
--- a/dev/pyRevitWPFForms/pyRevitWPFForms.csproj
+++ b/dev/pyRevitWPFForms/pyRevitWPFForms.csproj
@@ -67,6 +67,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="..\..\extensions\pyRevitDevTools.extension\DockableExample.xaml">
+      <Link>Dev\DockableExample.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="..\..\extensions\pyRevitDevTools.extension\pyRevitDev.tab\Debug.panel\Engine Tests.pulldown\Test Persistent Engine.pushbutton\NonModalWindow.xaml">
       <Link>Dev\NonModalWindow.xaml</Link>
       <Generator>MSBuild:Compile</Generator>
diff --git a/docs/Pipfile b/docs/Pipfile
index 8d84b68b4..20dbc8bf8 100644
--- a/docs/Pipfile
+++ b/docs/Pipfile
@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 sphinx-rtd-theme = "*"
-pygments = "*"
+pygments = ">=2.7.4"
 sphinx = "*"
 readthedocs-sphinx-ext = "*"
 "doc8" = "*"
diff --git a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/About.pushbutton/aboutscript.py b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/About.pushbutton/aboutscript.py
index 6e1d33e13..ba47ec445 100644
--- a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/About.pushbutton/aboutscript.py
+++ b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/About.pushbutton/aboutscript.py
@@ -52,10 +52,12 @@ def __init__(self, xaml_file_name):
         self.version.Text = nice_version
         self.pyrevit_branch.Text = self.branch_name
         self.pyrevit_deploy.Text = '{} deployment'.format(self.deployname)
-        self.pyrevit_engine.Text = \
-            'Running on IronPython {} (cpython {})'\
-                .format(sys.version.split('(')[0].strip(),
-                        '.'.join(list(str(user_config.cpython_engine_version))))
+        cpyver = user_config.get_active_cpython_engine()
+        if cpyver:
+            self.pyrevit_engine.Text = \
+                'Running on IronPython {} (cpython {})'\
+                    .format(sys.version.split('(')[0].strip(),
+                            '.'.join(list(str(cpyver.Version))))
 
         rocketmodetext = \
             'Rocket-mode {}' \
diff --git a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/SettingsWindow.xaml b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/SettingsWindow.xaml
index 41a628690..4432d066e 100644
--- a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/SettingsWindow.xaml
+++ b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/SettingsWindow.xaml
@@ -534,7 +534,8 @@
                         <TextBlock x:Name="revitversions_tb" TextWrapping="WrapWithOverflow">
                             You can disable or enable pyRevit for installed
                             Revit versions from here. This effectively removes the
-                            pyRevit.addin manifest file from %appdata%/Autodesk/Revit/Addins folders.
+                            pyRevit.addin manifest file from %appdata%/Autodesk/Revit/Addins folders. Note that attachment to any of Revit versions listed here will be read-only and can not be changed, if it is 
+                            marked with &lt;current&gt; or &lt;all users&gt;
                         </TextBlock>
                         <CheckBox x:Name="revit2021_cb" Style="{StaticResource RevitCheckbox}" Margin="0,10,0,0" IsChecked="False" IsEnabled="False">
                             Autodesk Revit 2021
@@ -624,10 +625,12 @@
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="26" />
                                                 <ColumnDefinition Width="31" />
-                                                <ColumnDefinition Width="240" />
+                                                <ColumnDefinition Width="50" />
+                                                <ColumnDefinition Width="190" />
                                             </Grid.ColumnDefinitions>
                                             <Button Grid.Column="0" Width="26" Content="+" Padding="0,-3,0,0" FontSize="14" Background="White" BorderBrush="DarkGray" Click="add_ordercolor" />
                                             <Button Grid.Column="1" Width="26" Margin="5,0,0,0" Content="-" Padding="0,-3,0,0" FontSize="14" Background="White" BorderBrush="DarkGray" Click="remove_ordercolor" />
+                                            <Button Grid.Column="2" Margin="5,0,0,0" Content="Reset" Padding="0,-3,0,0" Background="White" BorderBrush="DarkGray" Click="reset_ordercolors" />
                                         </Grid>
                                         <TextBlock DockPanel.Dock="Left" Text="By Order" VerticalAlignment="Center" Margin="0,0,10,0" Width="55" />
                                         <ListView x:Name="doc_ordercolor_lb"
diff --git a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/script.py b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/script.py
index a030c7ded..9751d7675 100644
--- a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/script.py
+++ b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/script.py
@@ -384,16 +384,20 @@ def _setup_addinfiles(self):
                             attachments[rvt_ver].Product,
                             ''
                             )
-                    checkbox.IsEnabled = True
-                    checkbox.IsChecked = True
                 else:
                     checkbox.Content = \
                         self._make_product_name(
                             attachments[rvt_ver].Product,
-                            '<Current version>'
+                            '<current>'
                             )
+
+                checkbox.IsChecked = True
+                if attachments[rvt_ver].AttachmentType == \
+                        PyRevit.PyRevitAttachmentType.AllUsers:
                     checkbox.IsEnabled = False
-                    checkbox.IsChecked = True
+                    checkbox.Content += " <all users>"
+                else:
+                    checkbox.IsEnabled = True
             else:
                 if rvt_ver in installed_revits:
                     checkbox.Content = \
@@ -417,8 +421,11 @@ def update_addinfiles(self):
         # update active engine
         attachment = user_config.get_current_attachment()
         if attachment:
-            all_users = attachment.AttachmentType == \
-                PyRevit.PyRevitAttachmentType.AllUsers
+            # if attachment is for all users dont attempt at making changes
+            # user probably does not have write access and this fails
+            if attachment.AttachmentType == \
+                    PyRevit.PyRevitAttachmentType.AllUsers:
+                return
 
             # notify use to restart if engine has changed
             if self.availableEngines.SelectedItem:
@@ -431,7 +438,7 @@ def update_addinfiles(self):
                     int(HOST_APP.version),
                     attachment.Clone,
                     new_engine,
-                    all_users
+                    False
                     )
 
                 # now setup the attachments for other versions
@@ -442,7 +449,7 @@ def update_addinfiles(self):
                                 int(rvt_ver),
                                 attachment.Clone,
                                 new_engine,
-                                all_users
+                                False
                                 )
                         else:
                             PyRevit.PyRevitAttachments.Detach(int(rvt_ver))
@@ -661,6 +668,13 @@ def remove_ordercolor(self, sender, args):
             self.doc_ordercolor_lb.SelectedIndex = new_index
             self.update_tab_previews()
 
+    def reset_ordercolors(self, sender, args):
+        tabs.reset_tab_ordercolors(user_config, self.tab_theme)
+        new_rules = list(self.tab_theme.TabOrderRules)
+        if new_rules:
+            self.doc_ordercolor_lb.ItemsSource = new_rules
+            self.update_tab_previews()
+
     def selected_ordercolor_changed(self, sender, args):
         pass
 
@@ -784,7 +798,7 @@ def update_tab_previews(self):
 
             # apply by order - project
             for idx, tab_ctrl in enumerate(family_tab_ctrls):
-                if idx < coloring_rules_count:
+                if idx + len(prj_tab_ctrls) < coloring_rules_count:
                     coloring_rule = coloring_rules[idx + len(prj_tab_ctrls)]
                     style = family_tabstyle.CreateStyle(tab_ctrl, coloring_rule)
                     tab_ctrl.Style = style
@@ -864,8 +878,11 @@ def _save_uiux(self):
 
         # output settings
         output.set_stylesheet(self.cur_stylesheet_tb.Text)
-        if self.cur_stylesheet_tb.Text != output.get_default_stylesheet():
+        default_stylesheet = output.get_default_stylesheet()
+        if self.cur_stylesheet_tb.Text != default_stylesheet:
             user_config.output_stylesheet = self.cur_stylesheet_tb.Text
+        elif user_config.output_stylesheet != default_stylesheet:
+            user_config.output_stylesheet = None
         # pyrevit gui settings
         if self.loadtooltipex_cb.IsChecked != user_config.tooltip_debug_info \
                 and not self.reload_requested:
diff --git a/extensions/pyRevitDevTools.extension/DockableExample.xaml b/extensions/pyRevitDevTools.extension/DockableExample.xaml
index 556d3fc28..334e30cab 100644
--- a/extensions/pyRevitDevTools.extension/DockableExample.xaml
+++ b/extensions/pyRevitDevTools.extension/DockableExample.xaml
@@ -2,7 +2,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       Background="White">
     <StackPanel Margin="20">
-        <TextBlock Text="pyRevit Dockable Panel Example" />
+        <TextBlock Text="WPF Dockable Panel Example" />
         <Button Content="Do Something" Click="do_something" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="50" Margin="0,10,0,0"/>
     </StackPanel>
 </Page>
diff --git a/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/Open Dockable Pane.pushbutton/icon.png b/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/Open Dockable Pane.pushbutton/icon.png
new file mode 100644
index 000000000..35c4df7f9
Binary files /dev/null and b/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/Open Dockable Pane.pushbutton/icon.png differ
diff --git a/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/Open Dockable Pane.pushbutton/script.py b/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/Open Dockable Pane.pushbutton/script.py
new file mode 100644
index 000000000..fa466e863
--- /dev/null
+++ b/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/Open Dockable Pane.pushbutton/script.py	
@@ -0,0 +1,14 @@
+"""Prints calculated hash values for each extension."""
+#pylint: disable=import-error,invalid-name,broad-except,superfluous-parens
+
+
+__title__ = 'Open\nPanel'
+__context__ = 'zero-doc'
+
+
+from pyrevit import forms
+
+
+test_panel_uuid = "3110e336-f81c-4927-87da-4e0d30d4d64a"
+
+forms.open_dockable_panel(test_panel_uuid)
diff --git a/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/bundle.yaml b/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/bundle.yaml
index a0e7e4ec6..9f30716c3 100644
--- a/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/bundle.yaml	
+++ b/extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/bundle.yaml	
@@ -2,5 +2,6 @@ layout:
   - Developer Docs
   - Generate API Stubs
   - Get Extension Hashes
+  - Open Dockable Pane
   - -----
   - links
\ No newline at end of file
diff --git a/extensions/pyRevitDevTools.extension/startup.py b/extensions/pyRevitDevTools.extension/startup.py
index fb82bdf14..d76d75f9e 100644
--- a/extensions/pyRevitDevTools.extension/startup.py
+++ b/extensions/pyRevitDevTools.extension/startup.py
@@ -141,30 +141,14 @@ def post_date_id(request, year, month, day, pid):
 
 
 # test dockable panel =========================================================
-from pyrevit.framework import Windows
-from pyrevit.framework import wpf
-from pyrevit.coreutils import Guid
 
-
-class DockableExample (Windows.Controls.Page):
-    def __init__(self, xaml_file):
-        wpf.LoadComponent(self, op.join(op.dirname(__file__), xaml_file))
+class DockableExample(forms.WPFPanel):
+    panel_title = "pyRevit Dockable Panel Title"
+    panel_id = "3110e336-f81c-4927-87da-4e0d30d4d64a"
+    panel_source = op.join(op.dirname(__file__), "DockableExample.xaml")
 
     def do_something(self, sender, args):
-        forms.alert("DockableExample Action")
-
-
-
-class DockableExamplePanelProvider (UI.IDockablePaneProvider):
-    def SetupDockablePane(self, data):
-        # https://apidocs.co/apps/revit/2021.1/cde36571-ccf1-f628-9e34-6a720388d348.htm
-        data.FrameworkElement = DockableExample("DockableExample.xaml")
-        data.VisibleByDefault = True
+        forms.alert("Voila!!!")
 
 
-DOCKABLE_PANE_ID = UI.DockablePaneId(Guid.NewGuid())
-HOST_APP.uiapp.RegisterDockablePane(
-    DOCKABLE_PANE_ID,
-    "pyRevit Dockable Panel Example",
-    DockableExamplePanelProvider()
-)
+forms.register_dockable_panel(DockableExample)
diff --git a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/keynotesdb.py b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/keynotesdb.py
index bcd8babea..aa6c90d3a 100644
--- a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/keynotesdb.py	
+++ b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/keynotesdb.py	
@@ -548,24 +548,33 @@ def _import_keynotes_from_lines(conn, lines, skip_dup=False):
 
 def import_legacy_keynotes(conn, src_legacy_keynotes_file, skip_dup=False):
     # determine encoding
-    encoding = 'ascii'
+    encodings = ['Windows-1252', 'ISO-8859-1', 'ascii']
     if coreutils.check_encoding_bom(src_legacy_keynotes_file,
                                     bom_bytes=codecs.BOM_UTF16):
-        encoding = 'utf_16_le'
+        encodings = ['utf_16_le']
     elif coreutils.check_encoding_bom(src_legacy_keynotes_file,
                                       bom_bytes=codecs.BOM_UTF8):
-        encoding = 'utf-8'
+        encodings = ['utf-8']
 
-    try:
-        mlogger.debug('Opening file with {} encoding...'.format(encoding))
-        knote_lines = None
-        with codecs.open(src_legacy_keynotes_file, 'r', encoding) \
-                as legacy_kfile:
-            knote_lines = legacy_kfile.readlines()
-    except Exception:
-        mlogger.debug('Failed opening : %s', src_legacy_keynotes_file)
-        raise Exception('Unknown file encoding. Supported encodings are '
-                        'ASCII, UTF-8, and UTF-16 (UCS-2 LE)')
+    last_encoding_idx = len(encodings) - 1
+    for idx, encoding in enumerate(encodings):
+        try:
+            mlogger.debug(
+                'Attempt to open keynote file with \"%s\" encoding...',
+                encoding
+                )
+            knote_lines = None
+            with codecs.open(src_legacy_keynotes_file, 'r', encoding) \
+                    as legacy_kfile:
+                knote_lines = legacy_kfile.readlines()
+                break
+        except Exception:
+            if idx == last_encoding_idx:
+                mlogger.debug('Failed opening : %s', src_legacy_keynotes_file)
+                raise Exception('Unknown file encoding. Supported encodings '
+                                'are ASCII, UTF-8, and UTF-16 (UCS-2 LE)')
+            else:
+                continue
 
     if legacy_kfile:
         conn.BEGIN(KEYNOTES_DB)
diff --git a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/script.py b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/script.py
index edf2e45e9..e7ebb2841 100644
--- a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/script.py	
+++ b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/script.py	
@@ -4,6 +4,7 @@
 Reset window configurations and open.
 """
 #pylint: disable=E0401,W0613,C0111,C0103,C0302,W0703
+#pylint: disable=raise-missing-from
 import os
 import os.path as op
 import shutil
@@ -684,19 +685,31 @@ def _convert_existing(self):
             script.get_data_file(op.basename(self._kfile), 'bak')
         if op.exists(temp_kfile):
             script.remove_data_file(temp_kfile)
-        shutil.copy(self._kfile, temp_kfile)
-        # don't delete files in keynotes folder
-        # usually they're on network or synced drives and the IO is slow
-        self._empty_file(self._kfile)
+        try:
+            shutil.copy(self._kfile, temp_kfile)
+        except Exception:
+            raise Exception("Error backing up existing keynote file")
+
+        try:
+            # don't delete files in keynotes folder
+            # usually they're on network or synced drives and the IO is slow
+            self._empty_file(self._kfile)
+        except Exception:
+            raise Exception("Error preparing new keynote file")
+
         # import the keynotes from the backup into the emptied keynote file
         try:
             self._conn = kdb.connect(self._kfile)
             kdb.import_legacy_keynotes(self._conn, temp_kfile, skip_dup=True)
         except System.TimeoutException as toutex:
+            shutil.copy(temp_kfile, self._kfile)
             forms.alert(toutex.Message,
                         expanded="{}::_convert_existing()".format(
                             self.__class__.__name__),
                         exitscript=True)
+        except Exception as ex:
+            shutil.copy(temp_kfile, self._kfile)
+            raise ex
         finally:
             script.remove_data_file(temp_kfile)
 
diff --git a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/PrintSheets.xaml b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/PrintSheets.xaml
index ddb76b3a9..afa66f188 100644
--- a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/PrintSheets.xaml	
+++ b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/PrintSheets.xaml	
@@ -47,7 +47,7 @@
                 </Border>
             </StackPanel>
             <DataTemplate.Triggers>
-                <DataTrigger Binding="{Binding revision}" Value="">
+                <DataTrigger Binding="{Binding revision.is_set}" Value="False">
                     <Setter TargetName="revinfo" Property="Visibility" Value="Collapsed" />
                 </DataTrigger>
             </DataTemplate.Triggers>
diff --git a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/script.py b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/script.py
index 825f69368..990897d39 100644
--- a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/script.py	
+++ b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/script.py	
@@ -53,7 +53,8 @@
 
 NamingFormatter = namedtuple('NamingFormatter', ['template', 'desc'])
 
-SheetRevision = namedtuple('SheetRevision', ['number', 'desc', 'date'])
+SheetRevision = namedtuple('SheetRevision', ['number', 'desc', 'date', 'is_set'])
+UNSET_REVISION = SheetRevision(number=None, desc=None, date=None, is_set=False)
 
 TitleBlockPrintSettings = \
     namedtuple('TitleBlockPrintSettings', ['psettings', 'set_by_param'])
@@ -125,13 +126,14 @@ def __init__(self, view_sheet, view_tblock,
             rev_settings.RevisionNumbering == DB.RevisionNumbering.PerSheet \
             if rev_settings else False
         cur_rev = revit.query.get_current_sheet_revision(self._sheet)
-        self.revision = ''
+        self.revision = UNSET_REVISION
         if cur_rev:
             on_sheet = self._sheet if per_sheet_revisions else None
             self.revision = SheetRevision(
                 number=revit.query.get_rev_number(cur_rev, sheet=on_sheet),
                 desc=cur_rev.Description,
-                date=cur_rev.RevisionDate
+                date=cur_rev.RevisionDate,
+                is_set=True
             )
 
     @property
diff --git a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/views.stack/Views.pulldown/Duplicate Selected Views.pushbutton/script.py b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/views.stack/Views.pulldown/Duplicate Selected Views.pushbutton/script.py
index 136049506..0700dc2ce 100644
--- a/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/views.stack/Views.pulldown/Duplicate Selected Views.pushbutton/script.py	
+++ b/extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/views.stack/Views.pulldown/Duplicate Selected Views.pushbutton/script.py	
@@ -1,4 +1,4 @@
-"""Batch duplicates the selected views with or without detailing."""
+"""Batch duplicates the selected views with or without detailing, or as dependents"""
 
 from pyrevit import revit, DB
 from pyrevit import forms
@@ -12,15 +12,10 @@ def duplicableview(view):
     return view.CanViewBeDuplicated(DB.ViewDuplicateOption.Duplicate)
 
 
-def duplicate_views(viewlist, with_detailing=True):
+def duplicate_views(viewlist, dupop):
     dup_view_ids = []
     with revit.Transaction('Duplicate selected views'):
         for el in viewlist:
-            if with_detailing:
-                dupop = DB.ViewDuplicateOption.WithDetailing
-            else:
-                dupop = DB.ViewDuplicateOption.Duplicate
-
             try:
                 dup_view_ids.append(el.Duplicate(dupop))
             except Exception as duplerr:
@@ -37,14 +32,20 @@ def duplicate_views(viewlist, with_detailing=True):
     selected_option = \
         forms.CommandSwitchWindow.show(
             ['WITH Detailing',
-             'WITHOUT Detailing'],
+             'WITHOUT Detailing',
+             'AS Dependent'],
             message='Select duplication option:'
             )
 
     if selected_option:
+        dupop = DB.ViewDuplicateOption.AsDependent
+        if selected_option == 'WITH Detailing':
+            dupop = DB.ViewDuplicateOption.WithDetailing
+        if selected_option == 'WITHOUT Detailing':
+            dupop = DB.ViewDuplicateOption.Duplicate
+        if selected_option == 'As Dependent':
+            dupop = DB.ViewDuplicateOption.AsDependent
         dup_view_ids = duplicate_views(
-            selected_views,
-            with_detailing=True if selected_option == 'WITH Detailing'
-            else False)
+            selected_views,dupop)
         if dup_view_ids:
-            revit.get_selection().set_to(dup_view_ids)
+            revit.get_selection().set_to(dup_view_ids)
\ No newline at end of file
diff --git a/pyrevitlib/pyrevit/engine.py b/pyrevitlib/pyrevit/engine.py
index 1e95255bf..85e9a88a5 100644
--- a/pyrevitlib/pyrevit/engine.py
+++ b/pyrevitlib/pyrevit/engine.py
@@ -1,5 +1,6 @@
 """Access loading engine properties"""
 #pylint: disable=W0703,C0302,C0103,W0614,E0401,W0611,C0413,ungrouped-imports
+import os.path as op
 import clr
 
 try:
@@ -15,9 +16,13 @@
     ScriptExecutor = PyRevitLoader.ScriptExecutor
     EnginePrefix = ScriptExecutor.EnginePrefix
     EngineVersion = ScriptExecutor.EngineVersion
+    EnginePath = op.dirname(
+        clr.GetClrType(ScriptExecutor).Assembly.Location
+        )
 except ImportError:
     # this means that pyRevit is _not_ being loaded from a pyRevit engine
     # e.g. when importing from RevitPythonShell
     PyRevitLoader = ScriptExecutor = None
     EnginePrefix = ''
     EngineVersion = 000
+    EnginePath = ''
diff --git a/pyrevitlib/pyrevit/extensions/components.py b/pyrevitlib/pyrevit/extensions/components.py
index 48fea3624..166cea1f8 100644
--- a/pyrevitlib/pyrevit/extensions/components.py
+++ b/pyrevitlib/pyrevit/extensions/components.py
@@ -420,7 +420,18 @@ def configure(self):
             for component in self:
                 component.configure(cfg_dict)
 
-    def get_all_modules(self):
+    def get_extension_modules(self):
+        modules = []
+        if self.binary_path and op.exists(self.binary_path):
+            for item in os.listdir(self.binary_path):
+                item_path = op.join(self.binary_path, item)
+                item_name = item.lower()
+                if op.isfile(item_path) \
+                        and item_name.endswith(framework.ASSEMBLY_FILE_TYPE):
+                    modules.append(item_path)
+        return modules
+
+    def get_command_modules(self):
         referenced_modules = set()
         for cmd in self.get_all_commands():
             for module in cmd.modules:
diff --git a/pyrevitlib/pyrevit/forms/__init__.py b/pyrevitlib/pyrevit/forms/__init__.py
index 48fe80204..f033ef410 100644
--- a/pyrevitlib/pyrevit/forms/__init__.py
+++ b/pyrevitlib/pyrevit/forms/__init__.py
@@ -40,7 +40,7 @@
 from pyrevit.forms import toaster
 from pyrevit import versionmgr
 
-import pyevent
+import pyevent #pylint: disable=import-error
 
 
 #pylint: disable=W0703,C0302,C0103
@@ -175,7 +175,7 @@ def load_xaml(self, xaml_source, literal_string=False, handle_esc=True, set_owne
         if set_owner:
             self.setup_owner()
         self.setup_icon()
-        self.setup_resources()
+        WPFWindow.setup_resources(self)
         if handle_esc:
             self.setup_default_handlers()
 
@@ -183,35 +183,36 @@ def setup_owner(self):
         wih = Interop.WindowInteropHelper(self)
         wih.Owner = AdWindows.ComponentManager.ApplicationWindow
 
-    def setup_resources(self):
+    @staticmethod
+    def setup_resources(wpf_ctrl):
         #2c3e50
-        self.Resources['pyRevitDarkColor'] = \
+        wpf_ctrl.Resources['pyRevitDarkColor'] = \
             Media.Color.FromArgb(0xFF, 0x2c, 0x3e, 0x50)
 
         #23303d
-        self.Resources['pyRevitDarkerDarkColor'] = \
+        wpf_ctrl.Resources['pyRevitDarkerDarkColor'] = \
             Media.Color.FromArgb(0xFF, 0x23, 0x30, 0x3d)
 
         #ffffff
-        self.Resources['pyRevitButtonColor'] = \
+        wpf_ctrl.Resources['pyRevitButtonColor'] = \
             Media.Color.FromArgb(0xFF, 0xff, 0xff, 0xff)
 
         #f39c12
-        self.Resources['pyRevitAccentColor'] = \
+        wpf_ctrl.Resources['pyRevitAccentColor'] = \
             Media.Color.FromArgb(0xFF, 0xf3, 0x9c, 0x12)
 
-        self.Resources['pyRevitDarkBrush'] = \
-            Media.SolidColorBrush(self.Resources['pyRevitDarkColor'])
-        self.Resources['pyRevitAccentBrush'] = \
-            Media.SolidColorBrush(self.Resources['pyRevitAccentColor'])
+        wpf_ctrl.Resources['pyRevitDarkBrush'] = \
+            Media.SolidColorBrush(wpf_ctrl.Resources['pyRevitDarkColor'])
+        wpf_ctrl.Resources['pyRevitAccentBrush'] = \
+            Media.SolidColorBrush(wpf_ctrl.Resources['pyRevitAccentColor'])
 
-        self.Resources['pyRevitDarkerDarkBrush'] = \
-            Media.SolidColorBrush(self.Resources['pyRevitDarkerDarkColor'])
+        wpf_ctrl.Resources['pyRevitDarkerDarkBrush'] = \
+            Media.SolidColorBrush(wpf_ctrl.Resources['pyRevitDarkerDarkColor'])
 
-        self.Resources['pyRevitButtonForgroundBrush'] = \
-            Media.SolidColorBrush(self.Resources['pyRevitButtonColor'])
+        wpf_ctrl.Resources['pyRevitButtonForgroundBrush'] = \
+            Media.SolidColorBrush(wpf_ctrl.Resources['pyRevitButtonColor'])
 
-        self.Resources['pyRevitRecognizesAccessKey'] = \
+        wpf_ctrl.Resources['pyRevitRecognizesAccessKey'] = \
             DEFAULT_RECOGNIZE_ACCESS_KEY
 
     def setup_default_handlers(self):
@@ -244,7 +245,8 @@ def show_dialog(self):
         """Show modal window."""
         return self.ShowDialog()
 
-    def set_image_source(self, wpf_element, image_file):
+    @staticmethod
+    def set_image_source_file(wpf_element, image_file):
         """Set source file for image element.
 
         Args:
@@ -260,6 +262,15 @@ def set_image_source(self, wpf_element, image_file):
         else:
             wpf_element.Source = utils.bitmap_from_file(image_file)
 
+    def set_image_source(self, wpf_element, image_file):
+        """Set source file for image element.
+
+        Args:
+            element_name (System.Windows.Controls.Image): xaml image element
+            image_file (str): image file path
+        """
+        WPFWindow.set_image_source_file(wpf_element, image_file)
+
     def dispatch(self, func, *args, **kwargs):
         if framework.get_current_thread_id() == self.thread_id:
             t = threading.Thread(
@@ -345,6 +356,187 @@ def handle_url_click(self, sender, args): #pylint: disable=unused-argument
         return webbrowser.open_new_tab(sender.NavigateUri.AbsoluteUri)
 
 
+class WPFPanel(framework.Windows.Controls.Page):
+    r"""WPF panel base class for all pyRevit dockable panels.
+
+    panel_id (str) must be set on the type to dockable panel uuid
+    panel_source (str): xaml source filepath
+
+    Example:
+        >>> from pyrevit import forms
+        >>> class MyPanel(forms.WPFPanel):
+        ...     panel_id = "181e05a4-28f6-4311-8a9f-d2aa528c8755"
+        ...     panel_source = "MyPanel.xaml"
+
+        >>> forms.register_dockable_panel(MyPanel)
+        >>> # then from the button that needs to open the panel
+        >>> forms.open_dockable_panel("181e05a4-28f6-4311-8a9f-d2aa528c8755")
+    """
+
+    panel_id = None
+    panel_source = None
+
+    def __init__(self):
+        """Initialize WPF panel and resources."""
+        if not self.panel_id:
+            raise PyRevitException("\"panel_id\" property is not set")
+        if not self.panel_source:
+            raise PyRevitException("\"panel_source\" property is not set")
+
+        if not op.exists(self.panel_source):
+            wpf.LoadComponent(self,
+                              os.path.join(EXEC_PARAMS.command_path,
+                              self.panel_source))
+        else:
+            wpf.LoadComponent(self, self.panel_source)
+
+        # set properties
+        self.thread_id = framework.get_current_thread_id()
+        WPFWindow.setup_resources(self)
+
+    def set_image_source(self, wpf_element, image_file):
+        """Set source file for image element.
+
+        Args:
+            element_name (System.Windows.Controls.Image): xaml image element
+            image_file (str): image file path
+        """
+        WPFWindow.set_image_source_file(wpf_element, image_file)
+
+    @staticmethod
+    def hide_element(*wpf_elements):
+        """Collapse elements.
+
+        Args:
+            *wpf_elements: WPF framework elements to be collaped
+        """
+        WPFPanel.hide_element(*wpf_elements)
+
+    @staticmethod
+    def show_element(*wpf_elements):
+        """Show collapsed elements.
+
+        Args:
+            *wpf_elements: WPF framework elements to be set to visible.
+        """
+        WPFPanel.show_element(*wpf_elements)
+
+    @staticmethod
+    def toggle_element(*wpf_elements):
+        """Toggle visibility of elements.
+
+        Args:
+            *wpf_elements: WPF framework elements to be toggled.
+        """
+        WPFPanel.toggle_element(*wpf_elements)
+
+    @staticmethod
+    def disable_element(*wpf_elements):
+        """Enable elements.
+
+        Args:
+            *wpf_elements: WPF framework elements to be enabled
+        """
+        WPFPanel.disable_element(*wpf_elements)
+
+    @staticmethod
+    def enable_element(*wpf_elements):
+        """Enable elements.
+
+        Args:
+            *wpf_elements: WPF framework elements to be enabled
+        """
+        WPFPanel.enable_element(*wpf_elements)
+
+    def handle_url_click(self, sender, args): #pylint: disable=unused-argument
+        """Callback for handling click on package website url"""
+        return webbrowser.open_new_tab(sender.NavigateUri.AbsoluteUri)
+
+
+class _WPFPanelProvider(UI.IDockablePaneProvider):
+    """Internal Panel provider for panels"""
+
+    def __init__(self, panel_type, default_visible=True):
+        self._panel_type = panel_type
+        self._default_visible = default_visible
+
+    def SetupDockablePane(self, data):
+        """Setup forms.WPFPanel set on this instance"""
+        # TODO: need to implement panel data
+        # https://apidocs.co/apps/revit/2021.1/98157ec2-ab26-6ab7-2933-d1b4160ba2b8.htm
+        data.FrameworkElement = self._panel_type()
+        data.VisibleByDefault = self._default_visible
+
+
+def register_dockable_panel(panel_type, default_visible=True):
+    """Register dockable panel
+
+    Args:
+        panel_type (forms.WPFPanel): dockable panel type
+        default_visible (bool, optional):
+            whether panel should be visible by default
+    """
+    if not issubclass(panel_type, WPFPanel):
+        raise PyRevitException(
+            "Dockable pane must be a subclass of forms.WPFPanel"
+            )
+
+    panel_uuid = coreutils.Guid.Parse(panel_type.panel_id)
+    dockable_panel_id = UI.DockablePaneId(panel_uuid)
+    HOST_APP.uiapp.RegisterDockablePane(
+        dockable_panel_id,
+        panel_type.panel_title,
+        _WPFPanelProvider(panel_type, default_visible)
+    )
+
+
+def open_dockable_panel(panel_type_or_id):
+    """Open previously registered dockable panel
+
+    Args:
+        panel_type_or_id (forms.WPFPanel, str): panel type or id
+    """
+    toggle_dockable_panel(panel_type_or_id, True)
+
+
+def close_dockable_panel(panel_type_or_id):
+    """Close previously registered dockable panel
+
+    Args:
+        panel_type_or_id (forms.WPFPanel, str): panel type or id
+    """
+    toggle_dockable_panel(panel_type_or_id, False)
+
+
+def toggle_dockable_panel(panel_type_or_id, state):
+    """Toggle previously registered dockable panel
+
+    Args:
+        panel_type_or_id (forms.WPFPanel, str): panel type or id
+    """
+    dpanel_id = None
+    if isinstance(panel_type_or_id, str):
+        panel_id = coreutils.Guid.Parse(panel_type_or_id)
+        dpanel_id = UI.DockablePaneId(panel_id)
+    elif issubclass(panel_type_or_id, WPFPanel):
+        panel_id = coreutils.Guid.Parse(panel_type_or_id.panel_id)
+        dpanel_id = UI.DockablePaneId(panel_id)
+    else:
+        raise PyRevitException("Given type is not a forms.WPFPanel")
+
+    if dpanel_id:
+        if UI.DockablePane.PaneIsRegistered(dpanel_id):
+            dockable_panel = HOST_APP.uiapp.GetDockablePane(dpanel_id)
+            if state:
+                dockable_panel.Show()
+            else:
+                dockable_panel.Hide()
+        else:
+            raise PyRevitException(
+                "Panel with id \"%s\" is not registered" % panel_type_or_id
+                )
+
+
 class TemplateUserInputWindow(WPFWindow):
     """Base class for pyRevit user input standard forms.
 
diff --git a/pyrevitlib/pyrevit/framework.py b/pyrevitlib/pyrevit/framework.py
index ced1ed0aa..5711963f8 100644
--- a/pyrevitlib/pyrevit/framework.py
+++ b/pyrevitlib/pyrevit/framework.py
@@ -75,21 +75,51 @@
 from System import Math
 from System.Management import ManagementObjectSearcher
 from System.Runtime.Serialization import FormatterServices
-
 from System.Linq import Enumerable
 
 import pyrevit.engine as eng
 
+
+ASSEMBLY_FILE_TYPE = 'dll'
+ASSEMBLY_FILE_EXT = '.dll'
+
+
+ipy_assmname = '{prefix}IronPython'.format(prefix=eng.EnginePrefix)
+ipy_dllpath = op.join(eng.EnginePath, ipy_assmname + ASSEMBLY_FILE_EXT)
+clr.AddReferenceToFileAndPath(ipy_dllpath)
+
+import IronPython
+
+# WPF
 wpf = None
-clr.AddReference(
-    '{prefix}IronPython.Wpf'.format(prefix=eng.EnginePrefix)
-    )
-if compat.PY3:
-    import IronPython
-    wpf = IronPython.Modules.Wpf
-else:
+wpf_assmname = '{prefix}IronPython.Wpf'.format(prefix=eng.EnginePrefix)
+wpf_dllpath = op.join(eng.EnginePath, wpf_assmname + ASSEMBLY_FILE_EXT)
+try:
+    clr.AddReference(wpf_assmname)
+    if compat.PY3:
+        wpf = IronPython.Modules.Wpf
+    else:
+        import wpf
+except Exception:
+    clr.AddReferenceToFileAndPath(wpf_dllpath)
     import wpf
 
+
+# SQLite
+sqlite3 = None
+sqlite3_assmname = '{prefix}IronPython.SQLite'.format(prefix=eng.EnginePrefix)
+sqlite3_dllpath = op.join(eng.EnginePath, sqlite3_assmname + ASSEMBLY_FILE_EXT)
+try:
+    clr.AddReference(sqlite3_assmname)
+    if compat.PY3:
+        sqlite3 = IronPython.SQLite
+    else:
+        import sqlite3
+except Exception:
+    clr.AddReferenceToFileAndPath(sqlite3_dllpath)
+    import sqlite3
+
+
 CPDialogs = None
 try:
     clr.AddReference('Microsoft.WindowsAPICodePack')
@@ -115,9 +145,6 @@
 from pyrevit import BIN_DIR
 
 
-ASSEMBLY_FILE_TYPE = 'dll'
-
-
 def get_type(fw_object):
     """Return CLR type of an object."""
     return clr.GetClrType(fw_object)
diff --git a/pyrevitlib/pyrevit/loader/sessionmgr.py b/pyrevitlib/pyrevit/loader/sessionmgr.py
index f51446924..ae54f141c 100644
--- a/pyrevitlib/pyrevit/loader/sessionmgr.py
+++ b/pyrevitlib/pyrevit/loader/sessionmgr.py
@@ -178,7 +178,12 @@ def _new_session():
         ui_ext.configure()
 
         # collect all module references from extensions
-        ui_ext_modules = ui_ext.get_all_modules()
+        ui_ext_modules = []
+        # FIXME: currently dlls inside bin/ are not pre-loaded since
+        # this will lock them by Revit. Maybe all dlls should be loaded
+        # from memory (read binary and load assembly)?
+        # ui_ext_modules.extend(ui_ext.get_extension_modules())
+        ui_ext_modules.extend(ui_ext.get_command_modules())
         # make sure they are all loaded
         assmutils.load_asm_files(ui_ext_modules)
         # and update env information
diff --git a/pyrevitlib/pyrevit/revit/serverutils.py b/pyrevitlib/pyrevit/revit/serverutils.py
index 41c9a82c5..5234b776a 100644
--- a/pyrevitlib/pyrevit/revit/serverutils.py
+++ b/pyrevitlib/pyrevit/revit/serverutils.py
@@ -1,7 +1,7 @@
 """Helper functions for working with revit server."""
 
 from collections import namedtuple
-import sqlite3
+from pyrevit.framework import sqlite3
 
 from pyrevit import DB
 
diff --git a/pyrevitlib/pyrevit/revit/tabs.py b/pyrevitlib/pyrevit/revit/tabs.py
index 947cbe0ee..4e52e71b6 100644
--- a/pyrevitlib/pyrevit/revit/tabs.py
+++ b/pyrevitlib/pyrevit/revit/tabs.py
@@ -40,10 +40,12 @@ def _set_sort_colorize_docs(tabcfgs, theme):
     tabcfgs.sort_colorize_docs = theme.SortDocTabs
 
 
-def _get_tab_orderrules(tabcfgs):
+def _get_tab_orderrules(tabcfgs, default=False):
     default_colors = \
         [hex_from_brush(b) for b in types.TabColoringTheme.DefaultBrushes]
-    tab_colors = tabcfgs.get_option('tab_colors', default_colors)
+    tab_colors = default_colors
+    if not default:
+        tab_colors = tabcfgs.get_option('tab_colors', default_colors)
     return List[types.TabColoringRule](
         [types.TabColoringRule(hex_to_brush(c)) for c in tab_colors]
         )
@@ -109,6 +111,12 @@ def get_tabcoloring_theme(usercfg):
     return theme
 
 
+def reset_tab_ordercolors(usercfg, theme):
+    """Reset tab order colors to internal default"""
+    tabcfgs = _get_tabcoloring_cfgs(usercfg)
+    theme.TabOrderRules = _get_tab_orderrules(tabcfgs, default=True)
+
+
 def set_tabcoloring_theme(usercfg, theme):
     """set tab coloring theme in settings"""
     tabcfgs = _get_tabcoloring_cfgs(usercfg)
diff --git a/pyrevitlib/pyrevit/runtime/EventHandling.cs b/pyrevitlib/pyrevit/runtime/EventHandling.cs
index 5fe394543..4caa7ef5b 100644
--- a/pyrevitlib/pyrevit/runtime/EventHandling.cs
+++ b/pyrevitlib/pyrevit/runtime/EventHandling.cs
@@ -1198,8 +1198,38 @@ public void Clear() {
 
         public TabColoringStyle TabStyle { get; set; }
         public TabColoringStyle FamilyTabStyle { get; set; }
-        public List<TabColoringRule> TabOrderRules { get; set; }
-        public List<TabColoringRule> TabFilterRules { get; set; }
+        
+        public List<TabColoringRule> _tabOrderRules = default;
+        public List<TabColoringRule> TabOrderRules {
+            get {
+                if (_tabOrderRules is null)
+                    _tabOrderRules = new List<TabColoringRule>();
+                return _tabOrderRules;
+            }
+
+            set {
+                if (value is null)
+                    _tabOrderRules = new List<TabColoringRule>();
+                else
+                    _tabOrderRules = value;
+            }
+        }
+
+        public List<TabColoringRule> _tabFilterRules = default;
+        public List<TabColoringRule> TabFilterRules {
+            get {
+                if (_tabFilterRules is null)
+                    _tabFilterRules = new List<TabColoringRule>();
+                return _tabFilterRules;
+            }
+
+            set {
+                if (value is null)
+                    _tabFilterRules = new List<TabColoringRule>();
+                else
+                    _tabFilterRules = value;
+            }
+        }
 
         public static readonly List<Brush> DefaultBrushes = new List<Brush> {
             PyRevitConsts.PyRevitAccentBrush,
@@ -1214,6 +1244,9 @@ public void Clear() {
             Brushes.DeepPink
         };
 
+        public static readonly uint DefaultTabColoringStyleIndex = 0;
+        public static readonly uint DefaultFamilyTabColoringStyleIndex = 4;
+
         public static readonly List<TabColoringStyle> AvailableStyles = new List<TabColoringStyle> {
             new TabColoringStyle("Top Bar - Light") { BorderThickness = new Thickness(0,1,0,0) },
             new TabColoringStyle("Top Bar - Medium") { BorderThickness = new Thickness(0,2,0,0) },
@@ -1226,8 +1259,6 @@ public void Clear() {
             new TabColoringStyle("Background Fill") { BorderThickness = new Thickness(2), FillBackground = true },
         };
 
-        public static readonly uint DefaultTabColoringStyleIndex = 0;
-        public static readonly uint DefaultFamilyTabColoringStyleIndex = 4;
 
         // keep a unique hash for the state of open tabs
         // this helps refreshing the tab styling only once
@@ -1369,11 +1400,13 @@ void Set(TabItem tab, long docId, bool isFamilyTab) {
                 }
                 // otherwise, create the first slot, with the first rule
                 else {
-                    slot = new RuleSlot(TabOrderRules.FirstOrDefault()) {
-                        Id = docId,
-                        IsFamily = isFamilyTab,
-                    };
-                    _ruleSlots.Add(slot);
+                    if (TabOrderRules.Count > 0) {
+                        slot = new RuleSlot(TabOrderRules.First()) {
+                            Id = docId,
+                            IsFamily = isFamilyTab,
+                        };
+                        _ruleSlots.Add(slot);
+                    }
                 }
 
 
diff --git a/pyrevitlib/pyrevit/userconfig.py b/pyrevitlib/pyrevit/userconfig.py
index f253290bb..04bfddd6a 100644
--- a/pyrevitlib/pyrevit/userconfig.py
+++ b/pyrevitlib/pyrevit/userconfig.py
@@ -321,10 +321,13 @@ def output_stylesheet(self):
 
     @output_stylesheet.setter
     def output_stylesheet(self, stylesheet_filepath):
-        self.core.set_option(
-            CONSTS.ConfigsOutputStyleSheet,
-            value=stylesheet_filepath
-        )
+        if stylesheet_filepath:
+            self.core.set_option(
+                CONSTS.ConfigsOutputStyleSheet,
+                value=stylesheet_filepath
+            )
+        else:
+            self.core.remove_option(CONSTS.ConfigsOutputStyleSheet)
 
     @property
     def routes_host(self):
diff --git a/pyrevitlib/pyrevit/version b/pyrevitlib/pyrevit/version
index c0f6eef22..4850fb306 100644
--- a/pyrevitlib/pyrevit/version
+++ b/pyrevitlib/pyrevit/version
@@ -1 +1 @@
-4.8.6
\ No newline at end of file
+4.8.7
\ No newline at end of file
diff --git a/release/pyrevit-cli.aip b/release/pyrevit-cli.aip
index 2f7df748e..22f3ae4a9 100644
--- a/release/pyrevit-cli.aip
+++ b/release/pyrevit-cli.aip
@@ -21,10 +21,10 @@
     <ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:pyrevitbanner.bmp" Type="1" MsiKey="BannerBitmap"/>
     <ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:pyrevitcli.bmp" Type="1" MsiKey="DialogBitmap"/>
     <ROW Property="Manufacturer" Value="Ehsan Iran-Nejad"/>
-    <ROW Property="ProductCode" Value="1033:{AB14082F-168E-45DE-98A7-7C99DB00FFE7} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{E61BB97E-6FF1-4706-A92E-D9F38EB9C77B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="pyRevit CLI"/>
-    <ROW Property="ProductVersion" Value="4.8.6" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.8.7" Type="32"/>
     <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{8181E458-B82E-4A4D-BAAC-784756C4B506}"/>
@@ -80,7 +80,6 @@
     <ROW Component="System.Windows.Interactivity.dll" ComponentId="{32ABD954-5434-47DD-AE25-A0BCBAE40192}" Directory_="APPDIR" Attributes="0" KeyPath="System.Windows.Interactivity.dll"/>
     <ROW Component="YamlDotNet.dll" ComponentId="{ED37BACB-3DD9-4DF0-93D2-D081F348C864}" Directory_="APPDIR" Attributes="0" KeyPath="YamlDotNet.dll"/>
     <ROW Component="git2106a5f2.dll" ComponentId="{1FCB3649-517F-413C-83E4-84F0AB146480}" Directory_="APPDIR" Attributes="256" KeyPath="git2106a5f2.dll"/>
-    <ROW Component="git27ce88e6.dll" ComponentId="{EA6022D3-EE1F-46E0-B9DE-2BC66819FAEC}" Directory_="APPDIR" Attributes="256" KeyPath="git27ce88e6.dll"/>
     <ROW Component="pyRevitLabs.Common.dll" ComponentId="{379FC385-744C-4190-A95C-281E67B527AF}" Directory_="APPDIR" Attributes="0" KeyPath="pyRevitLabs.Common.dll"/>
     <ROW Component="pyRevitLabs.CommonCLI.dll" ComponentId="{A83F9E4E-2B1A-45A3-B465-B25A73D75272}" Directory_="APPDIR" Attributes="0" KeyPath="pyRevitLabs.CommonCLI.dll"/>
     <ROW Component="pyRevitLabs.CommonWPF.dll" ComponentId="{5363FD8C-C3D6-446B-8F9F-FD6AD171F2B0}" Directory_="APPDIR" Attributes="0" KeyPath="pyRevitLabs.CommonWPF.dll"/>
@@ -155,7 +154,6 @@
     <ROW File="System.Numerics.Vectors.dll" Component_="System.Numerics.Vectors.dll" FileName="SYSTEM~4.DLL|System.Numerics.Vectors.dll" Attributes="0" SourcePath="..\bin\System.Numerics.Vectors.dll" SelfReg="false"/>
     <ROW File="System.Collections.Immutable.dll" Component_="System.Collections.Immutable.dll" FileName="SYSTEM~5.DLL|System.Collections.Immutable.dll" Attributes="0" SourcePath="..\bin\System.Collections.Immutable.dll" SelfReg="false"/>
     <ROW File="System.Memory.dll" Component_="System.Memory.dll" FileName="SYSTEM~6.DLL|System.Memory.dll" Attributes="0" SourcePath="..\bin\System.Memory.dll" SelfReg="false"/>
-    <ROW File="git27ce88e6.dll" Component_="git27ce88e6.dll" FileName="GIT2-7~1.DLL|git2-7ce88e6.dll" Attributes="0" SourcePath="..\bin\git2-7ce88e6.dll" SelfReg="false"/>
     <ROW File="System.Text.Encoding.CodePages.dll" Component_="System.Text.Encoding.CodePages.dll" FileName="SYSTEM~7.DLL|System.Text.Encoding.CodePages.dll" Attributes="0" SourcePath="..\bin\System.Text.Encoding.CodePages.dll" SelfReg="false"/>
     <ROW File="System.Threading.Tasks.Extensions.dll" Component_="System.Threading.Tasks.Extensions.dll" FileName="SYSTEM~8.DLL|System.Threading.Tasks.Extensions.dll" Attributes="0" SourcePath="..\bin\System.Threading.Tasks.Extensions.dll" SelfReg="false"/>
     <ROW File="Microsoft.CodeAnalysis.VisualBasic.dll" Component_="Microsoft.CodeAnalysis.VisualBasic.dll" FileName="MICROS~5.DLL|Microsoft.CodeAnalysis.VisualBasic.dll" Attributes="0" SourcePath="..\bin\Microsoft.CodeAnalysis.VisualBasic.dll" SelfReg="false"/>
@@ -340,7 +338,6 @@
     <ROW Feature_="MainFeature" Component_="System.Numerics.Vectors.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Collections.Immutable.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Memory.dll"/>
-    <ROW Feature_="MainFeature" Component_="git27ce88e6.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Text.Encoding.CodePages.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Threading.Tasks.Extensions.dll"/>
     <ROW Feature_="MainFeature" Component_="Microsoft.CodeAnalysis.VisualBasic.dll"/>
diff --git a/release/pyrevit.aip b/release/pyrevit.aip
index 19cc18416..e1e21d9b5 100644
--- a/release/pyrevit.aip
+++ b/release/pyrevit.aip
@@ -27,10 +27,10 @@
     <ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:pyrevit.bmp" Type="1" MsiKey="DialogBitmap"/>
     <ROW Property="Manufacturer" Value="Ehsan Iran-Nejad"/>
     <ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
-    <ROW Property="ProductCode" Value="1033:{32B7C208-2ACC-4D2B-9C75-5BAEE22E7F85} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{FED5DEF7-8D3B-4832-BB3E-55C10FCF9ACF} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="pyRevit"/>
-    <ROW Property="ProductVersion" Value="4.8.6" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.8.7" Type="32"/>
     <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CF0C9661-A782-4D2E-A850-C29B657B57AB}"/>
@@ -690,7 +690,6 @@
     <ROW Component="files.py" ComponentId="{53FE6F52-9A18-493C-86DE-BB2F7E8EC060}" Directory_="revit_Dir" Attributes="0" KeyPath="files.py" Type="0"/>
     <ROW Component="firsttransaction_script.py" ComponentId="{F2774182-93D0-4AD9-993D-75B27F7D81E1}" Directory_="Session4.pushbutton_Dir" Attributes="0" KeyPath="firsttransaction_script.py" Type="0"/>
     <ROW Component="git2106a5f2.dll" ComponentId="{1E9F9136-BBC9-46D5-8CF2-4BFB700A306B}" Directory_="bin_Dir" Attributes="256" KeyPath="git2106a5f2.dll"/>
-    <ROW Component="git27ce88e6.dll" ComponentId="{7204AF02-C007-436A-AE47-FBB44535BA90}" Directory_="bin_Dir" Attributes="256" KeyPath="git27ce88e6.dll"/>
     <ROW Component="header01.txt" ComponentId="{6F393DFF-05B1-4899-AC2D-3B9194982072}" Directory_="data_Dir" Attributes="0" KeyPath="header01.txt" Type="0"/>
     <ROW Component="icon.png" ComponentId="{E1AB6C3A-3CA8-4A26-86B4-66CFD89AEC08}" Directory_="FindRangeOfRoofSlopes.pushbut_1_Dir" Attributes="0" KeyPath="icon.png_72" Type="0"/>
     <ROW Component="icon.png_1" ComponentId="{391514B1-ACA6-4834-A145-A36E7AD80EF7}" Directory_="ReOrderSheets.pushbutton_Dir" Attributes="0" KeyPath="icon.png_1" Type="0"/>
@@ -2853,7 +2852,6 @@
     <ROW File="System.Collections.Immutable.dll" Component_="System.Collections.Immutable.dll" FileName="SYSTEM~5.DLL|System.Collections.Immutable.dll" Attributes="0" SourcePath="..\bin\System.Collections.Immutable.dll" SelfReg="false"/>
     <ROW File="System.Memory.dll" Component_="System.Memory.dll" FileName="SYSTEM~6.DLL|System.Memory.dll" Attributes="0" SourcePath="..\bin\System.Memory.dll" SelfReg="false"/>
     <ROW File="pick_config.py" Component_="icon.png_304" FileName="PICK_C~1.PY|pick_config.py" Attributes="0" SourcePath="..\extensions\pyRevitTools.extension\pyRevit.tab\Selection.panel\Pick.splitpushbutton\Pick.pushbutton\pick_config.py" SelfReg="false"/>
-    <ROW File="git27ce88e6.dll" Component_="git27ce88e6.dll" FileName="GIT2-7~1.DLL|git2-7ce88e6.dll" Attributes="0" SourcePath="..\bin\git2-7ce88e6.dll" SelfReg="false"/>
     <ROW File="System.Text.Encoding.CodePages.dll" Component_="System.Text.Encoding.CodePages.dll" FileName="SYSTEM~7.DLL|System.Text.Encoding.CodePages.dll" Attributes="0" SourcePath="..\bin\System.Text.Encoding.CodePages.dll" SelfReg="false"/>
     <ROW File="System.Threading.Tasks.Extensions.dll" Component_="System.Threading.Tasks.Extensions.dll" FileName="SYSTEM~8.DLL|System.Threading.Tasks.Extensions.dll" Attributes="0" SourcePath="..\bin\System.Threading.Tasks.Extensions.dll" SelfReg="false"/>
     <ROW File="pyRevitLabs.Emojis.dll" Component_="pyRevitLabs.Emojis.dll" FileName="PYREV~13.DLL|pyRevitLabs.Emojis.dll" Attributes="0" SourcePath="..\bin\pyRevitLabs.Emojis.dll" SelfReg="false"/>
@@ -3257,8 +3255,9 @@
     <ROW Action="AI_ExtractFiles" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>
     <ROW Action="AI_ExtractLzma" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>
     <ROW Action="UninstallClearCaches" Description="and leaving no traces..."/>
+    <ROW Action="UninstallClearCaches_Admin" Description="and leaving no traces..."/>
     <ROW Action="UninstallDetachAll" Description="Detaching pyRevit"/>
-    <ROW Action="UninstallForgetAll" Description="Forgetting pyRevit"/>
+    <ROW Action="UninstallDetachAll_Admin" Description="Detaching pyRevit"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiAppSearchComponent">
     <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_LM" Builds="DefaultBuild"/>
@@ -3338,20 +3337,24 @@
     <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
     <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
     <ROW Action="DetectProcess" Type="65" Source="aicustact.dll" Target="DetectProcess" Options="3" AdditionalSeq="AI_DATA_SETTER_2"/>
-    <ROW Action="InstallAddMaster" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; clones add master [APPDIR]" Options="1"/>
-    <ROW Action="InstallAttachMaster" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; attach master 277 --installed" Options="1"/>
-    <ROW Action="InstallClearCaches" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; caches clear --all" Options="1"/>
-    <ROW Action="InstallDetachAll" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; detach --all" Options="1"/>
-    <ROW Action="InstallEnableBinCache" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; configs bincache enable" Options="1"/>
-    <ROW Action="InstallForgetAll" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; clones forget --all" Options="1"/>
+    <ROW Action="InstallAddMaster" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; clones add this master --force" Options="1"/>
+    <ROW Action="InstallAddMaster_Admin" Type="2" Source="viewer.exe_1" Target="/RunAsAdmin /HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; clones add this master --force" Options="1"/>
+    <ROW Action="InstallAttachMaster" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; attach master 277 --installed" Options="1"/>
+    <ROW Action="InstallAttachMaster_Admin" Type="2" Source="viewer.exe_1" Target="/RunAsAdmin /HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; attach master 277 --installed" Options="1"/>
+    <ROW Action="InstallClearCaches" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; caches clear --all" Options="1"/>
+    <ROW Action="InstallClearCaches_Admin" Type="2" Source="viewer.exe_1" Target="/RunAsAdmin /HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; caches clear --all" Options="1"/>
+    <ROW Action="InstallDetachAll" Type="2" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; detach --all" Options="1"/>
+    <ROW Action="InstallDetachAll_Admin" Type="2" Source="viewer.exe_1" Target="/RunAsAdmin /HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; detach --all" Options="1"/>
     <ROW Action="MessageBox" Type="65" Source="aicustact.dll" Target="MsgBox" Options="1" AdditionalSeq="AI_DATA_SETTER_3"/>
-    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[AppDataFolder][ProductName]-Master"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFiles64Folder][ProductName]-Master"/>
     <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
     <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+    <ROW Action="SetDirectoryPath" Type="35" Source="APPDIR" Target="[AppDataFolder][ProductName]-Master"/>
     <ROW Action="StopProcess" Type="65" Source="aicustact.dll" Target="StopProcess" Options="1" AdditionalSeq="AI_DATA_SETTER_1"/>
-    <ROW Action="UninstallClearCaches" Type="1026" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; caches clear --all" Options="1"/>
-    <ROW Action="UninstallDetachAll" Type="1026" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; detach --all" Options="1"/>
-    <ROW Action="UninstallForgetAll" Type="1026" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[APPDIR]bin\pyrevit.exe&quot; clones forget --all" Options="1"/>
+    <ROW Action="UninstallClearCaches" Type="1026" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; caches clear --all" Options="1"/>
+    <ROW Action="UninstallClearCaches_Admin" Type="1026" Source="viewer.exe_1" Target="/RunAsAdmin /HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; caches clear --all" Options="1"/>
+    <ROW Action="UninstallDetachAll" Type="1026" Source="viewer.exe_1" Target="/HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; detach --all" Options="1"/>
+    <ROW Action="UninstallDetachAll_Admin" Type="1026" Source="viewer.exe_1" Target="/RunAsAdmin /HideWindow /dir &quot;[APPDIR]&quot; &quot;[#pyrevit.exe]&quot; detach --all" Options="1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiEnvComponent">
     <ROW Environment="PATH" Name="=-Path" Value="[~];[APPDIR]bin" Component_="ProductInformation"/>
@@ -3774,7 +3777,6 @@
     <ROW Feature_="MainFeature" Component_="System.Numerics.Vectors.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Collections.Immutable.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Memory.dll"/>
-    <ROW Feature_="MainFeature" Component_="git27ce88e6.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Text.Encoding.CodePages.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Threading.Tasks.Extensions.dll"/>
     <ROW Feature_="MainFeature" Component_="pyRevitLabs.Emojis.dll"/>
@@ -3885,7 +3887,7 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
     <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1397"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
     <ROW Action="AI_EnableDebugLog" Sequence="51"/>
     <ROW Action="AI_GetArpIconPath" Sequence="1401"/>
     <ROW Action="AI_RemoveExternalUIStub" Condition="(REMOVE=&quot;ALL&quot;) AND ((VersionNT &gt; 500) OR((VersionNT = 500) AND (ServicePackLevel &gt;= 4)))" Sequence="1501"/>
@@ -3900,25 +3902,28 @@
     <ROW Action="AI_DeleteLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="6599" Builds="DefaultBuild"/>
     <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="203"/>
     <ROW Action="AI_AppSearchEx" Sequence="102"/>
-    <ROW Action="StopProcess" Condition="BTN_PRESSED = &quot;IDOK&quot;" Sequence="207"/>
-    <ROW Action="AI_DATA_SETTER_1" Condition="BTN_PRESSED = &quot;IDOK&quot;" Sequence="206"/>
-    <ROW Action="MessageBox" Condition="AI_PROCESS_STATE = &quot;Running&quot;" Sequence="205"/>
-    <ROW Action="AI_DATA_SETTER_3" Condition="AI_PROCESS_STATE = &quot;Running&quot;" Sequence="204"/>
-    <ROW Action="DetectProcess" Sequence="202"/>
-    <ROW Action="AI_DATA_SETTER_2" Sequence="201"/>
-    <ROW Action="AI_DETECT_MODERNWIN" Condition="(VersionNT &gt;= 603)" Sequence="54" MsiKey="AI_DETECT_MODERNWIN"/>
-    <ROW Action="UninstallDetachAll" Condition="( ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) )" Sequence="1601"/>
-    <ROW Action="UninstallForgetAll" Condition="( ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) )" Sequence="1602"/>
-    <ROW Action="UninstallClearCaches" Condition="( ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) )" Sequence="1603"/>
-    <ROW Action="InstallClearCaches" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6601"/>
-    <ROW Action="InstallDetachAll" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6602"/>
-    <ROW Action="InstallForgetAll" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6603"/>
-    <ROW Action="InstallAddMaster" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6604"/>
-    <ROW Action="InstallAttachMaster" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6605"/>
-    <ROW Action="InstallEnableBinCache" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6606"/>
+    <ROW Action="StopProcess" Condition="( ( NOT Installed ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( BTN_PRESSED = &quot;IDOK&quot; )" Sequence="207"/>
+    <ROW Action="AI_DATA_SETTER_1" Condition="( ( NOT Installed ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( BTN_PRESSED = &quot;IDOK&quot; )" Sequence="206"/>
+    <ROW Action="MessageBox" Condition="( ( NOT Installed ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( AI_PROCESS_STATE = &quot;Running&quot; )" Sequence="205"/>
+    <ROW Action="AI_DATA_SETTER_3" Condition="( ( NOT Installed ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( AI_PROCESS_STATE = &quot;Running&quot; )" Sequence="204"/>
+    <ROW Action="DetectProcess" Condition="( ( NOT Installed ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) )" Sequence="202"/>
+    <ROW Action="AI_DATA_SETTER_2" Condition="( ( NOT Installed ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) )" Sequence="201"/>
+    <ROW Action="AI_DETECT_MODERNWIN" Condition="(VersionNT &gt;= 603)" Sequence="53" MsiKey="AI_DETECT_MODERNWIN"/>
+    <ROW Action="UninstallDetachAll" Condition="( ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( NOT Privileged )" Sequence="1601"/>
+    <ROW Action="UninstallClearCaches" Condition="( ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( NOT Privileged )" Sequence="1603"/>
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
     <ROW Action="AI_ExtractFiles" Sequence="1399" Builds="DefaultBuild"/>
     <ROW Action="AI_DATA_SETTER" Sequence="1398"/>
+    <ROW Action="UninstallDetachAll_Admin" Condition="( ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( Privileged )" Sequence="1602"/>
+    <ROW Action="UninstallClearCaches_Admin" Condition="( ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) OR ( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) ) AND ( Privileged )" Sequence="1604"/>
+    <ROW Action="InstallClearCaches" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( NOT Privileged )" Sequence="6601"/>
+    <ROW Action="InstallClearCaches_Admin" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( Privileged )" Sequence="6602"/>
+    <ROW Action="InstallDetachAll" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( NOT Privileged )" Sequence="6603"/>
+    <ROW Action="InstallDetachAll_Admin" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( Privileged )" Sequence="6604"/>
+    <ROW Action="InstallAddMaster" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( NOT Privileged )" Sequence="6605"/>
+    <ROW Action="InstallAddMaster_Admin" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( Privileged )" Sequence="6606"/>
+    <ROW Action="InstallAttachMaster" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( NOT Privileged )" Sequence="6607"/>
+    <ROW Action="InstallAttachMaster_Admin" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( Privileged )" Sequence="6608"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
     <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
@@ -3928,6 +3933,7 @@
     <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="103"/>
     <ROW Action="AI_AppSearchEx" Sequence="102"/>
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
+    <ROW Action="SetDirectoryPath" Condition="NOT Privileged" Sequence="1101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
     <ROW Condition="( Version9X OR VersionNT64 )" Description="[ProductName] cannot be installed on [WindowsTypeNTDisplay]." DescriptionLocId="AI.LaunchCondition.NoNT" IsPredefined="true" Builds="DefaultBuild"/>