diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index dea3a8830d..5eca98e467 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -25,6 +25,7 @@ InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that
 InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
 LazyLoadingWarning: <p>Loading external text from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See http://tiddlywiki.com/#ExternalText</p>
 MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
+No: No
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
 OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to plugins to take effect
@@ -37,3 +38,4 @@ TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
 Tiddler/DateFormat: DDth MMM YYYY at hh12:0mmam
 UnsavedChangesWarning: You have unsaved changes in TiddlyWiki
+Yes: Yes
diff --git a/core/language/en-GB/ThemeTweaks.multids b/core/language/en-GB/ThemeTweaks.multids
new file mode 100644
index 0000000000..28a9847a36
--- /dev/null
+++ b/core/language/en-GB/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: Theme Tweaks
+ThemeTweaks/Hint: You can tweak certain aspects of the ''Vanilla'' theme.
+Options: Options
+Options/SidebarLayout: Sidebar layout
+Options/SidebarLayout/Fixed-Fluid: Fixed story, fluid sidebar
+Options/SidebarLayout/Fluid-Fixed: Fluid story, fixed sidebar
+Options/StickyTitles: Sticky titles
+Options/StickyTitles/Hint: Causes tiddler titles to "stick" to the top of the browser window. Caution: Does not work at all with Chrome, and causes some layout issues in Firefox
+Options/CodeWrapping: Wrap long lines in code blocks
+Settings: Settings
+Settings/FontFamily: Font family
+Settings/CodeFontFamily: Code font family
+Settings/BackgroundImage: Page background image
+Settings/BackgroundImageAttachment: Page background image attachment
+Settings/BackgroundImageAttachment/Scroll: Scroll with tiddlers
+Settings/BackgroundImageAttachment/Fixed: Fixed to window
+Settings/BackgroundImageSize: Page background image size
+Settings/BackgroundImageSize/Auto: Auto
+Settings/BackgroundImageSize/Cover: Cover
+Settings/BackgroundImageSize/Contain: Contain
+Metrics: Sizes
+Metrics/FontSize: Font size
+Metrics/LineHeight: Line height
+Metrics/BodyFontSize: Font size for tiddler body
+Metrics/BodyLineHeight: Line height for tiddler body
+Metrics/StoryLeft: Story left position
+Metrics/StoryLeft/Hint: how far the left margin of the story river<br>(tiddler area) is from the left of the page
+Metrics/StoryTop: Story top position
+Metrics/StoryTop/Hint: how far the top margin of the story river<br>is from the top of the page
+Metrics/StoryRight: Story right
+Metrics/StoryRight/Hint: how far the left margin of the sidebar <br>is from the left of the page
+Metrics/StoryWidth: Story width
+Metrics/StoryWidth/Hint: the overall width of the story river
+Metrics/TiddlerWidth: Tiddler width
+Metrics/TiddlerWidth/Hint: within the story river
+Metrics/SidebarBreakpoint: Sidebar breakpoint
+Metrics/SidebarBreakpoint/Hint: the minimum page width at which the story<br>river and sidebar will appear side by side
+Metrics/SidebarWidth: Sidebar width
+Metrics/SidebarWidth/Hint: the width of the sidebar in fluid-fixed layout
diff --git a/editions/fr-FR/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid b/editions/fr-FR/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid
deleted file mode 100644
index 4951dff404..0000000000
--- a/editions/fr-FR/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid
+++ /dev/null
@@ -1,69 +0,0 @@
-caption: Réglages Thème
-created: 20150603170902280
-modified: 20150615104641450
-tags: $:/tags/ControlPanel/Appearance
-title: $:/themes/tiddlywiki/vanilla/themetweaks
-type:  l
-
-\define backgroundimage-dropdown()
-<div class="tc-drop-down-wrapper">
-<$button popup=<<qualify "$:/state/popup/themetweaks/backgroundimage">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button>
-<$reveal state=<<qualify "$:/state/popup/themetweaks/backgroundimage">> type="popup" position="belowleft" text="" default="">
-<div class="tc-drop-down">
-<$linkcatcher to="$:/themes/tiddlywiki/vanilla/settings/backgroundimage">
-<$link to="">
-(none)
-</$link>
-<hr>
-<$list filter="[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[sort[title]]">
-<$link to={{!!title}}>
-<$transclude/> <$view field="title"/>
-</$link>
-</$list>
-</$linkcatcher>
-</div>
-</$reveal>
-</div>
-\end
-
-\define backgroundimageattachment-dropdown()
-<$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment" default="scroll">
-<option value="scroll">Défile avec les tiddlers</option>
-<option value="fixed">Fixée à la fenêtre</option>
-</$select>
-\end
-
-\define backgroundimagesize-dropdown()
-<$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize" default="scroll">
-<option value="auto">Auto</option>
-<option value="cover">Élargie</option>
-<option value="contain">Contenue</option>
-</$select>
-\end
-
-Vous pouvez ajuster certains aspects du thème ''Vanilla''.
-
-! Options
-
-|[[Titres stickés |$:/themes/tiddlywiki/vanilla/options/stickytitles]]<br>//"Stick" les titres de tiddler en haut de la fenêtre du navigateur. Attention<<:>> Ne fonctionne pas du tout avec Chrome, et peut causer quelques problèmes de mise en page dans Firefox// |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/stickytitles"><option value="no">No</option><option value="yes">Yes</option></$select> |
-
-! Réglages
-
-|[[Famille de polices|$:/themes/tiddlywiki/vanilla/settings/fontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | |
-|[[Code des familles de police|$:/themes/tiddlywiki/vanilla/settings/codefontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | |
-|[[Image de fond de page|$:/themes/tiddlywiki/vanilla/settings/backgroundimage]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<<backgroundimage-dropdown>> |
-|[[Fixation de l'image de fond de page |$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment]] |<<backgroundimageattachment-dropdown>> | |
-|[[Taille de l'image de fond de page |$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize]] |<<backgroundimagesize-dropdown>> | |
-
-! Tailles
-
-|[[Taille police|$:/themes/tiddlywiki/vanilla/metrics/fontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> |
-|[[Hauteur ligne|$:/themes/tiddlywiki/vanilla/metrics/lineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> |
-|[[Taille police dans un tiddler|$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> |
-|[[Hauteur de ligne dans un tiddler|$:/themes/tiddlywiki/vanilla/metrics/bodylineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> |
-|[[Position gauche du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storyleft]]<br>//marge de gauche du déroulé principal<br>(zone des tiddlers) au bord gauche de la page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> |
-|[[Position haute du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storytop]]<br>//marge supérieure du déroulé pincipal<br>au bord supérieur de la page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> |
-|[[Droite du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storyright]]<br>//marge de gauche du menu latéral<br>au bord gauche de la page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> |
-|[[Largeur du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storywidth]]<br>//the overall width of the story river// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> |
-|[[Largeur des Tiddlers|$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth]]<br>//dans le déroulé //<br> |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> |
-|[[Décroché Menu latéral|$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint]]<br>//la largeur minimum de la page à partir de laquelle, déroulé principal et menu latéral apparaissent côte à côte// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> |
diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids
index 9c63d5d437..679bb624de 100644
--- a/languages/fr-FR/Misc.multids
+++ b/languages/fr-FR/Misc.multids
@@ -24,6 +24,7 @@ InternalJavaScriptError/Hint: C'est assez embarrassant. Il est recommandé de ra
 InvalidFieldName: Caractères illicites dans le nom du champ « <$text text=<<fieldName>>/> ». Les champs ne peuvent contenir que des lettres minuscules non accentuées et les caractères souligné (`_`), tiret (`-`) et point (`.`)
 LazyLoadingWarning: <p>Chargement d'un texte externe ''<$text text={{!!_canonical_uri}}/>''</p><p>Si ce message ne disparaît pas, il se peut que vous utilisiez un navigateur qui n'accepte pas les textes externes dans cette configuration. Voir http://tiddlywiki.com/#ExternalText</p>
 MissingTiddler/Hint: Le tiddler « <$text text=<<currentTiddler>>/> » est manquant - cliquez sur {{$:/core/images/edit-button}} pour le créer
+No: No
 OfficialPluginLibrary: Bibliothèque officielle des plugins ~TiddlyWiki
 OfficialPluginLibrary/Hint: La bibliothèque officielle des plugins ~TiddlyWiki sur tiddlywiki.com. Plugins, thèmes et packs pour les différentes langues sont maintenus par l'équipe responsable du noyau.
 PluginReloadWarning: Merci d'enregistrer {{$:/core/ui/Buttons/save-wiki}} et de recharger {{$:/core/ui/Buttons/refresh}} pour que les changements apportés aux plugins prennent effet
@@ -35,3 +36,4 @@ TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
 Tiddler/DateFormat: DD MMM YYYY à hhhmm
 UnsavedChangesWarning: Vos dernières modifications n'ont pas été sauvegardées dans votre TiddlyWiki
+Yes: Yes
diff --git a/languages/fr-FR/ThemeTweaks.multids b/languages/fr-FR/ThemeTweaks.multids
new file mode 100644
index 0000000000..7261dc2828
--- /dev/null
+++ b/languages/fr-FR/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: Réglages Thème
+ThemeTweaks/Hint: Vous pouvez ajuster certains aspects du thème ''Vanilla''.
+Options: Options
+Options/SidebarLayout: Sidebar layout
+Options/SidebarLayout/Fixed-Fluid: Fixed story, fluid sidebar
+Options/SidebarLayout/Fluid-Fixed: Fluid story, fixed sidebar
+Options/StickyTitles: Titres stickés
+Options/StickyTitles/Hint: "Stick" les titres de tiddler en haut de la fenêtre du navigateur. Attention<<:>> Ne fonctionne pas du tout avec Chrome, et peut causer quelques problèmes de mise en page dans Firefox
+Options/CodeWrapping: Wrap long lines in code blocks
+Settings: Réglages
+Settings/FontFamily: Famille de polices
+Settings/CodeFontFamily: Code des familles de police
+Settings/BackgroundImage: Image de fond de page
+Settings/BackgroundImageAttachment: Fixation de l'image de fond de page
+Settings/BackgroundImageAttachment/Scroll: Défile avec les tiddlers
+Settings/BackgroundImageAttachment/Fixed: Fixée à la fenêtre
+Settings/BackgroundImageSize: Taille de l'image de fond de page
+Settings/BackgroundImageSize/Auto: Auto
+Settings/BackgroundImageSize/Cover: Élargie
+Settings/BackgroundImageSize/Contain: Contenue
+Metrics: Tailles
+Metrics/FontSize: Taille police
+Metrics/LineHeight: Hauteur ligne
+Metrics/BodyFontSize: Taille police dans un tiddler
+Metrics/BodyLineHeight: Hauteur de ligne dans un tiddler
+Metrics/StoryLeft: Position gauche du déroulé
+Metrics/StoryLeft/Hint: marge de gauche du déroulé principal<br>(zone des tiddlers) au bord gauche de la page
+Metrics/StoryTop: Position haute du déroulé
+Metrics/StoryTop/Hint: marge supérieure du déroulé pincipal<br>au bord supérieur de la page
+Metrics/StoryRight: Droite du déroulé
+Metrics/StoryRight/Hint: marge de gauche du menu latéral<br>au bord gauche de la page
+Metrics/StoryWidth: Largeur du déroulé
+Metrics/StoryWidth/Hint: the overall width of the story river
+Metrics/TiddlerWidth: Largeur des Tiddlers
+Metrics/TiddlerWidth/Hint: dans le déroulé
+Metrics/SidebarBreakpoint: Décroché Menu latéral
+Metrics/SidebarBreakpoint/Hint: la largeur minimum de la page à partir de laquelle, déroulé principal et menu latéral apparaissent côte à côte
+Metrics/SidebarWidth: Sidebar width
+Metrics/SidebarWidth/Hint: the width of the sidebar in fluid-fixed layout
diff --git a/languages/ko-KR/Misc.multids b/languages/ko-KR/Misc.multids
index 1daeb1b902..cbee885eb2 100644
--- a/languages/ko-KR/Misc.multids
+++ b/languages/ko-KR/Misc.multids
@@ -29,6 +29,7 @@ InternalJavaScriptError/Title: 내부 자바스크립트 오류
 InvalidFieldName: "<$text text=<<fieldName>>/>" 필드 이름에 잘못된 문자가 있습니다. 필드는 소문자, 숫자 및 밑줄 문자 (`_`), 하이픈 (`-`) 및 마침표 (`.`)만을 포함할 수 있습니다.
 LazyLoadingWarning: <p>''<$text text={{!!_canonical_uri}}/>''에서 바깥 텍스트를 불러오는 중입니다</p><p>이 메시지가 사라지지 않으면 이 구성에서 바깥 텍스트를 지원하지 않는 브라우저를 사용하고 있을 수 있습니다. http://tiddlywiki.com/#ExternalText 를 보세요</p>
 MissingTiddler/Hint: "<$text text=<<currentTiddler>>/>" 티들러가 없습니다 - 만드려면 {{$:/core/images/edit-button}}을 클릭하세요
+No: 아니오
 OfficialPluginLibrary: 공식 ~TiddlyWiki 플러그인 라이브러리
 OfficialPluginLibrary/Hint: tiddlywiki.com에서의 공식 ~TiddlyWiki 플러그인 라이브러리입니다. 플러그인, 테마 및 언어 팩은 코어 팀이 유지 관리하고 있습니다.
 PluginReloadWarning: 플러그인의 바뀜을 적용할 수 있도록 하려면 저장 {{$:/core/ui/Buttons/save-wiki}}하고 나서 다시 불러오세요 {{$:/core/ui/Buttons/refresh}}
@@ -41,3 +42,4 @@ TagManager/Info/Heading: 정보
 TagManager/Tag/Heading: 태그
 Tiddler/DateFormat: YYYY년 MMM DD일 am hh12:0mm
 UnsavedChangesWarning: TiddlyWiki에 저장하지 않은 바뀜이 있습니다
+Yes: 예
diff --git a/languages/ko-KR/ThemeTweaks.multids b/languages/ko-KR/ThemeTweaks.multids
new file mode 100644
index 0000000000..ed868618d1
--- /dev/null
+++ b/languages/ko-KR/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: 테마 개조
+ThemeTweaks/Hint: ''Vanilla'' 테마의 특정한 면들을 개조할 수 있습니다.
+Options: 옵션
+Options/SidebarLayout: 사이드바 레이아웃
+Options/SidebarLayout/Fixed-Fluid: 고정된 이야기, 흐르는 사이드바
+Options/SidebarLayout/Fluid-Fixed: 흐르는 이야기, 고정된 사이드바
+Options/StickyTitles: 제목 고정
+Options/StickyTitles/Hint: 티들러 제목을 브라우저 창의 위에 "stick"으로 일으킵니다. 주의: Chrome으로는 전혀 작동되지 않으며, Firefox에서 일부 레이아웃 문제를 일으킵니다
+Options/CodeWrapping: 코드 블럭에서 긴 줄을 줄바꿈
+Settings: 설정
+Settings/FontFamily: 글꼴 집합
+Settings/CodeFontFamily: 코드 글꼴 집합
+Settings/BackgroundImage: 페이지 배경 그림
+Settings/BackgroundImageAttachment: 페이지 배경 그림 첨부
+Settings/BackgroundImageAttachment/Scroll: 티들러로 스크롤
+Settings/BackgroundImageAttachment/Fixed: 창에 고정
+Settings/BackgroundImageSize: 페이지 배경 그림 크기
+Settings/BackgroundImageSize/Auto: 자동
+Settings/BackgroundImageSize/Cover: 덮개
+Settings/BackgroundImageSize/Contain: 포함
+Metrics: 크기
+Metrics/FontSize: 글자 크기
+Metrics/LineHeight: 줄 높이
+Metrics/BodyFontSize: 티들러 본문의 글자 크기
+Metrics/BodyLineHeight: 티들러 본문의 줄 높이
+Metrics/StoryLeft: 이야기 왼쪽 위치
+Metrics/StoryLeft/Hint: 이야기 강(티들러 영역)의 왼쪽 여백은<br>페이지의 왼쪽에서 얼마나 멉니까
+Metrics/StoryTop: 이야기 위 위치
+Metrics/StoryTop/Hint: 이야기 강의 위 여백은 페이지의 위에서<br>얼마나 멉니까
+Metrics/StoryRight: 이야기 오른쪽
+Metrics/StoryRight/Hint: 사이드바의 인쪽 여백은 페이지의<br>왼쪽에서 얼마나 멉니까
+Metrics/StoryWidth: 이야기 너비
+Metrics/StoryWidth/Hint: 이야기 강의 전반적인 너비
+Metrics/TiddlerWidth: 티들러 너비
+Metrics/TiddlerWidth/Hint: 이야기 강에서
+Metrics/SidebarBreakpoint: 사이드바 중단점
+Metrics/SidebarBreakpoint/Hint: 이야기 강과 사이드바가 나란이 나타나는<br>최소 페이지 너비
+Metrics/SidebarWidth: 사이드바 너비
+Metrics/SidebarWidth/Hint: 흐르는-고정된 레이아웃에서 사이드바의 너비
diff --git a/plugins/tiddlywiki/translators/output-file-templates/ThemeTweaks.multids.tid b/plugins/tiddlywiki/translators/output-file-templates/ThemeTweaks.multids.tid
new file mode 100644
index 0000000000..a3f90606ca
--- /dev/null
+++ b/plugins/tiddlywiki/translators/output-file-templates/ThemeTweaks.multids.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/translators/templates/ThemeTweaks.multids
+
+{{$:/language/ThemeTweaks/||$:/plugins/tiddlywiki/translators/templates/multids}}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid b/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid
index a431531939..d617b5906f 100644
--- a/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid
+++ b/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid
@@ -15,6 +15,7 @@ tags: $:/tags/TranslationGroup
 -[all[tiddlers+shadows]prefix[$:/language/RelativeDate/]]
 -[all[tiddlers+shadows]prefix[$:/language/Search/]]
 -[all[tiddlers+shadows]prefix[$:/language/SideBar/]]
+-[all[tiddlers+shadows]prefix[$:/language/ThemeTweaks/]]
 -[all[tiddlers+shadows]prefix[$:/language/TiddlerInfo/]]
 [all[tiddlers+shadows]prefix[$:/config/NewJournal/]]
 [[$:/SiteTitle]]
diff --git a/plugins/tiddlywiki/translators/ui/group/ThemeTweaks.tid b/plugins/tiddlywiki/translators/ui/group/ThemeTweaks.tid
new file mode 100644
index 0000000000..0be2e3df09
--- /dev/null
+++ b/plugins/tiddlywiki/translators/ui/group/ThemeTweaks.tid
@@ -0,0 +1,16 @@
+title: $:/plugins/tiddlywiki/translators/ui/group/ThemeTweaks
+caption: Theme Tweaks
+tags: $:/tags/TranslationGroup
+
+\define translatableTiddlerTitles()
+[all[tiddlers+shadows]prefix[$:/language/ThemeTweaks/]sort[title]]
+\end
+\define shortenTitle()
+[all[current]removeprefix[$:/language/ThemeTweaks/]]
+\end
+
+! Theme Tweaks
+
+Strings used in the theme tweaks for Vanilla.
+
+<<translatableStringEditor>>
diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
index e1e42d0ed4..4862708513 100644
--- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid
+++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
@@ -1,6 +1,8 @@
 title: $:/themes/tiddlywiki/vanilla/themetweaks
 tags: $:/tags/ControlPanel/Appearance
-caption: Theme Tweaks
+caption: {{$:/language/ThemeTweaks/ThemeTweaks}}
+
+\define lingo-base() $:/language/ThemeTweaks/
 
 \define replacement-text()
 [img[$(imageTitle)$]]
@@ -26,45 +28,45 @@ caption: Theme Tweaks
 
 \define backgroundimageattachment-dropdown()
 <$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment" default="scroll">
-<option value="scroll">Scroll with tiddlers</option>
-<option value="fixed">Fixed to window</option>
+<option value="scroll"><<lingo Settings/BackgroundImageAttachment/Scroll>></option>
+<option value="fixed"><<lingo Settings/BackgroundImageAttachment/Fixed>></option>
 </$select>
 \end
 
 \define backgroundimagesize-dropdown()
 <$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize" default="scroll">
-<option value="auto">Auto</option>
-<option value="cover">Cover</option>
-<option value="contain">Contain</option>
+<option value="auto"><<lingo Settings/BackgroundImageSize/Auto>></option>
+<option value="cover"><<lingo Settings/BackgroundImageSize/Cover>></option>
+<option value="contain"><<lingo Settings/BackgroundImageSize/Contain>></option>
 </$select>
 \end
 
-You can tweak certain aspects of the ''Vanilla'' theme.
+<<lingo ThemeTweaks/Hint>>
 
-! Options
+! <<lingo Options>>
 
-|[[Sidebar layout|$:/themes/tiddlywiki/vanilla/options/sidebarlayout]] |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout"><option value="fixed-fluid">Fixed story, fluid sidebar</option><option value="fluid-fixed">Fluid story, fixed sidebar</option></$select> |
-|[[Sticky titles|$:/themes/tiddlywiki/vanilla/options/stickytitles]]<br>//Causes tiddler titles to "stick" to the top of the browser window. Caution: Does not work at all with Chrome, and causes some layout issues in Firefox// |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/stickytitles"><option value="no">No</option><option value="yes">Yes</option></$select> |
-|[[Wrap long lines in code blocks|$:/themes/tiddlywiki/vanilla/options/codewrapping]] |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/codewrapping"><option value="pre">No</option><option value="pre-wrap">Yes</option></$select> |
+|<$link to="$:/themes/tiddlywiki/vanilla/options/sidebarlayout"><<lingo Options/SidebarLayout>></$link> |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout"><option value="fixed-fluid"><<lingo Options/SidebarLayout/Fixed-Fluid>></option><option value="fluid-fixed"><<lingo Options/SidebarLayout/Fluid-Fixed>></option></$select> |
+|<$link to="$:/themes/tiddlywiki/vanilla/options/stickytitles"><<lingo Options/StickyTitles>></$link><br>//<<lingo Options/StickyTitles/Hint>>// |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/stickytitles"><option value="no">{{$:/language/No}}</option><option value="yes">{{$:/language/Yes}}</option></$select> |
+|<$link to="$:/themes/tiddlywiki/vanilla/options/codewrapping"><<lingo Options/CodeWrapping>></$link> |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/codewrapping"><option value="pre">{{$:/language/No}}</option><option value="pre-wrap">{{$:/language/Yes}}</option></$select> |
 
-! Settings
+! <<lingo Settings>>
 
-|[[Font family|$:/themes/tiddlywiki/vanilla/settings/fontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | |
-|[[Code font family|$:/themes/tiddlywiki/vanilla/settings/codefontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | |
-|[[Page background image|$:/themes/tiddlywiki/vanilla/settings/backgroundimage]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<<backgroundimage-dropdown>> |
-|[[Page background image attachment |$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment]] |<<backgroundimageattachment-dropdown>> | |
-|[[Page background image size |$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize]] |<<backgroundimagesize-dropdown>> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/fontfamily"><<lingo Settings/FontFamily>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/codefontfamily"><<lingo Settings/CodeFontFamily>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimage"><<lingo Settings/BackgroundImage>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<<backgroundimage-dropdown>> |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment"><<lingo Settings/BackgroundImageAttachment>></$link> |<<backgroundimageattachment-dropdown>> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize"><<lingo Settings/BackgroundImageSize>></$link> |<<backgroundimagesize-dropdown>> | |
 
-! Sizes
+! <<lingo Metrics>>
 
-|[[Font size|$:/themes/tiddlywiki/vanilla/metrics/fontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> |
-|[[Line height|$:/themes/tiddlywiki/vanilla/metrics/lineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> |
-|[[Font size for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> |
-|[[Line height for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodylineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> |
-|[[Story left position|$:/themes/tiddlywiki/vanilla/metrics/storyleft]]<br>//how far the left margin of the story river<br>(tiddler area) is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> |
-|[[Story top position|$:/themes/tiddlywiki/vanilla/metrics/storytop]]<br>//how far the top margin of the story river<br>is from the top of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> |
-|[[Story right|$:/themes/tiddlywiki/vanilla/metrics/storyright]]<br>//how far the left margin of the sidebar <br>is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> |
-|[[Story width|$:/themes/tiddlywiki/vanilla/metrics/storywidth]]<br>//the overall width of the story river// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> |
-|[[Tiddler width|$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth]]<br>//within the story river//<br> |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> |
-|[[Sidebar breakpoint|$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint]]<br>//the minimum page width at which the story<br>river and sidebar will appear side by side// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> |
-|[[Sidebar width|$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth]]<br>//the width of the sidebar in fluid-fixed layout// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/fontsize"><<lingo Metrics/FontSize>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/lineheight"><<lingo Metrics/LineHeight>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize"><<lingo Metrics/BodyFontSize>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight"><<lingo Metrics/BodyLineHeight>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storyleft"><<lingo Metrics/StoryLeft>></$link><br>//<<lingo Metrics/StoryLeft/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storytop"><<lingo Metrics/StoryTop>></$link><br>//<<lingo Metrics/StoryTop/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storyright"><<lingo Metrics/StoryRight>></$link><br>//<<lingo Metrics/StoryRight/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storywidth"><<lingo Metrics/StoryWidth>></$link><br>//<<lingo Metrics/StoryWidth/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth"><<lingo Metrics/TiddlerWidth>></$link><br>//<<lingo Metrics/TiddlerWidth/Hint>>//<br> |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint"><<lingo Metrics/SidebarBreakpoint>></$link><br>//<<lingo Metrics/SidebarBreakpoint/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth"><<lingo Metrics/SidebarWidth>></$link><br>//<<lingo Metrics/SidebarWidth/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth" default="" tag="input"/> |