diff --git a/editions/tw5.com/tiddlers/TiddlyWiki extensions for Sublime Text 3 by roma0104.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for Sublime Text 3 by roma0104.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/TiddlyWiki extensions for Sublime Text 3 by roma0104.tid
rename to editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for Sublime Text 3 by roma0104.tid
diff --git a/editions/tw5.com/tiddlers/features/AutoSave.tid b/editions/tw5.com/tiddlers/features/AutoSave.tid
index d06e9368b..9d4c51a50 100644
--- a/editions/tw5.com/tiddlers/features/AutoSave.tid
+++ b/editions/tw5.com/tiddlers/features/AutoSave.tid
@@ -1,10 +1,10 @@
 created: 20140206211715540
-modified: 20140912140613891
+modified: 20160520090022486
 tags: Features
 title: AutoSave
 type: text/vnd.tiddlywiki
 
-If there is a SaverModule available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking {{$:/core/images/done-button}} ''tick'' or {{$:/core/images/delete-button}} ''delete'' when editing a tiddler.
+If there is a SaverModule available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking {{$:/core/images/done-button}} ''ok'' or {{$:/core/images/delete-button}} ''delete'' when editing a tiddler.
 
 You should see a yellow notification at the top right of the window to confirm that an automatic save has taken place.
 
diff --git a/editions/tw5.com/tiddlers/GettingStarted - WebDAV.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/GettingStarted - WebDAV.tid
rename to editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid
diff --git a/editions/tw5.com/tiddlers/Edicion_en_Castellano.tid b/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Edicion_en_Castellano.tid
rename to editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid
diff --git a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid
index f80dfe651..6b5999dbc 100644
--- a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid	
+++ b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid	
@@ -1,5 +1,5 @@
 created: 20131219100608529
-modified: 20160501090359432
+modified: 20160520090217678
 tags: [[TiddlyWiki on Node.js]]
 title: Installing TiddlyWiki on Node.js
 type: text/vnd.tiddlywiki
@@ -20,7 +20,7 @@ type: text/vnd.tiddlywiki
 ## Visit http://127.0.0.1:8080/ in your browser
 ## Try editing and creating tiddlers
 # Optionally, make an offline copy:
-#* click the {{$:/core/images/save-button}} ''Save changes'' button in the sidebar, ''OR''
+#* click the {{$:/core/images/save-button}} ''save changes'' button in the sidebar, ''OR''
 #* `tiddlywiki --build index`
 
 
diff --git a/editions/tw5.com/tiddlers/saving/Saving on Safari.tid b/editions/tw5.com/tiddlers/saving/Saving on Safari.tid
index 9bf99f685..e04967b9e 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on Safari.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on Safari.tid	
@@ -1,5 +1,5 @@
 created: 20140811171304926
-modified: 20140912145848855
+modified: 20160520090313926
 tags: Saving
 title: Saving on Safari
 type: text/vnd.tiddlywiki
@@ -13,7 +13,7 @@ This method of saving changes is clunky because it requires manual intervention
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in Safari
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''done'' button
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
 # Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 # A popup "Download changes" window is displayed that includes a link labelled //Right-click to save changes//
 # Right-click on the link and select "Download Linked File As..." from the popup menu
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid
index d4c4c04a3..a3f2c6cdf 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid	
@@ -1,5 +1,5 @@
 created: 20140103134551508
-modified: 20140912140933724
+modified: 20160520090532058
 tags: Saving
 title: Saving with TiddlyFox on Android
 type: text/vnd.tiddlywiki
@@ -18,7 +18,7 @@ type: text/vnd.tiddlywiki
 # When the file has downloaded, click on it within the notification tray or the download manager application
 # Choose to open the file in Firefox (rather than the default Android viewer)
 # Click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file
-# Try creating a new tiddler using the ''plus'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''tick'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''Save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid
index 595136463..c7f3b09e8 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid	
@@ -1,5 +1,5 @@
 created: 20131221085742684
-modified: 20140912140942913
+modified: 20160520090455242
 tags: Saving
 title: Saving with TiddlyFox
 type: text/vnd.tiddlywiki
@@ -17,7 +17,7 @@ If you're using [[Firefox for Android]], see the instructions for [[Saving with
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in [[Firefox]]
 # Click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file
-# Try creating a new tiddler using the ''plus'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''tick'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''Save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid
index 02539a3c6..134095284 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid	
@@ -1,5 +1,5 @@
 created: 20131211220000000
-modified: 20140912141055656
+modified: 20160520090419917
 tags: [[Saving on InternetExplorer]]
 title: Saving with TiddlyIE
 type: text/vnd.tiddlywiki
@@ -13,6 +13,6 @@ type: text/vnd.tiddlywiki
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` extension
 # Open the file in Internet Explorer
-# Try creating a new tiddler using the ''plus'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''tick'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''Save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid
index cafd0ce5a..e69362044 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid	
@@ -1,5 +1,5 @@
 created: 20131129092604900
-modified: 20140912140952153
+modified: 20160520090349774
 tags: Saving
 title: Saving with the HTML5 fallback saver
 type: text/vnd.tiddlywiki
@@ -13,7 +13,7 @@ This method of saving changes is clunky because it requires manual intervention
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in your browser
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''done'' button
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
 # Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 # Your browser will download a new copy of the wiki incorporating your changes
 # Locate the newly downloaded file and open it in your browser
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid
index 17ec20402..f4dd1304a 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid	
@@ -1,5 +1,5 @@
 created: 20140904140300000
-modified: 20141010093319359
+modified: 20160520090113978
 tags: [[Working with TiddlyWiki]]
 title: Creating and editing tiddlers
 type: text/vnd.tiddlywiki
@@ -30,6 +30,6 @@ When you create a new tiddler or edit an existing one, the tiddler will go into
 
 When you have finished editing, click a button at the top right of the tiddler:
 
-*The ''save'' button ({{$:/core/images/done-button}}) stores your changes to this one tiddler and leaves draft mode. If your wiki is configured to [[AutoSave]], your changes will be permanently saved. Otherwise they will only be stored temporarily in your web browser, and you will lose them if you close your ~TiddlyWiki page without first clicking the master ''save changes'' button {{$:/core/images/save-button}} in the sidebar.
+*The ''ok'' button ({{$:/core/images/done-button}}) stores your changes to this one tiddler and leaves draft mode. If your wiki is configured to [[AutoSave]], your changes will be permanently saved. Otherwise they will only be stored temporarily in your web browser, and you will lose them if you close your ~TiddlyWiki page without first clicking the master ''save changes'' button {{$:/core/images/save-button}} in the sidebar.
 *The ''cancel'' button ({{$:/core/images/cancel-button}}) discards your changes (after asking you to confirm) and leaves draft mode.
 *The ''delete'' button ({{$:/core/images/delete-button}}) deletes the entire tiddler (after asking you to confirm).