diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index e9eb25ab0f..3623730756 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -213,7 +213,7 @@ This is a priviliged meta_layer which exports _every_ point in OSM. This only wo
 
 
 
-This layer shows notes on OpenStreetMap.
+This layer shows notes on OpenStreetMap. Having this layer in your theme will trigger the 'add new note' functionality in the 'addNewPoint'-popup (or if your theme has no presets, it'll enable adding notes)
 
 [Go to the source code](../assets/layers/note/note.json)
 
diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md
index 8039b7f12f..db63a1e87d 100644
--- a/Docs/SpecialRenderings.md
+++ b/Docs/SpecialRenderings.md
@@ -489,7 +489,7 @@ id_of_object_to_apply_this_one | _undefined_ | If specified, applies the the tag
 
 ### close_note 
 
- Button to close a note - eventually with a prefixed text 
+ Button to close a note. A predifined text can be defined to close the note with. If the note is already closed, will show a small text. 
 
 name | default | description
 ------ | --------- | -------------
diff --git a/Logic/DetermineLayout.ts b/Logic/DetermineLayout.ts
index 5f9c1f0e6a..8c3907f72f 100644
--- a/Logic/DetermineLayout.ts
+++ b/Logic/DetermineLayout.ts
@@ -10,7 +10,7 @@ import {UIEventSource} from "./UIEventSource";
 import {LocalStorageSource} from "./Web/LocalStorageSource";
 import LZString from "lz-string";
 import * as personal from "../assets/themes/personal/personal.json";
-import {FixLegacyTheme, PrepareTheme} from "../Models/ThemeConfig/LegacyJsonConvert";
+import {FixLegacyTheme, PrepareTheme} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
 import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
 import SharedTagRenderings from "../Customizations/SharedTagRenderings";
 import * as known_layers from "../assets/generated/known_layers.json"
diff --git a/Logic/Osm/Overpass.ts b/Logic/Osm/Overpass.ts
index f13f7a29b4..ccb893f021 100644
--- a/Logic/Osm/Overpass.ts
+++ b/Logic/Osm/Overpass.ts
@@ -1,9 +1,9 @@
-import * as OsmToGeoJson from "osmtogeojson";
 import {TagsFilter} from "../Tags/TagsFilter";
 import RelationsTracker from "./RelationsTracker";
 import {Utils} from "../../Utils";
 import {UIEventSource} from "../UIEventSource";
 import {BBox} from "../BBox";
+import osmtogeojson from "osmtogeojson";
 
 /**
  * Interfaces overpass to get all the latest data
@@ -52,8 +52,7 @@ export class Overpass {
         }
 
         self._relationTracker.RegisterRelations(json)
-        // @ts-ignore
-        const geojson = OsmToGeoJson.default(json);
+        const geojson = osmtogeojson(json);
         const osmTime = new Date(json.osm3s.timestamp_osm_base);
         return [geojson, osmTime];
     }
diff --git a/Models/ThemeConfig/LegacyJsonConvert.ts b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
similarity index 98%
rename from Models/ThemeConfig/LegacyJsonConvert.ts
rename to Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
index 861e77dcc1..e118251504 100644
--- a/Models/ThemeConfig/LegacyJsonConvert.ts
+++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
@@ -1,13 +1,13 @@
-import LineRenderingConfigJson from "./Json/LineRenderingConfigJson";
-import LayerConfig from "./LayerConfig";
-import Constants from "../Constants";
-import {LayoutConfigJson} from "./Json/LayoutConfigJson";
-import {LayerConfigJson} from "./Json/LayerConfigJson";
-import DependencyCalculator from "./DependencyCalculator";
-import {TagRenderingConfigJson} from "./Json/TagRenderingConfigJson";
-import {Utils} from "../../Utils";
-import LayoutConfig from "./LayoutConfig";
-import {Translation} from "../../UI/i18n/Translation";
+import {LayoutConfigJson} from "../Json/LayoutConfigJson";
+import DependencyCalculator from "../DependencyCalculator";
+import LayerConfig from "../LayerConfig";
+import {Translation} from "../../../UI/i18n/Translation";
+import LayoutConfig from "../LayoutConfig";
+import {Utils} from "../../../Utils";
+import {TagRenderingConfigJson} from "../Json/TagRenderingConfigJson";
+import LineRenderingConfigJson from "../Json/LineRenderingConfigJson";
+import {LayerConfigJson} from "../Json/LayerConfigJson";
+import Constants from "../../Constants";
 
 export interface DesugaringContext {
     tagRenderings: Map<string, TagRenderingConfigJson>
diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts
index 35f713ea37..4b61c41b2f 100644
--- a/scripts/generateLayerOverview.ts
+++ b/scripts/generateLayerOverview.ts
@@ -9,7 +9,7 @@ import {
     PrepareLayer, PrepareTheme,
     ValidateLayer,
     ValidateThemeAndLayers
-} from "../Models/ThemeConfig/LegacyJsonConvert";
+} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
 import {Translation} from "../UI/i18n/Translation";
 import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson";
 import * as questions from "../assets/tagRenderings/questions.json";
diff --git a/static/staples-annotated.xcf b/static/staples-annotated.xcf
deleted file mode 100644
index b5dd783fc5..0000000000
Binary files a/static/staples-annotated.xcf and /dev/null differ
diff --git a/test/LegacyThemeLoader.spec.ts b/test/LegacyThemeLoader.spec.ts
index 7d55225acb..c57ceb7d40 100644
--- a/test/LegacyThemeLoader.spec.ts
+++ b/test/LegacyThemeLoader.spec.ts
@@ -1,5 +1,5 @@
 import T from "./TestHelper";
-import {FixLegacyTheme} from "../Models/ThemeConfig/LegacyJsonConvert";
+import {FixLegacyTheme} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
 import LayoutConfig from "../Models/ThemeConfig/LayoutConfig";
 import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
 import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson";
diff --git a/test/Theme.spec.ts b/test/Theme.spec.ts
index 6372d2adeb..76a17c6c61 100644
--- a/test/Theme.spec.ts
+++ b/test/Theme.spec.ts
@@ -3,10 +3,9 @@ import * as assert from "assert";
 import {LayoutConfigJson} from "../Models/ThemeConfig/Json/LayoutConfigJson";
 import LayoutConfig from "../Models/ThemeConfig/LayoutConfig";
 import * as bookcaseLayer from "../assets/generated/layers/public_bookcase.json"
-import {PrepareLayer, PrepareTheme} from "../Models/ThemeConfig/LegacyJsonConvert";
+import {PrepareTheme} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
 import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson";
 import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
-import LayerConfig from "../Models/ThemeConfig/LayerConfig";
 import Constants from "../Models/Constants";
 
 export default class ThemeSpec extends T {