diff --git a/editions/es-ES-server/tiddlywiki.info b/editions/es-ES-server/tiddlywiki.info
index 156b0169c..deac3678b 100644
--- a/editions/es-ES-server/tiddlywiki.info
+++ b/editions/es-ES-server/tiddlywiki.info
@@ -6,7 +6,8 @@
         "tiddlywiki/highlight"
     ],
     "themes": [
-        "tiddlywiki/vanilla"
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
     ],
     "includeWikis": [
         "../es-ES"
diff --git a/editions/es-ES/tiddlers/$__ContributionBanner.tid b/editions/es-ES/tiddlers/$__ContributionBanner.tid
index 2babc42b9..772e14d74 100644
--- a/editions/es-ES/tiddlers/$__ContributionBanner.tid
+++ b/editions/es-ES/tiddlers/$__ContributionBanner.tid
@@ -1,12 +1,12 @@
 created: 20160419092851048
 list-after: $:/core/ui/EditTemplate/title
-modified: 20160419133825429
+modified: 20160515101246618
 tags: $:/tags/EditTemplate
 title: $:/ContributionBanner
 type: text/vnd.tiddlywiki
 
 \define makeGitHubLink()
-https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/tw5.com/tiddlers/$(githubLink)$
+https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/es-ES/tiddlers/$(githubLink)$
 \end
 \define innerMakeGitHubLink(linkText)
 <$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(draftOfTiddler)$}}>
diff --git a/editions/es-ES/tiddlers/$__SiteSubtitle.tid b/editions/es-ES/tiddlers/$__SiteSubtitle.tid
new file mode 100644
index 000000000..ff6207d0a
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__SiteSubtitle.tid
@@ -0,0 +1,4 @@
+title: $:/SiteSubtitle
+type: text/vnd.tiddlywiki
+
+Cuaderno de notas personal no-lineal en la web
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__core_ui_DefaultSearchResultList.tid b/editions/es-ES/tiddlers/$__core_ui_DefaultSearchResultList.tid
index b5377df5a..ef851b658 100644
--- a/editions/es-ES/tiddlers/$__core_ui_DefaultSearchResultList.tid
+++ b/editions/es-ES/tiddlers/$__core_ui_DefaultSearchResultList.tid
@@ -1,23 +1,18 @@
 caption: {{$:/language/Search/DefaultResults/Caption}}
 created: 20141117081621387
-modified: 20160411220341854
+modified: 20160515100401168
 tags: $:/tags/SearchResults
 title: $:/core/ui/DefaultSearchResultList
 type: text/vnd.tiddlywiki
 
 \define searchResultList()
-<$set name="resultCount" value="""<$count filter="[!is[system]search{$(searchTiddler)$}]"/>""">
-
-{{$:/language/Search/Matches}}
-
-</$set>
-
-//<small>Coincidencias en títulos :</small>//
+//<small>{{$:/language/Search/Matches/Title}}</small>//
 
 <$list filter="[!is[system]search:title{$(searchTiddler)$}sort[caption]limit[250]] [!is[system]search:es-title{$(searchTiddler)$}sort[title]limit[250]][!is[system]search:en-title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 
-//<small>Todas las coincidencias :</small>//
+//<small>{{$:/language/Search/Matches/All}}</small>//
 
 <$list filter="[!is[system]search{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
 \end
 <<searchResultList>>
diff --git a/editions/es-ES/tiddlers/$__core_ui_ListItemTemplate.tid b/editions/es-ES/tiddlers/$__core_ui_ListItemTemplate.tid
index 5a86ec335..92d873f84 100644
--- a/editions/es-ES/tiddlers/$__core_ui_ListItemTemplate.tid
+++ b/editions/es-ES/tiddlers/$__core_ui_ListItemTemplate.tid
@@ -1,5 +1,5 @@
 created: 20141117221740337
-modified: 20160411220341877
+modified: 20160515100528031
 title: $:/core/ui/ListItemTemplate
 type: text/vnd.tiddlywiki
 
@@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki
 <$view field="title"/>
 </$view>
 </$link>
