diff --git a/src/IOTAppStory.cpp b/src/IOTAppStory.cpp
index f848e9b7..48958d11 100644
--- a/src/IOTAppStory.cpp
+++ b/src/IOTAppStory.cpp
@@ -986,8 +986,10 @@ void IOTAppStory::processField(){
 int IOTAppStory::dPinConv(String orgVal){
 	#if defined ESP8266_OAK
 
+		// https://github.com/esp8266/Arduino/blob/master/variants/oak/pins_arduino.h
 		// DEBUG_PRINTLN("- Digistump OAK -");
-		if      (orgVal == "P1"  || orgVal == "5")    return P1;
+		if      (orgVal == "P0"  || orgVal == "2")    return P0;
+		else if (orgVal == "P1"  || orgVal == "5")    return P1;
 		else if (orgVal == "P2"  || orgVal == "0")    return P2;
 		else if (orgVal == "P3"  || orgVal == "3")    return P3;
 		else if (orgVal == "P4"  || orgVal == "1")    return P4;
@@ -998,11 +1000,30 @@ int IOTAppStory::dPinConv(String orgVal){
 		else if (orgVal == "P9"  || orgVal == "14")   return P9;
 		else if (orgVal == "P10" || orgVal == "16")   return P10;
 		else if (orgVal == "P11" || orgVal == "17")   return P11;
-		else                                          return P1;
+		else                                          return P0;
 
-	#elif defined ESP8266_WEMOS_D1MINI || defined ESP8266_WEMOS_D1MINILITE || defined ESP8266_WEMOS_D1MINIPRO || defined ESP8266_NODEMCU || defined WIFINFO
+	#elif defined ESP8266_WEMOS_D1MINI || defined ESP8266_WEMOS_D1MINILITE || defined ESP8266_WEMOS_D1MINIPRO
 
-		// DEBUG_PRINTLN("- Special ESP's -");
+		// https://github.com/esp8266/Arduino/blob/master/variants/d1_mini/pins_arduino.h
+		// DEBUG_PRINTLN("- build-variant d1_mini -");
+		if      (orgVal == "D0"  || orgVal == "16")   return D0;
+		else if (orgVal == "D1"  || orgVal == "5")    return D1;
+		else if (orgVal == "D2"  || orgVal == "4")    return D2;
+		else if (orgVal == "D3"  || orgVal == "0")    return D3;
+		else if (orgVal == "D4"  || orgVal == "2")    return D4;
+		else if (orgVal == "D5"  || orgVal == "14")   return D5;
+		else if (orgVal == "D6"  || orgVal == "12")   return D6;
+		else if (orgVal == "D7"  || orgVal == "13")   return D7;
+		else if (orgVal == "D8"  || orgVal == "15")   return D8;
+		else if (orgVal == "RX"  || orgVal == "3")    return RX;
+		else if (orgVal == "TX" || orgVal == "1")     return TX;
+		else                                          return D0;
+
+	#elif defined ESP8266_NODEMCU || defined WIFINFO
+
+		// https://github.com/esp8266/Arduino/blob/master/variants/wifinfo/pins_arduino.h
+		// https://github.com/esp8266/Arduino/blob/master/variants/nodemcu/pins_arduino.h
+		// DEBUG_PRINTLN("- build-variant nodemcu and wifinfo -");
 		if      (orgVal == "D0"  || orgVal == "16")   return D0;
 		else if (orgVal == "D1"  || orgVal == "5")    return D1;
 		else if (orgVal == "D2"  || orgVal == "4")    return D2;
@@ -1015,7 +1036,7 @@ int IOTAppStory::dPinConv(String orgVal){
 		else if (orgVal == "D9"  || orgVal == "3")    return D9;
 		else if (orgVal == "D10" || orgVal == "1")    return D10;
 		else                                          return D0;
-		
+
 	#else
 
 		// DEBUG_PRINTLN("- Generic ESP's -");
diff --git a/src/IOTAppStory.h b/src/IOTAppStory.h
index a1e98cc1..b8d45a0e 100644
--- a/src/IOTAppStory.h
+++ b/src/IOTAppStory.h
@@ -126,7 +126,7 @@
 	const char HTTP_AP_CSS[] PROGMEM    	= "<style>#po,body,html{height:100%;width:100%}#m,.fi{opacity:0}#m,#m a{color:#000}#cnt,body{position:relative}#po,body,html,input{width:100%}body,body a,input{color:#FFF}.btn,body a:hover{text-decoration:none}@keyframes kfi{to{z-index:10;opacity:1}}.fi{z-index:10;animation:kfi .5s ease-in 1 forwards}body,html{padding:0;margin:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*,:after,:before{-webkit-box-sizing:inherit;-moz-box-sizing:inherit;box-sizing:inherit}body{background:#000;font:14px sans-serif}#po{padding-top:100px;position:fixed;z-index:0;background:rgba(0,0,0,.8);text-align:center;opacity:1}#m{width:200px;padding:10px;display:inline-block;background:#FFF;text-align:left}#cnt{min-width:280px;max-width:425px;margin:0 auto;padding:0 15px;z-index:2;border:1px solid #000}input{padding:4px 8px;margin:4px 0 10px;background:0;outline:0;border:1px solid #ccc}input:focus{border-color:#fcbc12}.btn{width:50%;margin:10px 0 0;padding:5px 14px 8px;display:block;float:right;background:#fcbc12;border-radius:4px;border:0;font-size:16px;color:#fff;text-align:center}.btn.sm{font-size:15px;padding:3px 14px 4px}.btn:active,.btn:focus,.btn:hover{background:#d3d3d3}table{width:100%}table tr:nth-child(2n-1){background:#1A1A1A}table td{padding:3px 4px}table td:nth-child(3):not([data-e=\"7\"]){width:20px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAABFElEQVQ4je2Pu07DUBBEz/oGBAUPG3dpEEI0CApEjSIlvIrwP6Hj9TN8QmxACKhIgeySHtFgRAMKvvZSxJFIcIoISqZZaWdnZ0YoQRr4NSFvIWwUq47mejqx83o3fCs/xKF7Jkir4N6KOQtkAkemkZx8v3cGxd6eIIfAs8K+qSeuuU1c0CbwonCcBn6tLDUA2YUX29DTtL1QH+bspX9gQ09t6N2XVtCbOTfrmkQgNo1kvczABu4jIkvmY2pGmk/vAxXsp6wBqEg8MqIjEeCk093V/qoCoOdMZrmz3M+jV/OLpRUztOear2iHB9kkFQAbetfA1kjnMijtynayW1SQ6lhiQIRqL80v8f/g7x5oNK5QlQjgCxBXWhCbZi53AAAAAElFTkSuQmCC) right center no-repeat;background-width:16px}table td:nth-child(3)[data-e=\"7\"]{background:0 0}</style>";
 
 	const char HTTP_WIFI_SCAN[] PROGMEM		= "<tr><td onclick=\"c(this);\">{s}</td><td>{q} dBm</td><td data-e=\"{e}\"></td></tr>";
-	const char HTTP_WIFI_FORM[] PROGMEM		= "<div id=\"po\"><div id=\"m\"></div></div><div id=\"cnt\"><h1>WIFI CONNECTION</h1><table>{r}</table><br><br><label>SSID</label><input id=\"s\" name=\"s\" maxlength=50 placeholder=\"SSID\"><label>Password</label><input id=\"p\" name=\"p\" maxlength=50 placeholder=\"password\"><br><br><button class=\"btn\" onclick=\"ld('\wsa')\">Save</button></div>";
+	const char HTTP_WIFI_FORM[] PROGMEM		= "<div id=\"po\"><div id=\"m\"></div></div><div id=\"cnt\"><h1>WIFI CONNECTION</h1><table>{r}</table><br><br><label>SSID</label><input id=\"s\" name=\"s\" maxlength=50 placeholder=\"SSID\"><label>Password</label><input id=\"p\" name=\"p\" maxlength=50 placeholder=\"password\"><br><br><button class=\"btn\" onclick=\"ld('wsa')\">Save</button></div>";
 
 	const char HTTP_APP_INFO[] PROGMEM		= "{\"l\":\"{l}\", \"v\":\"{v}\", \"n\":\"{n}\", \"m\":\"{m}\", \"t\":\"{t}\"}";