diff --git a/sw.cpp b/sw.cpp
index 771674a..c25e1a6 100644
--- a/sw.cpp
+++ b/sw.cpp
@@ -8,14 +8,14 @@ void build(Solution &s)
     auto &common = tools.addStaticLibrary("common");
     common += cpp20;
     common.setRootDirectory("src/common");
-    common.Public += "pub.egorpugin.primitives.filesystem-master"_dep;
+    common.Public += "pub.egorpugin.primitives.filesystem"_dep;
 
     auto add_exe = [&tools](const String &name) -> decltype(auto)
     {
         auto &t = tools.addExecutable(name);
         t += cpp20;
         t.setRootDirectory("src/" + name);
-        t += "pub.egorpugin.primitives.sw.main-master"_dep;
+        t += "pub.egorpugin.primitives.sw.main"_dep;
         return t;
     };
 
@@ -33,17 +33,18 @@ void build(Solution &s)
         return t;
     };
 
-    add_exe_with_data_manager("db_add_language") += "pub.egorpugin.primitives.executor-master"_dep;
+    add_exe_with_data_manager("db_add_language") += "pub.egorpugin.primitives.executor"_dep;
     add_exe_with_data_manager("db_extractor");
     add_exe_with_data_manager("mmm_extractor");
     add_exe_with_data_manager("mmo_extractor");
-    add_exe_with_common("mmp_extractor") += "org.sw.demo.intel.opencv.highgui-*"_dep;
+    add_exe_with_common("mmp_extractor") += "org.sw.demo.intel.opencv.highgui"_dep;
     add_exe_with_common("mpj_loader");
     add_exe_with_common("tm_converter");
     add_exe("name_generator");
     add_exe_with_common("save_loader");
-    if (common.getBuildSettings().TargetOS.Arch == ArchType::x86)
-        add_exe("unpaker"); // 32-bit only
+    auto &unpaker = add_exe("unpaker"); // 32-bit only
+    if (unpaker.getBuildSettings().TargetOS.Arch != ArchType::x86)
+        unpaker.HeaderOnly = true;
 
     // not so simple targets
     auto &script2txt = tools.addStaticLibrary("script2txt");
@@ -60,15 +61,16 @@ void build(Solution &s)
     model.Public += common,
         "org.sw.demo.unicode.icu.i18n"_dep,
         "org.sw.demo.eigen"_dep,
-        "pub.egorpugin.primitives.yaml-master"_dep,
-        "pub.egorpugin.primitives.sw.settings-master"_dep
+        "pub.egorpugin.primitives.yaml"_dep,
+        "pub.egorpugin.primitives.sw.settings"_dep
         ;
 
     add_exe("mod_reader") += model;
 
     auto &mod_converter = add_exe("mod_converter");
     mod_converter += model;
-    path sdk = "d:/arh/apps/Autodesk/FBX/FBX SDK/2020.2";
+    //mod_converter += "org.sw.demo.xmlsoft.libxml2"_dep; // fbx 2020 sdk requires libxml2
+    path sdk = "d:/arh/apps/Autodesk/FBX/FBX SDK/2019.0";
     mod_converter += IncludeDirectory(sdk / "include");
     String cfg = "release";
     if (mod_converter.getBuildSettings().Native.ConfigurationType == ConfigurationType::Debug)