diff --git a/.config/JOSM/preferences.xml b/.config/JOSM/preferences.xml
index 51fc9aa..234c32e 100644
--- a/.config/JOSM/preferences.xml
+++ b/.config/JOSM/preferences.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<preferences xmlns='http://josm.openstreetmap.de/preferences-1.0' version='18360'>
-  <tag key='cache.capabilities1637351842' value='1642183859'/>
-  <tag key='cache.motd.html' value='1642183859'/>
-  <tag key='cache.motd.html.java' value='11.0.13'/>
+<preferences xmlns='http://josm.openstreetmap.de/preferences-1.0' version='18463'>
+  <tag key='cache.capabilities1637351842' value='1660595298'/>
+  <tag key='cache.motd.html' value='1660595299'/>
+  <tag key='cache.motd.html.java' value='11.0.16'/>
   <tag key='cache.motd.html.lang' value='En:'/>
-  <tag key='cache.motd.html.version' value='18303'/>
+  <tag key='cache.motd.html.version' value='18463'/>
   <tag key='changeset.lastHeight' value='0'/>
   <tag key='changesetdialog.lastHeight' value='0'/>
   <tag key='commandstack.lastHeight' value='0'/>
@@ -14,6 +14,8 @@
   <tag key='download.osm.notes' value='true'/>
   <tag key='expert' value='true'/>
   <list key='file-open.history'>
+    <entry value='/home/janek/data/4-media/osm/MV-Ruegen.osm'/>
+    <entry value='/home/janek/data/4-media/osm/BY-bayreuth.osm'/>
     <entry value='/home/janek/data/2-standards/osm/BY-bayreuth.osm'/>
     <entry value='/home/janek/data/2-standards/osm/BY-fraenkische.osm'/>
     <entry value='/home/janek/data/2-standards/osm/tracks/rec/2021-10-07_11-21_Thu BT-ER.gpx'/>
@@ -96,7 +98,7 @@
       <tag key='name' value='Mapbox Satellite'/>
       <tag key='id' value='Mapbox'/>
       <tag key='type' value='tms'/>
-      <tag key='url' value='https://{switch:a,b,c,d}.tiles.mapbox.com/v4/mapbox.satellite/{zoom}/{x}/{y}.jpg?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJja2w5YWt5bnYwNjZmMnFwZjhtbHk1MnA1In0.eq2aumBK6JuRoIuBMm6Gew'/>
+      <tag key='url' value='https://{switch:a,b,c,d}.tiles.mapbox.com/v4/mapbox.satellite/{zoom}/{x}/{y}.jpg?access_token={apikey}'/>
       <tag key='attribution-text' value='Terms &amp; Feedback'/>
       <tag key='attribution-url' value='https://www.mapbox.com/about/maps/'/>
       <tag key='permission-reference-url' value='https://wiki.openstreetmap.org/wiki/Vertical_Aerial_Photographs#DigitalGlobe_.2F_MapBox'/>
@@ -111,10 +113,10 @@
       <tag key='valid-georeference' value='true'/>
       <tag key='transparent' value='true'/>
       <tag key='minimumTileExpire' value='3600'/>
-      <tag key='name' value='Maxar Premium Imagery (Beta)'/>
+      <tag key='name' value='Maxar Premium Imagery'/>
       <tag key='id' value='Maxar-Premium'/>
       <tag key='type' value='tms'/>
-      <tag key='url' value='https://services.digitalglobe.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService@EPSG:3857@jpg/{zoom}/{x}/{-y}.jpg?connectId=_apiKey_&amp;foo=premium'/>
+      <tag key='url' value='https://services.digitalglobe.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService@EPSG:3857@jpg/{zoom}/{x}/{-y}.jpg?connectId={apikey}'/>
       <tag key='attribution-text' value='Terms &amp; Feedback'/>
       <tag key='attribution-url' value='https://wiki.openstreetmap.org/wiki/DigitalGlobe'/>
       <tag key='cookies' value=''/>
@@ -123,40 +125,6 @@
       <tag key='customHttpHeaders' value='{}'/>
       <tag key='category' value='photo'/>
     </map>
