diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake
index a210819239..fbfd0a0e3d 100644
--- a/ports/c4core/portfile.cmake
+++ b/ports/c4core/portfile.cmake
@@ -4,76 +4,78 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO biojppm/c4core
-    REF 636f507c33f0c79dce491aec066455ff384d49dc
-    SHA512 3282876be5883b047e8d25ee392f62d2e9ae79af8fdd65c11b1e36d2fdb0648230fe6c7fb57472a4cbced166979351f12494215aa664977a113b74c26bb6f19b
+    REF 8d1af00e2318e9d583c10fd3d89b8b1b1f923ea7
+    SHA512 a9b4e418d31f00682f4a5224c685ebc3c1ef96a5334f1a42bfeea773dbdc7f4d67191ca0e91dca45130e4c385708c9530696b9b038bbdb03d7a331c87793185d
     HEAD_REF master
 )
 
 set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e)
 
 # Get cmake scripts for c4core
-vcpkg_download_distfile(CMAKE_ARCHIVE
+vcpkg_download_distfile(
+    CMAKE_ARCHIVE
     URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip"
     FILENAME "cmake-${CM_COMMIT_HASH}.zip"
     SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH_CMAKE
+vcpkg_extract_source_archive(
+    SOURCE_PATH_CMAKE
     ARCHIVE ${CMAKE_ARCHIVE}
     WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/cmake")
-file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/cmake")
+file(RENAME "${SOURCE_PATH_CMAKE}" "${SOURCE_PATH}/cmake")
 
 set(DB_COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f)
 
-vcpkg_download_distfile(DEBUGBREAK_ARCHIVE
+vcpkg_download_distfile(
+    DEBUGBREAK_ARCHIVE
     URLS "https://github.com/biojppm/debugbreak/archive/${DB_COMMIT_HASH}.zip"
     FILENAME "debugbreak-${DB_COMMIT_HASH}.zip"
     SHA512 25f3d45b09ce362f736fac0f6d6a6c7f2053fec4975b32b0565288893e4658fd0648a7988c3a5fe0e373e92705d7a3970eaa7cfc053f375ffb75e80772d0df64
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH_DEBUGBREAK
+vcpkg_extract_source_archive(
+    SOURCE_PATH_DEBUGBREAK  
     ARCHIVE ${DEBUGBREAK_ARCHIVE}
     WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/debugbreak")
-file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/src/c4/ext/debugbreak")
+file(RENAME "${SOURCE_PATH_DEBUGBREAK}" "${SOURCE_PATH}/src/c4/ext/debugbreak")
 
 set(FF_COMMIT_HASH 8159e8bcf63c1b92f5a51fb550f966e56624b209)
 
-vcpkg_download_distfile(FAST_FLOAT_ARCHIVE
+vcpkg_download_distfile(
+    FAST_FLOAT_ARCHIVE
     URLS "https://github.com/biojppm/fast_float/archive/${FF_COMMIT_HASH}.zip"
     FILENAME "fast_float-${FF_COMMIT_HASH}.zip"
     SHA512 ae71f74d3bae782f62f037c034bea4e7f45462188c8285971c2959c6b2884d3bb58826681c0989f4290f26fa33237c1b63ceed77ed94f9e97c1cd01b4aa21cd3
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH_FAST_FLOAT
+vcpkg_extract_source_archive(
+    SOURCE_PATH_FAST_FLOAT 
     ARCHIVE ${FAST_FLOAT_ARCHIVE}
     WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/fast_float")
-file(RENAME ${SOURCE_PATH_FAST_FLOAT} "${SOURCE_PATH}/src/c4/ext/fast_float")
+file(RENAME "${SOURCE_PATH_FAST_FLOAT}" "${SOURCE_PATH}/src/c4/ext/fast_float")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
 if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/c4core)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c4core)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c4core)
 endif()
 
 # Fix paths in config file
diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json
index e59d53476c..cc75970c50 100644
--- a/ports/c4core/vcpkg.json
+++ b/ports/c4core/vcpkg.json
@@ -1,7 +1,18 @@
 {
   "name": "c4core",
-  "version-date": "2021-07-18",
-  "port-version": 1,
+  "version": "0.1.9",
   "description": "Library of low-level C++ utilities",
-  "homepage": "https://github.com/biojppm/c4core"
+  "homepage": "https://github.com/biojppm/c4core",
+  "license": "MIT",
+  "supports": "!(uwp | arm)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/ryml/cmake-fix.patch b/ports/ryml/cmake-fix.patch
index e8a01c5a64..4c973e9fde 100644
--- a/ports/ryml/cmake-fix.patch
+++ b/ports/ryml/cmake-fix.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3e4eb23..115b8aa 100644
+index d18407c..db19e0b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -19,8 +20,7 @@ option(RYML_BUILD_API "Enable API generation (python, etc)" OFF)
+@@ -21,8 +21,7 @@ option(RYML_DBG "Enable (very verbose) ryml debug prints." OFF)
  
  #-------------------------------------------------------
  
@@ -12,11 +12,11 @@ index 3e4eb23..115b8aa 100644
  
  c4_add_library(ryml
      SOURCES
-@@ -46,10 +46,10 @@ c4_add_library(ryml
+@@ -54,10 +53,10 @@ c4_add_library(ryml
          ryml.natvis
      SOURCE_ROOT ${RYML_SRC_DIR}
      INC_DIRS
-+	 $<BUILD_INTERFACE:${C4CORE_INCLUDE_DIR}>
++    $<BUILD_INTERFACE:${C4CORE_INCLUDE_DIR}>
          $<BUILD_INTERFACE:${RYML_SRC_DIR}>
          $<INSTALL_INTERFACE:include>
 -    LIBS c4core
@@ -24,5 +24,4 @@ index 3e4eb23..115b8aa 100644
 +    LIBS c4core::c4core
      )
  
- if(NOT RYML_DEFAULT_CALLBACKS)
-
+ if(RYML_WITH_TAB_TOKENS)
diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake
index 152c7c9e8d..7d650c096b 100644
--- a/ports/ryml/portfile.cmake
+++ b/ports/ryml/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO biojppm/rapidyaml
-    REF affafd5db67208eb85413327595507314c068525
-    SHA512 31d827ead680828b3c0ad879290b17d4729d412e30a20459aea4b92a8f4f3b8397f82b09c27d918ab4b955289560b17697d5f15eaa4d24661ff46f5dbbc50fa8
+    REF 213b201d264139cd1b887790197e08850af628e3 #v0.4.1
+    SHA512 f76e3c41284441dc195402fadda5ceb56fd48c7954a24c29457e14d2f1996d46e9cfb01dd366b00c588108777735b7ccc1d68215c6ecc609cc7b805535c77309
     HEAD_REF master
     PATCHES cmake-fix.patch
 )
@@ -13,20 +13,21 @@ vcpkg_from_github(
 set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e)
 
 # Get cmake scripts for rapidyaml
-vcpkg_download_distfile(CMAKE_ARCHIVE
+vcpkg_download_distfile(
+    CMAKE_ARCHIVE
     URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip"
     FILENAME "cmake-${CM_COMMIT_HASH}.zip"
     SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH_CMAKE
+vcpkg_extract_source_archive(
+    SOURCE_PATH_CMAKE
     ARCHIVE ${CMAKE_ARCHIVE}
     WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext/c4core/cmake")
-file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/ext/c4core/cmake")
+file(RENAME "${SOURCE_PATH_CMAKE}" "${SOURCE_PATH}/ext/c4core/cmake")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json
index a11054bd46..8fccd44071 100644
--- a/ports/ryml/vcpkg.json
+++ b/ports/ryml/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "ryml",
-  "version-date": "2021-07-24",
-  "port-version": 1,
+  "version": "0.4.1",
   "description": "Rapid YAML library",
   "homepage": "https://github.com/biojppm/rapidyaml",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "c4core",
diff --git a/versions/baseline.json b/versions/baseline.json
index 142ad4de67..1efb22d3cf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1213,8 +1213,8 @@
       "port-version": 0
     },
     "c4core": {
-      "baseline": "2021-07-18",
-      "port-version": 1
+      "baseline": "0.1.9",
+      "port-version": 0
     },
     "c89stringutils": {
       "baseline": "0.0.1",
@@ -6321,8 +6321,8 @@
       "port-version": 2
     },
     "ryml": {
-      "baseline": "2021-07-24",
-      "port-version": 1
+      "baseline": "0.4.1",
+      "port-version": 0
     },
     "ryu": {
       "baseline": "2.0",
diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json
index 4fcef7c1dc..ee68963c6b 100644
--- a/versions/c-/c4core.json
+++ b/versions/c-/c4core.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "db4217bd25647d340de3233e8f2fd59d250e16d8",
+      "version": "0.1.9",
+      "port-version": 0
+    },
     {
       "git-tree": "c1ef064ec4033e2fca5504b4eb44338453050f7f",
       "version-date": "2021-07-18",
diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json
index 13c188a17f..8c7cd857f2 100644
--- a/versions/r-/ryml.json
+++ b/versions/r-/ryml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0d8fb44c056a4bea4e4ba19d34cf26a320eb2599",
+      "version": "0.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "599ab36a18b1a0c439fdc6dc740bf0575a06641e",
       "version-date": "2021-07-24",