diff --git a/boards.txt b/boards.txt
index 74509c0b3..e8e009f5f 100644
--- a/boards.txt
+++ b/boards.txt
@@ -374,11 +374,13 @@ generic.menu.led.15=15
 generic.menu.led.15.build.led=-DLED_BUILTIN=15
 generic.menu.led.16=16
 generic.menu.led.16.build.led=-DLED_BUILTIN=16
-generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (testing)
-generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
+generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (190703 approved)
+generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22x_190703
+generic.menu.sdk.nonosdk222_111=nonos-sdk 2.2.1+111 (191024 testing)
+generic.menu.sdk.nonosdk222_111.build.sdk=NONOSDK22x_191024
 generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
 generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
-generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues)
+generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
 generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
 generic.menu.ip.lm2f=v2 Lower Memory
 generic.menu.ip.lm2f.build.lwip_include=lwip2/include
diff --git a/platform.txt b/platform.txt
index bfe7912c2..dfeee3ae0 100644
--- a/platform.txt
+++ b/platform.txt
@@ -39,7 +39,7 @@ build.stdcpp_level=-std=gnu++11
 
 build.float=-u _printf_float -u _scanf_float
 build.led=
-build.sdk=NONOSDK22y
+build.sdk=NONOSDK22x_190703
 
 compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 79c5af56b..ec29c5d27 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -1366,13 +1366,15 @@ def led (default,max):
 
 def sdk ():
     return { 'sdk': collections.OrderedDict([
-                        ('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (testing)'),
-                        ('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22y'),
+                        ('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (190703 approved)'),
+                        ('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22x_190703'),
+                        ('.menu.sdk.nonosdk222_111', 'nonos-sdk 2.2.1+111 (191024 testing)'),
+                        ('.menu.sdk.nonosdk222_111.build.sdk', 'NONOSDK22x_191024'),
+                     #  ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (190313 testing)'),
+                     #  ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x_190313'),
                         ('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
                         ('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
-                     #  ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
-                     #  ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
-                        ('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
+                        ('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (180626 known issues)'),
                         ('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
                     ])
            }
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index de225fba1..6c52fd670 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -164,21 +164,26 @@ if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3" in flatten_cppdefines:
         CPPDEFINES=[("NONOSDK3V0", 1)],
         LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK3V0")]
     )
-elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x" in flatten_cppdefines:
-    env.Append(
-        CPPDEFINES=[("NONOSDK22x", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
-    )
 elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221" in flatten_cppdefines:
     #(previous default)
     env.Append(
         CPPDEFINES=[("NONOSDK221", 1)],
         LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
     )
-else: #(default) elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
+elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313" in flatten_cppdefines:
     env.Append(
-        CPPDEFINES=[("NONOSDK22y", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
+        CPPDEFINES=[("NONOSDK22x_190313", 1)],
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190313")]
+    )
+elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:
+    env.Append(
+        CPPDEFINES=[("NONOSDK22x_191024", 1)],
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]
+    )
+else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
+    env.Append(
+        CPPDEFINES=[("NONOSDK22x_190703", 1)],
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
     )
 
 #
diff --git a/tools/sdk/lib/NONOSDK22x/commitlog-from-221.txt.gz b/tools/sdk/lib/NONOSDK22x_190313/commitlog-from-221.txt.gz
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/commitlog-from-221.txt.gz
rename to tools/sdk/lib/NONOSDK22x_190313/commitlog-from-221.txt.gz
diff --git a/tools/sdk/lib/NONOSDK22x/libairkiss.a b/tools/sdk/lib/NONOSDK22x_190313/libairkiss.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libairkiss.a
rename to tools/sdk/lib/NONOSDK22x_190313/libairkiss.a
diff --git a/tools/sdk/lib/NONOSDK22x/libcrypto.a b/tools/sdk/lib/NONOSDK22x_190313/libcrypto.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libcrypto.a
rename to tools/sdk/lib/NONOSDK22x_190313/libcrypto.a
diff --git a/tools/sdk/lib/NONOSDK22x/libespnow.a b/tools/sdk/lib/NONOSDK22x_190313/libespnow.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libespnow.a
rename to tools/sdk/lib/NONOSDK22x_190313/libespnow.a
diff --git a/tools/sdk/lib/NONOSDK22x/libmain.a b/tools/sdk/lib/NONOSDK22x_190313/libmain.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libmain.a
rename to tools/sdk/lib/NONOSDK22x_190313/libmain.a
diff --git a/tools/sdk/lib/NONOSDK22x/libnet80211.a b/tools/sdk/lib/NONOSDK22x_190313/libnet80211.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libnet80211.a
rename to tools/sdk/lib/NONOSDK22x_190313/libnet80211.a
diff --git a/tools/sdk/lib/NONOSDK22x/libphy.a b/tools/sdk/lib/NONOSDK22x_190313/libphy.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libphy.a
rename to tools/sdk/lib/NONOSDK22x_190313/libphy.a
diff --git a/tools/sdk/lib/NONOSDK22x/libpp.a b/tools/sdk/lib/NONOSDK22x_190313/libpp.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libpp.a
rename to tools/sdk/lib/NONOSDK22x_190313/libpp.a
diff --git a/tools/sdk/lib/NONOSDK22x/libsmartconfig.a b/tools/sdk/lib/NONOSDK22x_190313/libsmartconfig.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libsmartconfig.a
rename to tools/sdk/lib/NONOSDK22x_190313/libsmartconfig.a
diff --git a/tools/sdk/lib/NONOSDK22x/libwpa.a b/tools/sdk/lib/NONOSDK22x_190313/libwpa.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libwpa.a
rename to tools/sdk/lib/NONOSDK22x_190313/libwpa.a
diff --git a/tools/sdk/lib/NONOSDK22x/libwpa2.a b/tools/sdk/lib/NONOSDK22x_190313/libwpa2.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libwpa2.a
rename to tools/sdk/lib/NONOSDK22x_190313/libwpa2.a
diff --git a/tools/sdk/lib/NONOSDK22x/libwps.a b/tools/sdk/lib/NONOSDK22x_190313/libwps.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/libwps.a
rename to tools/sdk/lib/NONOSDK22x_190313/libwps.a
diff --git a/tools/sdk/lib/NONOSDK22x/version b/tools/sdk/lib/NONOSDK22x_190313/version
similarity index 100%
rename from tools/sdk/lib/NONOSDK22x/version
rename to tools/sdk/lib/NONOSDK22x_190313/version
diff --git a/tools/sdk/lib/NONOSDK22y/commitlog-from-22x.txt.gz b/tools/sdk/lib/NONOSDK22x_190703/commitlog-from-22x-190313.txt.gz
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/commitlog-from-22x.txt.gz
rename to tools/sdk/lib/NONOSDK22x_190703/commitlog-from-22x-190313.txt.gz
diff --git a/tools/sdk/lib/NONOSDK22y/libairkiss.a b/tools/sdk/lib/NONOSDK22x_190703/libairkiss.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libairkiss.a
rename to tools/sdk/lib/NONOSDK22x_190703/libairkiss.a
diff --git a/tools/sdk/lib/NONOSDK22y/libcrypto.a b/tools/sdk/lib/NONOSDK22x_190703/libcrypto.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libcrypto.a
rename to tools/sdk/lib/NONOSDK22x_190703/libcrypto.a
diff --git a/tools/sdk/lib/NONOSDK22y/libespnow.a b/tools/sdk/lib/NONOSDK22x_190703/libespnow.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libespnow.a
rename to tools/sdk/lib/NONOSDK22x_190703/libespnow.a
diff --git a/tools/sdk/lib/NONOSDK22y/libmain.a b/tools/sdk/lib/NONOSDK22x_190703/libmain.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libmain.a
rename to tools/sdk/lib/NONOSDK22x_190703/libmain.a
diff --git a/tools/sdk/lib/NONOSDK22y/libnet80211.a b/tools/sdk/lib/NONOSDK22x_190703/libnet80211.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libnet80211.a
rename to tools/sdk/lib/NONOSDK22x_190703/libnet80211.a
diff --git a/tools/sdk/lib/NONOSDK22y/libphy.a b/tools/sdk/lib/NONOSDK22x_190703/libphy.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libphy.a
rename to tools/sdk/lib/NONOSDK22x_190703/libphy.a
diff --git a/tools/sdk/lib/NONOSDK22y/libpp.a b/tools/sdk/lib/NONOSDK22x_190703/libpp.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libpp.a
rename to tools/sdk/lib/NONOSDK22x_190703/libpp.a
diff --git a/tools/sdk/lib/NONOSDK22y/libsmartconfig.a b/tools/sdk/lib/NONOSDK22x_190703/libsmartconfig.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libsmartconfig.a
rename to tools/sdk/lib/NONOSDK22x_190703/libsmartconfig.a
diff --git a/tools/sdk/lib/NONOSDK22y/libwpa.a b/tools/sdk/lib/NONOSDK22x_190703/libwpa.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libwpa.a
rename to tools/sdk/lib/NONOSDK22x_190703/libwpa.a
diff --git a/tools/sdk/lib/NONOSDK22y/libwpa2.a b/tools/sdk/lib/NONOSDK22x_190703/libwpa2.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libwpa2.a
rename to tools/sdk/lib/NONOSDK22x_190703/libwpa2.a
diff --git a/tools/sdk/lib/NONOSDK22y/libwps.a b/tools/sdk/lib/NONOSDK22x_190703/libwps.a
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/libwps.a
rename to tools/sdk/lib/NONOSDK22x_190703/libwps.a
diff --git a/tools/sdk/lib/NONOSDK22y/version b/tools/sdk/lib/NONOSDK22x_190703/version
similarity index 100%
rename from tools/sdk/lib/NONOSDK22y/version
rename to tools/sdk/lib/NONOSDK22x_190703/version
diff --git a/tools/sdk/lib/NONOSDK22x_191024/commitlog-from-22x-190703.txt.gz b/tools/sdk/lib/NONOSDK22x_191024/commitlog-from-22x-190703.txt.gz
new file mode 100644
index 000000000..277cc8fa0
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/commitlog-from-22x-190703.txt.gz differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libairkiss.a b/tools/sdk/lib/NONOSDK22x_191024/libairkiss.a
new file mode 100644
index 000000000..cfdcc8423
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libairkiss.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libcrypto.a b/tools/sdk/lib/NONOSDK22x_191024/libcrypto.a
new file mode 100644
index 000000000..8a43cb727
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libcrypto.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libespnow.a b/tools/sdk/lib/NONOSDK22x_191024/libespnow.a
new file mode 100644
index 000000000..92f6c9ab1
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libespnow.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libmain.a b/tools/sdk/lib/NONOSDK22x_191024/libmain.a
new file mode 100644
index 000000000..58779578a
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libmain.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libnet80211.a b/tools/sdk/lib/NONOSDK22x_191024/libnet80211.a
new file mode 100644
index 000000000..2d49d922e
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libnet80211.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libphy.a b/tools/sdk/lib/NONOSDK22x_191024/libphy.a
new file mode 100644
index 000000000..cab912d28
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libphy.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libpp.a b/tools/sdk/lib/NONOSDK22x_191024/libpp.a
new file mode 100644
index 000000000..2abbe7a3e
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libpp.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libsmartconfig.a b/tools/sdk/lib/NONOSDK22x_191024/libsmartconfig.a
new file mode 100644
index 000000000..95aec76c6
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libsmartconfig.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libwpa.a b/tools/sdk/lib/NONOSDK22x_191024/libwpa.a
new file mode 100644
index 000000000..41ad4876f
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libwpa.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libwpa2.a b/tools/sdk/lib/NONOSDK22x_191024/libwpa2.a
new file mode 100644
index 000000000..07420c5bf
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libwpa2.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/libwps.a b/tools/sdk/lib/NONOSDK22x_191024/libwps.a
new file mode 100644
index 000000000..ef0be1c35
Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191024/libwps.a differ
diff --git a/tools/sdk/lib/NONOSDK22x_191024/version b/tools/sdk/lib/NONOSDK22x_191024/version
new file mode 100644
index 000000000..27a6cd4ec
--- /dev/null
+++ b/tools/sdk/lib/NONOSDK22x_191024/version
@@ -0,0 +1 @@
+v2.2.1-111-gef6d0ed (shows as SDK:2.2.2-dev(5ab15d1) in debug mode)