-    <map>
-      <tag key='max-zoom' value='22'/>
-      <tag key='noTileChecksums' value='{&quot;MD5&quot;:[&quot;08d6916814b216570e5241732c41d5e5&quot;]}'/>
-      <tag key='transparent' value='true'/>
-      <tag key='minimumTileExpire' value='3600'/>
-      <tag key='name' value='Maxar Standard Imagery (Beta)'/>
-      <tag key='id' value='Maxar-Standard'/>
-      <tag key='type' value='tms'/>
-      <tag key='url' value='https://services.digitalglobe.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService@EPSG:3857@jpg/{zoom}/{x}/{-y}.jpg?connectId=_apiKey_&amp;foo=standard'/>
-      <tag key='attribution-text' value='Terms &amp; Feedback'/>
-      <tag key='attribution-url' value='https://wiki.openstreetmap.org/wiki/DigitalGlobe'/>
-      <tag key='cookies' value=''/>
-      <tag key='icon' value='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEX9sBz3qx3GjiO6hyWZcyo+PDY6OjcXiwAvAAAA50lEQVR42s2TwQ3CMAxFv5kgBwZAFRuUBYrUCUiyQbv/CMT0W64bOHBrTlGeXvxtJVh/LJwXLKVUOyi6N/AchjtJHtrewHIDZN7AC8Cl7gCu9Sug0oNEpQGJhlDpr6ISwDoJEqtEkPV4U/I4jg/vfAJApbRlQBVhsDArKhbMABUGO4LFgkVAhVUcxCo9SKzSXyVUDHiLQiXG1VhUYoO6kivwsAIP5kMUPUxUCHwgPmQCPUgic06fC6/+rjgOZji8EpkZIgDW1CEjgqQCG41XqaDK0VCByg7YN7A94/Kz2Gr7eorv/Bd4A5pJU8mYQ1uTAAAAAElFTkSuQmCC'/>
-      <tag key='description' value='Maxar Standard is a curated set of imagery covering 86% of the earth’s landmass, with 30-60cm resolution where available, backfilled by Landsat. Average age is 2.31 years, with some areas updated 2x per year.'/>
-      <tag key='customHttpHeaders' value='{}'/>
-      <tag key='category' value='photo'/>
-    </map>
-    <map>
-      <tag key='max-zoom' value='18'/>
-      <tag key='valid-georeference' value='true'/>
-      <tag key='modTileFeatures' value='true'/>
-      <tag key='transparent' value='true'/>
-      <tag key='minimumTileExpire' value='3600'/>
-      <tag key='name' value='OpenStreetMap (Standard Black &amp; White)'/>
-      <tag key='id' value='osm-mapnik-black_and_white'/>
-      <tag key='type' value='tms'/>
-      <tag key='url' value='https://tiles.wmflabs.org/bw-mapnik/{zoom}/{x}/{y}.png'/>
-      <tag key='attribution-text' value='© OpenStreetMap contributors, CC-BY-SA'/>
-      <tag key='attribution-url' value='https://www.openstreetmap.org/'/>
-      <tag key='cookies' value=''/>
-      <tag key='icon' value='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAQAAABKfvVzAAADJElEQVR4Xo2SS2hcZRSAv/+//70zkzszeU+okVqaaGLjI0akTRGl3ehGdCEiutO6c6PgwoWCSMUXdRFaCurGTRGVUtqNraKmTDA1KtIQzat3TKczSW0mznTuzNznL1zoxo1+q3PgwPnOA8cufVU647y+PnYps6Wq9lbfxvTiqdnzs+/PH7re/bY6nV7tqT5UmanOkUDJcN5w9BW9phcuXDtW/bqy7ejfdVH/qhd0cfXsO9998VN5Xq/qTffaAwACnGl9VvcHePSiaOMidSzWdb+wsRG0CLmhc8E9r/YcbyNgqZA6w4E6ETksoI3gIofIYCCT3KPD39z49OkjIGHf9aikyWFyE4EgzwoHyJFBoQmxsAmQyH1TAyABrMDCJIvCI2Ibk24kYGCTIwXksbD3P3sYDCjtMV8xhsACJHXK5BjCRBMQ0CbAxUdpQ27Xrp5XYI7oEYgQ+IBHjKBDkOiZSJqESGLSZMYOWrJEPK67NDEtIhpoTAQxMRDSpE4H0AgUSkhkaPmTAaGGJiYWWSxCOmgU0CaEpI9Bmmj1+0AthnvXMwRCEBPSh4ekSh8dBNBFAChSZESD8i9LsXxKr/wRNWWy/XTi2sO3rBGjk2lMUqSTLa3+eHJuzJIwX/bLApOYiE4y/F18xNUkInG3iFjxi5/vVJSU6FMld9NHYLCDxqPKEoqPuUQjubLLNgtsmIcnXB1HCso1qyYJiMmzwSdY9PIww2zRhUEOjYsgJ8zhXtnyFXzT218IscizzHHcROsxdhPzFzdxsBDkGYjW13bcQqhgdCS+s0MWhxPUCTCZIotAspeYCgoPqZve5SKtZSQ0RrwhmyvMUMFF8TjTFPBJ4REyiEaAiN2jP6BBzqjOhMEi7+HQIstzyada9BFqQ9u4eFpphe+wCaAMM9q1HB41POGzixe4H7d18cJAauJgd75JiIkpDOq1y1+SAAa3vXvkrcZ4PFZ7bf3k7Itvsp9hbufBl14+fe7nP8/NfXDi0ee5l25uUUTc8eFnT/42esx+gmEMbiGxGUyO/G+mcnseue+ZycmpDP+PAneb4+lRA2D3f9T+A2BEVdbaZSWbAAAAAElFTkSuQmCC'/>
-      <tag key='customHttpHeaders' value='{}'/>
-      <tag key='category' value='osmbasedmap'/>
-    </map>
     <map>
       <tag key='max-zoom' value='19'/>
       <tag key='valid-georeference' value='true'/>