-</div>
+</div>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__core_ui_SideBar_Open.tid b/editions/es-ES/tiddlers/$__core_ui_SideBar_Open.tid
new file mode 100644
index 000000000..e5d080537
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__core_ui_SideBar_Open.tid
@@ -0,0 +1,15 @@
+caption: {{$:/language/SideBar/Open/Caption}}
+created: 20160429080322465
+modified: 20160515100901701
+tags: $:/tags/SideBar
+title: $:/core/ui/SideBar/Open
+type: text/vnd.tiddlywiki
+
+\define lingo-base() $:/language/CloseAll/
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
+
+<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$transclude field="es-title"><$view field="title"/></$transclude></$link>
+
+</$list>
+
+<$button message="tm-close-all-tiddlers" class="tc-btn-invisible tc-btn-mini"><<lingo Button>></$button>
diff --git a/editions/es-ES/tiddlers/$__core_ui_TagTemplate.tid b/editions/es-ES/tiddlers/$__core_ui_TagTemplate.tid
new file mode 100644
index 000000000..d6880d23d
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__core_ui_TagTemplate.tid
@@ -0,0 +1,33 @@
+created: 20160504080001125
+modified: 20160515100830717
+title: $:/core/ui/TagTemplate
+type: text/vnd.tiddlywiki
+
+\define tag-styles()
+background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
+\end
+
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
+<$set name="foregroundColor" value=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>>
+<$set name="backgroundColor" value="""$colour$""">
+<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>>
+<$transclude tiddler={{!!icon}}/> <$view field="es-title"><$view field="title" format="text" /></$view>
+</$button>
+<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+<hr>
+<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
+</div>
+</$reveal>
+</$set>
+</$set>
+\end
+
+\define tag-body(colour,palette)
+<span class="tc-tag-list-item">
+<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
+</span>
+\end
+
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__core_ui_ViewTemplate_title.tid b/editions/es-ES/tiddlers/$__core_ui_ViewTemplate_title.tid
index 28f7c3742..0ed035127 100644
--- a/editions/es-ES/tiddlers/$__core_ui_ViewTemplate_title.tid
+++ b/editions/es-ES/tiddlers/$__core_ui_ViewTemplate_title.tid
@@ -1,5 +1,5 @@
 created: 20141119191707140
-modified: 20160411220341866
+modified: 20160515100614389
 tags: $:/tags/ViewTemplate
 title: $:/core/ui/ViewTemplate/title
 type: text/vnd.tiddlywiki
@@ -15,8 +15,10 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 <span class="tc-tiddler-controls">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
+<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
+<$link>
 <$set name="foregroundColor" value={{!!color}}>
-<span style=<<title-styles>>>
+<span class="tc-tiddler-title-icon" style=<<title-styles>>>
 <$transclude tiddler={{!!icon}}/>
 </span>
 </$set>
@@ -32,11 +34,13 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 </$view>
 </h2>
 </$list>
+</$link>
+</$set>
 </div>
 
-<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup" animate="yes" retain="yes">
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
 
 <$transclude tiddler="$:/core/ui/TiddlerInfo"/>
 
 </$reveal>
-</div>
+</div>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/system/download-empty-button.tid b/editions/es-ES/tiddlers/system/download-empty-button.tid
index 4acedf5c2..26206a08f 100644
--- a/editions/es-ES/tiddlers/system/download-empty-button.tid
+++ b/editions/es-ES/tiddlers/system/download-empty-button.tid
@@ -3,4 +3,4 @@ title: $:/editions/es-ES/snippets/download-empty-button
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/editions/es-ES/download-empty" filename="empty_es.html"/>
 Descargar un wiki en blanco {{$:/core/images/save-button}}
-</$button>
+</$button>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlywiki.info b/editions/es-ES/tiddlywiki.info
index a36157ce4..b4b8dc598 100644
--- a/editions/es-ES/tiddlywiki.info
+++ b/editions/es-ES/tiddlywiki.info
@@ -5,9 +5,10 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
@@ -22,10 +23,12 @@
 		"empty": [
 			"--rendertiddler","$:/editions/es-ES/download-empty","empty.html","text/plain",
 			"--rendertiddler","$:/editions/es-ES/download-empty","empty.hta","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
\ No newline at end of file