@@ -182,15 +150,13 @@
     <entry value='EsriWorldImageryClarity'/>
     <entry value='Mapbox'/>
     <entry value='Maxar-Premium'/>
-    <entry value='Maxar-Standard'/>
-    <entry value='osm-mapnik-black_and_white'/>
     <entry value='standard'/>
   </list>
   <maps key='imagery.offsetbookmarks'>
   </maps>
   <tag key='iodb.modify.toolbar' value='false'/>
-  <tag key='josm.version' value='18360'/>
-  <tag key='lastDirectory' value='/home/janek/data/2-standards/osm'/>
+  <tag key='josm.version' value='18463'/>
+  <tag key='lastDirectory' value='/home/janek/data/4-media/osm'/>
   <tag key='layerlist.lastHeight' value='138'/>
   <tag key='mappaint.renderer-class-name' value='org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer'/>
   <list key='mappaint.style.known-defaults'>
@@ -218,7 +184,7 @@
     <entry value='/home/janek/.local/cache/JOSM/images/mirror_https___geoportal.bayern.de_bayernatlas_favicon_favicon-32x32.png'/>
   </list>
   <list key='mirror.https://josm.openstreetmap.de/maps'>
-    <entry value='1642183861496'/>
+    <entry value='1660595302989'/>
     <entry value='/home/janek/.local/cache/JOSM/mirror_https___josm.openstreetmap.de_maps'/>
   </list>
   <list key='mirror.https://josm.openstreetmap.de/presets'>
@@ -230,32 +196,32 @@
     <entry value='/home/janek/.local/cache/JOSM/mirror_https___josm.openstreetmap.de_proj_BETA2007.gsb'/>
   </list>
   <list key='mirror.https://josm.openstreetmap.de/remote/geofabrik-index-v1-nogeom.json'>
-    <entry value='1642183860671'/>
+    <entry value='1660595299798'/>
     <entry value='/home/janek/.local/cache/JOSM/mirror_https___josm.openstreetmap.de_remote_geofabrik-index-v1-nogeom.json'/>
   </list>
   <list key='mirror.https://josm.openstreetmap.de/tested'>
     <entry value='1633952185297'/>
     <entry value='/home/janek/.local/cache/JOSM/mirror_https___josm.openstreetmap.de_tested'/>
   </list>
-  <tag key='notes/note_open.lastHeight' value='190'/>
+  <tag key='notes/note_open.lastHeight' value='187'/>
   <tag key='notes/note_open.visible' value='true'/>
   <tag key='oauth.access-token.key' value='YGtDqRUspIjinRFJwYJhzSDbOWSHeCfJRYsstgtu'/>
   <tag key='oauth.access-token.secret' value='DqACmTu5PcW1k94TrGZIF4XaPqbUy2SMxPTyjcEa'/>
+  <tag key='org.openstreetmap.josm.actions.OpenLocationAction.geometry' value='x=778,y=425,width=363,height=225'/>
   <tag key='org.openstreetmap.josm.gui.NoteInputDialog.geometry' value='x=760,y=387,width=400,height=300'/>
-  <tag key='org.openstreetmap.josm.gui.dialogs.properties.TagEditHelper$AddTagsDialog.geometry' value='x=746,y=441,width=918,height=438'/>
-  <tag key='org.openstreetmap.josm.gui.dialogs.properties.TagEditHelper$EditTagDialog.geometry' value='x=814,y=428,width=801,height=200'/>
+  <tag key='org.openstreetmap.josm.gui.dialogs.properties.TagEditHelper$AddTagsDialog.geometry' value='x=746,y=441,width=918,height=470'/>
+  <tag key='org.openstreetmap.josm.gui.dialogs.properties.TagEditHelper$EditTagDialog.geometry' value='x=814,y=428,width=801,height=212'/>
   <tag key='org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.geometry' value='x=610,y=212,width=700,height=650'/>
   <tag key='org.openstreetmap.josm.gui.download.DownloadDialog.geometry' value='x=460,y=233,width=1000,height=600'/>
   <tag key='org.openstreetmap.josm.gui.help.HelpBrowser.geometry' value='x=0,y=-13,width=960,height=1093'/>
   <tag key='org.openstreetmap.josm.gui.io.UploadDialog.geometry' value='x=386,y=330,width=800,height=600'/>
   <tag key='org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard.geometry' value='x=590,y=314,width=739,height=438'/>
-  <tag key='org.openstreetmap.josm.gui.preferences.PreferenceDialog.geometry' value='x=1398,y=818,width=1001,height=811'/>
-  <tag key='osm-download.bounds' value='49.9203637;11.6241516;49.9421404;11.6380377'/>
-  <tag key='osm-server.upload-strategy' value='singlerequest'/>
+  <tag key='org.openstreetmap.josm.gui.preferences.PreferenceDialog.geometry' value='x=357,y=99,width=1001,height=811'/>
+  <tag key='osm-download.bounds' value='54.5625077;13.1588745;54.6770072;13.3950806'/>
   <tag key='plugin.continuos_download.max_area' value='0.004'/>
   <tag key='plugin.continuos_download.max_areas' value='2'/>
-  <tag key='pluginmanager.lastupdate' value='1644644884706'/>
-  <tag key='pluginmanager.version' value='18360'/>
+  <tag key='pluginmanager.lastupdate' value='1658813943390'/>
+  <tag key='pluginmanager.version' value='18463'/>
   <tag key='pluginmanager.version-based-update.policy' value='always'/>
   <list key='plugins'>
     <entry value='auto_tools'/>
@@ -274,12 +240,6 @@
   <tag key='preferences.reset.draw.rawgps.lines' value='true'/>
   <tag key='progressdialog.size' value='229'/>
   <list key='properties.recent-tags'>
-    <entry value='vending_machine'/>
-    <entry value='yes'/>
-    <entry value='water'/>
-    <entry value='lake'/>
-    <entry value='natural'/>
-    <entry value='water'/>
     <entry value='man_made'/>
     <entry value='watermill'/>
     <entry value='disused'/>
@@ -334,6 +294,12 @@
     <entry value='no'/>
     <entry value='noexit'/>
     <entry value='yes'/>
+    <entry value='name'/>
+    <entry value='Heiderundweg'/>
+    <entry value='highway'/>
+    <entry value='footway'/>
+    <entry value='access'/>
+    <entry value='yes'/>
   </list>
   <tag key='propertiesdialog.lastHeight' value='188'/>
   <tag key='relationlist.lastHeight' value='0'/>
@@ -342,6 +308,87 @@
     <entry value='R modified'/>
   </list>
   <tag key='selectionlist.lastHeight' value='188'/>
+  <list key='shortcut.entry.core:movedown'>
+    <entry value='Move objects down'/>
+    <entry value='40'/>
+    <entry value='5005'/>
+    <entry value='74'/>
+    <entry value='64'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.core:moveleft'>
+    <entry value='Move objects left'/>
+    <entry value='37'/>
+    <entry value='5005'/>
+    <entry value='72'/>
+    <entry value='64'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.core:moveright'>
+    <entry value='Move objects right'/>
+    <entry value='39'/>
+    <entry value='5005'/>
+    <entry value='76'/>
+    <entry value='64'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.core:moveup'>
+    <entry value='Move objects up'/>
+    <entry value='38'/>
+    <entry value='5005'/>
+    <entry value='75'/>
+    <entry value='64'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.system:movefocusdown'>
+    <entry value='Map: Move down'/>
+    <entry value='40'/>
+    <entry value='5006'/>
+    <entry value='74'/>
+    <entry value='0'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.system:movefocusleft'>
+    <entry value='Map: Move left'/>
+    <entry value='37'/>
+    <entry value='5006'/>
+    <entry value='72'/>
+    <entry value='0'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.system:movefocusright'>
+    <entry value='Map: Move right'/>
+    <entry value='39'/>
+    <entry value='5006'/>
+    <entry value='76'/>
+    <entry value='0'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.system:movefocusup'>
+    <entry value='Map: Move up'/>
+    <entry value='38'/>
+    <entry value='5006'/>
+    <entry value='75'/>
+    <entry value='0'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
+  <list key='shortcut.entry.system:preferences'>
+    <entry value='Edit: Preferences'/>
+    <entry value='123'/>
+    <entry value='5003'/>
+    <entry value='80'/>
+    <entry value='128'/>
+    <entry value='false'/>
+    <entry value='true'/>
+  </list>
   <tag key='simplify-way.max-error' value='2.0'/>
   <tag key='sourcetag.value' value='local_knowledge'/>
   <tag key='toggleDialogs.width' value='712'/>
@@ -381,14 +428,11 @@
   </list>
   <tag key='turnlanes.png.lastHeight' value='0'/>
   <list key='upload.comment.history'>
-    <entry value='Tracks around Bayreuth'/>
-    <entry value=''/>
-    <entry value='Track around SC Hummeltal'/>
+    <entry value='Edit Kreptitzer paths'/>
   </list>
-  <tag key='upload.comment.last-used' value='1642199090'/>
+  <tag key='upload.comment.last-used' value='1660600244'/>
   <list key='upload.source.history'>
     <entry value='survey'/>
-    <entry value=''/>
   </list>
   <tag key='upload.source.obtainautomatically' value='true'/>
   <tag key='userlist.lastHeight' value='0'/>
diff --git a/.config/doom/config.el b/.config/doom/config.el
index 2ee9b7d..11ec020 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -244,6 +244,10 @@ Version 2019-11-04 2021-02-16"
               time-stamp-end "$")
   :hook before-save)
 
+(use-package! image
+  :custom
+  ;; Enable converting external formats (ie. webp) to internal ones.
+  (image-use-external-converter t))
 ;(setq image-file-name-regexps "/preview/")
 ;(add-to-list 'image-file-name-regexps "/preview/")
 
diff --git a/.local/bin/scripts/rpl b/.local/bin/scripts/rpl
index 37a0a72..e25fe70 100755
--- a/.local/bin/scripts/rpl
+++ b/.local/bin/scripts/rpl
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # Use grep and sed to replace $1 with $2 recursively and print what is done
 grep --null --recursive --files-with-matches \
-  --binary-files=without-match $(echo $DIRS_IGNORE | sed 's/-x/--exclude-dir/g') "${@:3}" -- "$1" |
+  --binary-files=without-match $(echo $DIRS_IGNORE | sed 's/-x/--exclude-dir/g') "$1" -- "${@:3}" |
 	xargs -0 sed -i "\%${1}%{
 		s||${2}|g
 		w /dev/stdout