diff --git a/docker-compose.yml b/docker-compose.yml
index a3197131..abf12322 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,10 +26,14 @@ services:
       dockerfile: Dockerfile.db
     ports:
       - '5432:5432'
+    volumes:
+      - ./postgres-data:/var/lib/postgresql/postgres-data
+    shm_size: 1g
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
       - PG_WORK_MEM
       - PG_MAINTENANCE_WORK_MEM
+      - PGDATA=/var/lib/postgresql/postgres-data
 
   import:
     image: import:v1
@@ -75,6 +79,8 @@ services:
       dockerfile: martin.Dockerfile
     depends_on:
       - db
+    volumes:
+      - ./martin:/config
     environment:
       - DATABASE_URL=postgresql://postgres@db:5432/gis
 
@@ -85,6 +91,8 @@ services:
   martin-proxy:
     build:
       dockerfile: proxy.Dockerfile
+    volumes:
+      - ./proxy/index.html:/etc/nginx/public/index.html
     ports:
       - '8000:8000'
     environment:
diff --git a/docker-startup.sh b/docker-startup.sh
index 9a3d0fd2..6d6d4214 100755
--- a/docker-startup.sh
+++ b/docker-startup.sh
@@ -70,9 +70,10 @@ EOF
     /tmp/filtered.osm.pbf
 
   # Post processing imported data
-  psql -d gis -f sql/functions.sql && \
-  psql -d gis -f sql/osm_carto_views.sql && \
+  psql -d gis -f sql/functions.sql
+  psql -d gis -f sql/osm_carto_views.sql
   psql -d gis -f sql/get_station_importance.sql
+  psql -d gis -f sql/tile_views.sql
   ;;
 
 kosmtik)
diff --git a/martin/configuration.yml b/martin/configuration.yml
index 178baab8..3fcb1e66 100644
--- a/martin/configuration.yml
+++ b/martin/configuration.yml
@@ -35,6 +35,167 @@ postgres:
 
   # Associative arrays of table sources
   tables:
+
+    # --- Standard --- #
+
+    railway_line_low:
+      schema: public
+      table: railway_line_low
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        highspeed: string
+        tunnel: boolean
+        bridge: boolean
+
+    railway_line_med:
+      schema: public
+      table: railway_line_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        highspeed: string
+        tunnel: boolean
+        bridge: boolean
+
+    railway_turntables:
+      schema: public
+      table: railway_turntables
+      srid: 3857
+      geometry_column: way
+      geometry_type: POLYGON
+      properties:
+        railway: string
+
+    railway_line_fill:
+      schema: public
+      table: railway_line_fill
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        highspeed: string
+        tunnel: boolean
+        bridge: boolean
+
+    railway_text_stations_med:
+      schema: public
+      table: railway_text_stations_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        station: string
+        label: string
+
+    railway_text_stations_high:
+      schema: public
+      table: railway_text_stations_high
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        station: string
+        label: string
+
+    railway_symbols:
+      schema: public
+      table: railway_symbols
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        man_made: string
+
+    railway_text_med:
+      schema: public
+      table: railway_text_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        label: string
+
+    railway_text_high:
+      schema: public
+      table: railway_text_high
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        feature: string
+        usage: string
+        service: string
+        label: string
+
+    railway_text_km_med:
+      schema: public
+      table: railway_text_km_med
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        pos: string
+
+    railway_text_km_high:
+      schema: public
+      table: railway_text_km_high
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        pos: string
+
+    railway_switch_ref:
+      schema: public
+      table: railway_switch_ref
+      srid: 3857
+      geometry_column: way
+      geometry_type: POINT
+      properties:
+        railway: string
+        ref: string
+        railway_local_operated: string
+
+    railway_text_detail:
+      schema: public
+      table: railway_text_detail
+      srid: 3857
+      geometry_column: way
+      geometry_type: LINESTRING
+      properties:
+        railway: string
+        usage: string
+        service: string
+        label: string
+        track_ref: string
+
+    # --- Signalling --- #
+
     railway_line:
       schema: public
       table: railway_line
@@ -43,11 +204,11 @@ postgres:
       geometry_type: LINESTRING
       properties:
         railway: string
+        feature: string
         usage: string
         service: string
         layer: number
         rank: number
-        construction_railway: string
         train_protection: string
 
     railway_signals:
diff --git a/proxy/index.html b/proxy/index.html
index 1ecabe82..dc52a2c8 100644
--- a/proxy/index.html
+++ b/proxy/index.html
@@ -75,6 +75,14 @@
       .search-container #cancel-icon {
           display: none;
       }
+
+      .maplibregl-ctrl-style {
+          font-size: 1rem;
+          padding: .5rem;
+      }
+      .maplibregl-ctrl-style .form-check.form-check-inline:last-child {
+          margin-right: 0;
+      }
   </style>
   <title>OpenRailwayMap</title>
 </head>
@@ -148,10 +156,55 @@
   });
 </script>
 <script>
+  function createDomElement(tagName, className, container) {
+    const el = window.document.createElement(tagName);
+    if (className !== undefined) el.className = className;
+    if (container) container.appendChild(el);
+    return el;
+  }
+
+  function removeDomElement(node) {
+    if (node.parentNode) {
+      node.parentNode.removeChild(node);
+    }
+  }
+</script>
+<script>
+  const knownStyles = {
+    standard: 'Standard',
+    signals: 'Train protection',
+  };
+  function hashToObject(hash) {
+    if (!hash) {
+      return {};
+    } else {
+      const strippedHash = hash.replace('#', '');
+      const hashEntries = strippedHash
+        .split('&')
+        .map(item => item.split('=', 2))
+      return Object.fromEntries(hashEntries);
+    }
+  }
+  function determineStyleFromHash(hash) {
+    const defaultStyle = Object.keys(knownStyles)[0];
+    const hashObject = hashToObject(hash);
+    if (hashObject.style && hashObject.style in knownStyles) {
+      return hashObject.style
+    } else {
+      return defaultStyle;
+    }
+  }
+  function putStyleInHash(hash, style) {
+    const hashObject = hashToObject(hash);
+    hashObject.style = style;
+    return `#${Object.entries(hashObject).map(([key, value]) => `${key}=${value}`).join('&')}`;
+  }
+  const selectedStyle = determineStyleFromHash(window.location.hash)
+
   const railwayLineWidth = ['step', ['zoom'],
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
       ], 1.5,
       0,
@@ -159,7 +212,7 @@
     6,
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
       ], 2.5,
       0,
@@ -167,7 +220,7 @@
     8,
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['any',
           ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
           ['all', ['==', ['get', 'usage'], 'branch'], ['==', ['get', 'service'], null]],
@@ -178,7 +231,7 @@
     9,
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['any',
           ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
           ['all', ['==', ['get', 'usage'], 'branch'], ['==', ['get', 'service'], null]],
@@ -186,7 +239,7 @@
       ], 3.5,
       ['all',
         ['==', ['get', 'railway'], 'construction'],
-        ['==', ['get', 'construction_railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['any', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'usage'], 'branch']],
         ['==', ['get', 'service'], null],
       ],
@@ -199,7 +252,7 @@
     10,
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['any',
           ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
           ['all', ['==', ['get', 'usage'], 'branch'], ['==', ['get', 'service'], null]],
@@ -211,7 +264,7 @@
         3.5,
       ],
       ['all',
-        ['==', ['get', 'railway'], 'narrow_gauge'],
+        ['==', ['get', 'feature'], 'narrow_gauge'],
         ['==', ['get', 'service'], null],
       ],
       ['case',
@@ -221,22 +274,22 @@
       ['any',
         ['all',
           ['==', ['get', 'railway'], 'construction'],
-          ['==', ['get', 'construction_railway'], 'rail'],
+          ['==', ['get', 'railway'], 'rail'],
           ['any', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'usage'], 'branch']],
           ['==', ['get', 'service'], null],
         ],
         ['all',
-          ['==', ['get', 'railway'], 'construction'],
+          ['==', ['get', 'feature'], 'construction'],
           ['any',
-            ['==', ['get', 'construction_railway'], 'subway'],
-            ['==', ['get', 'construction_railway'], 'light_rail'],
+            ['==', ['get', 'railway'], 'subway'],
+            ['==', ['get', 'railway'], 'light_rail'],
           ],
           ['==', ['get', 'service'], null],
         ],
         ['all',
           ['any',
-            ['==', ['get', 'railway'], 'subway'],
-            ['==', ['get', 'railway'], 'light_rail'],
+            ['==', ['get', 'feature'], 'subway'],
+            ['==', ['get', 'feature'], 'light_rail'],
           ],
           ['==', ['get', 'service'], null],
         ],
@@ -250,7 +303,7 @@
     11,
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['any',
           ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
           ['all', ['==', ['get', 'usage'], 'branch'], ['==', ['get', 'service'], null]],
@@ -273,7 +326,7 @@
         3.5,
       ],
       ['all',
-        ['==', ['get', 'railway'], 'narrow_gauge'],
+        ['==', ['get', 'feature'], 'narrow_gauge'],
         ['any',
           ['==', ['get', 'service'], null],
           ['==', ['get', 'service'], 'spur'],
@@ -288,24 +341,24 @@
       ['any',
         ['all',
           ['==', ['get', 'railway'], 'construction'],
-          ['==', ['get', 'construction_railway'], 'rail'],
+          ['==', ['get', 'feature'], 'rail'],
           ['any', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'usage'], 'branch']],
           ['==', ['get', 'service'], null],
         ],
         ['all',
           ['==', ['get', 'railway'], 'construction'],
           ['any',
-            ['==', ['get', 'construction_railway'], 'subway'],
-            ['==', ['get', 'construction_railway'], 'light_rail'],
-            ['==', ['get', 'construction_railway'], 'tram'],
+            ['==', ['get', 'feature'], 'subway'],
+            ['==', ['get', 'feature'], 'light_rail'],
+            ['==', ['get', 'feature'], 'tram'],
           ],
           ['==', ['get', 'service'], null],
         ],
         ['all',
           ['any',
-            ['==', ['get', 'railway'], 'subway'],
-            ['==', ['get', 'railway'], 'light_rail'],
-            ['==', ['get', 'railway'], 'tram'],
+            ['==', ['get', 'feature'], 'subway'],
+            ['==', ['get', 'feature'], 'light_rail'],
+            ['==', ['get', 'feature'], 'tram'],
           ],
           ['==', ['get', 'service'], null],
         ],
@@ -319,7 +372,7 @@
     12,
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['any',
           ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
           ['all', ['==', ['get', 'usage'], 'branch'], ['==', ['get', 'service'], null]],
@@ -344,7 +397,7 @@
         3.5,
       ],
       ['all',
-        ['==', ['get', 'railway'], 'narrow_gauge'],
+        ['==', ['get', 'feature'], 'narrow_gauge'],
         ['any',
           ['==', ['get', 'service'], null],
           ['==', ['get', 'service'], 'spur'],
@@ -360,24 +413,24 @@
       ['any',
         ['all',
           ['==', ['get', 'railway'], 'construction'],
-          ['==', ['get', 'construction_railway'], 'rail'],
+          ['==', ['get', 'feature'], 'rail'],
           ['any', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'usage'], 'branch']],
           ['==', ['get', 'service'], null],
         ],
         ['all',
           ['==', ['get', 'railway'], 'construction'],
           ['any',
-            ['==', ['get', 'construction_railway'], 'subway'],
-            ['==', ['get', 'construction_railway'], 'light_rail'],
-            ['==', ['get', 'construction_railway'], 'tram'],
+            ['==', ['get', 'feature'], 'subway'],
+            ['==', ['get', 'feature'], 'light_rail'],
+            ['==', ['get', 'feature'], 'tram'],
           ],
           ['==', ['get', 'service'], null],
         ],
         ['all',
           ['any',
-            ['==', ['get', 'railway'], 'subway'],
-            ['==', ['get', 'railway'], 'light_rail'],
-            ['==', ['get', 'railway'], 'tram'],
+            ['==', ['get', 'feature'], 'subway'],
+            ['==', ['get', 'feature'], 'light_rail'],
+            ['==', ['get', 'feature'], 'tram'],
           ],
           ['==', ['get', 'service'], null],
         ],
@@ -391,7 +444,7 @@
     13,
     ['case',
       ['all',
-        ['==', ['get', 'railway'], 'rail'],
+        ['==', ['get', 'feature'], 'rail'],
         ['any',
           ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'service'], null]],
           ['all', ['==', ['get', 'usage'], 'branch'], ['==', ['get', 'service'], null]],
@@ -418,7 +471,7 @@
         3.5,
       ],
       ['all',
-        ['==', ['get', 'railway'], 'narrow_gauge'],
+        ['==', ['get', 'feature'], 'narrow_gauge'],
         ['any',
           ['==', ['get', 'service'], null],
           ['==', ['get', 'service'], 'spur'],
@@ -434,24 +487,24 @@
       ['any',
         ['all',
           ['==', ['get', 'railway'], 'construction'],
-          ['==', ['get', 'construction_railway'], 'rail'],
+          ['==', ['get', 'feature'], 'rail'],
           ['any', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'usage'], 'branch']],
           ['==', ['get', 'service'], null],
         ],
         ['all',
           ['==', ['get', 'railway'], 'construction'],
           ['any',
-            ['==', ['get', 'construction_railway'], 'subway'],
-            ['==', ['get', 'construction_railway'], 'light_rail'],
-            ['==', ['get', 'construction_railway'], 'tram'],
-            ['==', ['get', 'construction_railway'], 'narrow_gauge'],
+            ['==', ['get', 'feature'], 'subway'],
+            ['==', ['get', 'feature'], 'light_rail'],
+            ['==', ['get', 'feature'], 'tram'],
+            ['==', ['get', 'feature'], 'narrow_gauge'],
           ],
           ['==', ['get', 'service'], null],
         ],
         ['any',
-          ['==', ['get', 'railway'], 'subway'],
-          ['==', ['get', 'railway'], 'light_rail'],
-          ['==', ['get', 'railway'], 'tram'],
+          ['==', ['get', 'feature'], 'subway'],
+          ['==', ['get', 'feature'], 'light_rail'],
+          ['==', ['get', 'feature'], 'tram'],
         ],
       ],
       ['case',
@@ -461,17 +514,17 @@
       0,
     ],
   ];
-  const casingPaint = dashArray => ({
+  const trainProtectionCasingPaint = dashArray => ({
     'line-color': 'white',
     'line-width': railwayLineWidth,
     'line-gap-width': 2,
     'line-dasharray': dashArray,
   });
-  const casingLayout = {
+  const trainProtectionLayout = {
     'line-sort-key': ['get', 'rank'],
     'line-join': 'round',
   };
-  const fillPaint = dashArray => ({
+  const trainProtectionFillPaint = dashArray => ({
     'line-color': ['match', ['get', 'train_protection'],
       'zsi127', '#884400',
       'ptc', '#cc0033',
@@ -492,71 +545,1041 @@
     'line-dasharray': dashArray,
   });
 
-  const style = {
-    center: [12.55, 51.14], // default
-    zoom: 3.75, // default
-    glyphs: `${location.origin}/font/{fontstack}/{range}`,
-    metadata: {},
-    name: 'OpenRailwayMap',
-    sources: {
-      openstreetmap: {
-        type: 'raster',
-        tiles: [
-          'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-        ],
-        tileSize: 256,
-        attribution: '<a href="https://www.openstreetmap.org/about" target="_blank">&copy; OpenStreetMap contributors</a>'
+  const main_color = '#ff8100';
+  const highspeed_color = '#ff0c00';
+  const branch_color = '#c4b600';
+  const narrow_gauge_color = '#c0da00';
+  const no_usage_color = '#000000';
+  const disused_color = '#70584d';
+  const abandoned_color = '#7f6a62';
+  const razed_color = '#94847e';
+  const tram_color = '#d877b8';
+  const subway_color = '#0300c3';
+  const light_rail_color = '#00bd14';
+  const siding_color = '#000000';
+  const yard_color = '#000000';
+  const spur_color = '#87491d';
+  const industrial_color = '#87491d';
+
+  const railway_casing_color = '#ffffff';
+  const bridge_casing_color = '#000000';
+  const tunnel_color = '#979797';
+
+  const turntable_fill = '#ababab';
+  const turntable_casing = '#808080';
+  const turntable_casing_width = 2;
+
+  const railway_casing_add = 1;
+
+  /* additional width of the casing of dashed lines */
+  const railway_tunnel_casing_add = 1;
+  const bridge_casing_add = 4;
+
+  const abandoned_dasharray = [2.5, 2.5];
+  const razed_dasharray = [1.5, 3.5];
+  const construction_dasharray = [4.5, 4.5];
+  const proposed_dasharray = [1, 4];
+
+  const standardFillPaint = dashArray => ({
+    'line-color': ['case',
+      ['==', ['get', 'feature'], 'rail'],
+      ['case',
+        ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'spur']], spur_color,
+        ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'yard']], yard_color,
+        ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'crossover']], siding_color,
+        ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], 'siding']], siding_color,
+        ['all', ['==', ['get', 'usage'], null], ['==', ['get', 'service'], null]], no_usage_color,
+        ['==', ['get', 'usage'], 'industrial'], industrial_color,
+        ['==', ['get', 'usage'], 'branch'], branch_color,
+        ['all', ['==', ['get', 'usage'], 'main'], ['==', ['get', 'highspeed'], 'yes']], highspeed_color,
+        ['==', ['get', 'usage'], 'main'], main_color,
+        'rgba(255, 255, 255, 1.0)',
+      ],
+      ['==', ['get', 'feature'], 'narrow_gauge'],
+      ['case',
+        ['all', ['==', ['get', 'usage'], 'industrial'], ['==', ['get', 'service'], 'spur']], industrial_color,
+        narrow_gauge_color,
+      ],
+      ['==', ['get', 'railway'], 'disused'], disused_color,
+      ['==', ['get', 'railway'], 'abandoned'], abandoned_color,
+      ['==', ['get', 'railway'], 'razed'], razed_color,
+      ['==', ['get', 'feature'], 'subway'], subway_color,
+      ['==', ['get', 'feature'], 'light_rail'], light_rail_color,
+      ['==', ['get', 'feature'], 'tram'], tram_color,
+      'rgba(255, 255, 255, 1.0)',
+    ],
+    'line-width': railwayLineWidth,
+    'line-dasharray': dashArray,
+  });
+
+  const attribution = '<a href="https://github.com/hiddewie/OpenRailwayMap-vector" target="_blank">&copy; OpenRailwayMap contributors</a>';
+
+  const openstreetmap = {
+    type: 'raster',
+    tiles: [
+      'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+    ],
+    tileSize: 256,
+    attribution: '<a href="https://www.openstreetmap.org/about" target="_blank">&copy; OpenStreetMap contributors</a>'
+  };
+  const sources = {
+    standard: {
+      openstreetmap,
+      openrailwaymap: {
+        type: 'vector',
+          url: `${location.origin}/standard`,
+        attribution,
       },
+    },
+    signals: {
+      openstreetmap,
       openrailwaymap: {
         type: 'vector',
-        url: `${location.origin}/tiles`,
-        attribution: '<a href="https://github.com/hiddewie/OpenRailwayMap-vector" target="_blank">&copy; OpenRailwayMap contributors</a>'
+        url: `${location.origin}/signals`,
+        attribution,
       },
     },
-    sprite: [
+  };
+
+  const backgroundColor = {
+    id: 'background',
+    type: 'background',
+    paint: {
+      'background-color': 'rgb(242, 243, 240)'
+    }
+  };
+  const backgroundMap = {
+    id: "openstreetmap",
+    type: "raster",
+    source: "openstreetmap",
+    paint: {
+      'raster-saturation': -1.0, // or 0.0 for colorful
+    }
+  };
+
+  const layers = {
+    standard: [
+      backgroundColor,
+      backgroundMap,
       {
-        id: 'general',
-        url: `${location.origin}/sprite/general`,
+        id: 'railway_bridge_railing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['get', 'bridge'],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        paint: {
+          'line-color': bridge_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': bridge_casing_add,
+        }
       },
       {
-        id: 'at',
-        url: `${location.origin}/sprite/at`,
+        id: 'railway_tunnel_casing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['get', 'tunnel'],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_tunnel_casing_add,
+        }
       },
       {
-        id: 'de',
-        url: `${location.origin}/sprite/de`,
+        id: 'railway_line_casing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['!', ['get', 'bridge']],
+          ['!', ['get', 'tunnel']],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+        }
       },
       {
-        id: 'fi',
-        url: `${location.origin}/sprite/fi`,
+        id: 'railway_line_construction_casing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'construction'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+          'line-dasharray': construction_dasharray,
+        }
       },
       {
-        id: 'nl',
-        url: `${location.origin}/sprite/nl`,
+        id: 'railway_line_proposed_casing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'proposed'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+          'line-dasharray': proposed_dasharray,
+        }
       },
       {
-        id: 'flex',
-        url: `${location.origin}/sprite/flex`,
+        id: 'railway_line_abandoned_casing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'abandoned'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+          'line-dasharray': abandoned_dasharray,
+        }
+      },
+      {
+        id: 'railway_line_razed_casing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'razed'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+          'line-dasharray': razed_dasharray,
+        }
+      },
+      {
+        id: 'railway_line_low_casing',
+        type: 'line',
+        minzoom: 7,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_low',
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+        }
+      },
+      {
+        id: 'railway_line_med_casing',
+        type: 'line',
+        minzoom: 8,
+        maxzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_med',
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+        }
+      },
+      {
+        id: 'railway_bridge_casing',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['get', 'bridge'],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: {
+          'line-color': railway_casing_color,
+          'line-width': railwayLineWidth,
+          'line-gap-width': railway_casing_add,
+        }
       },
-    ],
-    version: 8,
-    layers: [
       {
-        id: 'background',
-        type: 'background',
+        id: 'railway_tunnel_fill',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['get', 'tunnel'],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint([1]),
+      },
+      {
+        id: 'railway_tunnel_bright',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['get', 'tunnel'],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        layout: {
+          'line-join': 'round',
+        },
         paint: {
-          'background-color': 'rgb(242, 243, 240)'
+          ...standardFillPaint([1]),
+          'line-color': 'rgba(255, 255, 255, 50%)',
         }
       },
       {
-        id: "openstreetmap",
-        type: "raster",
-        source: "openstreetmap",
+        id: 'railway_construction_fill',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'construction'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint(construction_dasharray),
+      },
+      {
+        id: 'railway_proposed_fill',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'proposed'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint(proposed_dasharray),
+      },
+      {
+        id: 'railway_abandoned_fill',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'abandoned'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint(abandoned_dasharray),
+      },
+      {
+        id: 'railway_razed_fill',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['==', ['get', 'railway'], 'razed'],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint(razed_dasharray),
+      },
+      {
+        id: 'railway_line_fill',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['!', ['get', 'bridge']],
+          ['!', ['get', 'tunnel']],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint([1]),
+      },
+      {
+        id: 'railway_line_low_fill',
+        type: 'line',
+        minzoom: 7,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_low',
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint([1]),
+      },
+      {
+        id: 'railway_line_med_fill',
+        type: 'line',
+        minzoom: 8,
+        maxzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_med',
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint([1]),
+      },
+      {
+        id: 'railway_bridge_fill',
+        type: 'line',
+        minzoom: 9,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_line_fill',
+        filter: ['all',
+          ['get', 'bridge'],
+          ['!=', ['get', 'railway'], 'construction'],
+          ['!=', ['get', 'railway'], 'proposed'],
+          ['!=', ['get', 'railway'], 'abandoned'],
+          ['!=', ['get', 'railway'], 'razed'],
+        ],
+        layout: {
+          'line-join': 'round',
+        },
+        paint: standardFillPaint([1]),
+      },
+      {
+        id: 'railway_turntables_fill',
+        type: 'fill',
+        minzoom: 11,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_turntables',
         paint: {
-          'raster-saturation': -1.0, // or 0.0 for colorful
+          'fill-color': turntable_fill,
         }
       },
+      {
+        id: 'railway_turntables_casing',
+        type: 'line',
+        minzoom: 16,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_turntables',
+        paint: {
+          'line-color': turntable_casing,
+          'line-width': turntable_casing_width,
+        }
+      },
+      {
+        id: 'railway_symbols_tram_stop',
+        type: 'symbol',
+        minzoom: 13,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_symbols',
+        filter: ['==', ['get', 'railway'], 'tram_stop'],
+        layout: {
+          'icon-overlap': 'always',
+          'icon-image': 'general:tram-stop',
+        }
+      },
+      {
+        id: 'railway_text_stations_med',
+        type: 'symbol',
+        minzoom: 6,
+        maxzoom: 11,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_stations_med',
+        filter: ['step', ['zoom'],
+          ['all',
+            ['==', ['get', 'railway'], 'station'],
+            ['!=', ['get', 'station'], 'light_rail'],
+            ['!=', ['get', 'station'], 'subway'],
+            ['!=', ['get', 'station'], 'funicular'],
+          ],
+          10,
+          ['all',
+            ['any',
+              ['==', ['get', 'railway'], 'station'],
+              ['==', ['get', 'railway'], 'halt'],
+            ],
+            ['!=', ['get', 'station'], 'funicular'],
+          ],
+        ],
+        paint: {
+          'text-color': ['case',
+            ['==', ['get', 'railway'], 'yard'], '#87491D',
+            ['==', ['get', 'railway'], 'tram_stop'], '#D877B8',
+            ['==', ['get', 'railway'], 'station'], 'blue',
+            ['==', ['get', 'railway'], 'halt'], 'blue',
+            '#616161',
+          ],
+          'text-halo-color': ['case',
+            ['==', ['get', 'railway'], 'yard'], '#F1F1F1',
+            ['==', ['get', 'railway'], 'tram_stop'], 'white',
+            ['==', ['get', 'railway'], 'station'], 'white',
+            ['==', ['get', 'railway'], 'halt'], 'white',
+            '#F1F1F1',
+          ],
+          'text-halo-width': 1.5,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'text-field': '{label}',
+          // TODO light rail / subway oblique font
+          'text-font': ['Noto Sans Bold'],
+          // TODO text-variable-anchor-offset
+          'text-size': 11,
+          'text-padding': 10,
+          'text-max-width': 5,
+          'text-offset': ['case',
+            ['==', ['get', 'railway'], 'tram_stop'], ['literal', [0, 1]],
+            ['literal', [0, 0]]
+          ],
+        },
+      },
+      {
+        id: 'railway_text_stations_high',
+        type: 'symbol',
+        minzoom: 11,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_stations_high',
+        filter: ['step', ['zoom'],
+          ['all',
+            ['!=', ['get', 'railway'], 'tram_stop'],
+            ['!=', ['get', 'railway'], 'funicular'],
+          ],
+          14,
+          ['!=', ['get', 'railway'], 'funicular'],
+        ],
+        paint: {
+          'text-color': ['case',
+            ['==', ['get', 'railway'], 'yard'], '#87491D',
+            ['==', ['get', 'railway'], 'tram_stop'], '#D877B8',
+            ['==', ['get', 'railway'], 'station'], 'blue',
+            ['==', ['get', 'railway'], 'halt'], 'blue',
+            '#616161',
+          ],
+          'text-halo-color': ['case',
+            ['==', ['get', 'railway'], 'yard'], '#F1F1F1',
+            ['==', ['get', 'railway'], 'tram_stop'], 'white',
+            ['==', ['get', 'railway'], 'station'], 'white',
+            ['==', ['get', 'railway'], 'halt'], 'white',
+            '#F1F1F1',
+          ],
+          'text-halo-width': 1.5,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'text-field': '{label}',
+          // TODO light rail / subway oblique font
+          'text-font': ['Noto Sans Bold'],
+          // TODO text-variable-anchor-offset
+          'text-size': 11,
+          'text-padding': 10,
+          'text-max-width': 5,
+          'text-offset': ['case',
+            ['==', ['get', 'railway'], 'tram_stop'], ['literal', [0, 1]],
+            ['literal', [0, 0]]
+          ],
+        },
+      },
+      {
+        id: 'railway_symbols_low',
+        type: 'symbol',
+        minzoom: 11,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_symbols',
+        filter: ['==', ['get', 'railway'], 'border'],
+        layout: {
+          'icon-image': 'general:border',
+        }
+      },
+      {
+        id: 'railway_symbols_med',
+        type: 'symbol',
+        minzoom: 13,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_symbols',
+        filter: ['any',
+          ['==', ['get', 'railway'], 'owner_change'],
+          ['==', ['get', 'railway'], 'radio'],
+        ],
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-image': ['case',
+            ['==', ['get', 'railway'], 'owner_change'], 'general:border',
+            ['==', ['get', 'railway'], 'radio'], ['case',
+              ['==', ['get', 'man_made'], 'mast'], 'general:radio-mast',
+              ['==', ['get', 'man_made'], 'tower'], 'general:radio-mast',
+              ['==', ['get', 'man_made'], 'antenna'], 'general:radio-antenna',
+              '',
+            ],
+            '',
+          ],
+        }
+      },
+      {
+        id: 'railway_symbols_med_high',
+        type: 'symbol',
+        minzoom: 14,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_symbols',
+        filter: ['any',
+          ['==', ['get', 'railway'], 'crossing'],
+          ['==', ['get', 'railway'], 'level_crossing'],
+        ],
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-image': ['case',
+            ['==', ['get', 'railway'], 'level_crossing'], 'general:level-crossing',
+            ['==', ['get', 'railway'], 'crossing'], 'general:crossing',
+            '',
+          ],
+        }
+      },
+      {
+        id: 'railway_symbols_high',
+        type: 'symbol',
+        minzoom: 17,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_symbols',
+        filter: ['==', ['get', 'railway'], 'phone'],
+        layout: {
+          'symbol-z-order': 'source',
+          'icon-image': 'general:phone',
+        }
+      },
+      {
+        id: 'railway_text_med',
+        type: 'symbol',
+        minzoom: 8,
+        maxzoom: 15,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_med',
+        filter: ['step', ['zoom'],
+          ['all',
+            ['==', ['get', 'railway'], 'rail'],
+            ['any',
+              ['==', ['get', 'usage'], 'main'],
+              ['==', ['get', 'usage'], 'branch'],
+            ],
+            ['==', ['get', 'service'], null],
+          ],
+          9,
+          ['any',
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'disused'],
+                ['==', ['get', 'railway'], 'abandoned'],
+              ],
+              ['==', ['get', 'feature'], 'rail'],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'construction'],
+                ['==', ['get', 'railway'], 'proposed'],
+              ],
+              ['==', ['get', 'feature'], 'rail'],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+          ],
+          10,
+          ['any',
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+                ['==', ['get', 'usage'], 'industrial'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'narrow_gauge'],
+                ['==', ['get', 'railway'], 'subway'],
+                ['==', ['get', 'railway'], 'light_rail'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'disused'],
+                ['==', ['get', 'railway'], 'abandoned'],
+                ['==', ['get', 'railway'], 'razed'],
+              ],
+              ['==', ['get', 'feature'], 'rail'],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'construction'],
+                ['==', ['get', 'railway'], 'proposed'],
+              ],
+              ['any',
+                ['==', ['get', 'feature'], 'rail'],
+                ['==', ['get', 'feature'], 'subway'],
+                ['==', ['get', 'feature'], 'light_rail'],
+              ],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+          ],
+          11,
+          ['any',
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['==', ['get', 'usage'], 'industrial'],
+            ],
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['==', ['get', 'usage'], null],
+              ['any',
+                ['==', ['get', 'service'], 'siding'],
+                ['==', ['get', 'service'], 'crossover'],
+                ['==', ['get', 'service'], 'spur'],
+              ],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'narrow_gauge'],
+                ['==', ['get', 'railway'], 'subway'],
+                ['==', ['get', 'railway'], 'light_rail'],
+              ],
+              ['any',
+                ['==', ['get', 'service'], null],
+                ['==', ['get', 'service'], 'siding'],
+                ['==', ['get', 'service'], 'crossover'],
+                ['==', ['get', 'service'], 'spur'],
+              ],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'disused'],
+                ['==', ['get', 'railway'], 'abandoned'],
+                ['==', ['get', 'railway'], 'razed'],
+              ],
+              ['any',
+                ['==', ['get', 'feature'], 'rail'],
+                ['==', ['get', 'feature'], 'subway'],
+                ['==', ['get', 'feature'], 'light_rail'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'construction'],
+                ['==', ['get', 'railway'], 'proposed'],
+              ],
+              ['any',
+                ['==', ['get', 'feature'], 'rail'],
+                ['==', ['get', 'feature'], 'subway'],
+                ['==', ['get', 'feature'], 'light_rail'],
+                ['==', ['get', 'feature'], 'tram'],
+              ],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['==', ['get', 'railway'], 'tram'],
+              ['==', ['get', 'service'], null],
+            ],
+          ],
+          12,
+          ['any',
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['==', ['get', 'usage'], 'industrial'],
+            ],
+            ['all',
+              ['==', ['get', 'railway'], 'rail'],
+              ['==', ['get', 'usage'], null],
+              ['any',
+                ['==', ['get', 'service'], 'siding'],
+                ['==', ['get', 'service'], 'crossover'],
+                ['==', ['get', 'service'], 'spur'],
+                ['==', ['get', 'service'], 'yard'],
+              ],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'narrow_gauge'],
+                ['==', ['get', 'railway'], 'subway'],
+                ['==', ['get', 'railway'], 'light_rail'],
+              ],
+              ['any',
+                ['==', ['get', 'service'], null],
+                ['==', ['get', 'service'], 'siding'],
+                ['==', ['get', 'service'], 'crossover'],
+                ['==', ['get', 'service'], 'spur'],
+                ['==', ['get', 'service'], 'yard'],
+              ],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'disused'],
+                ['==', ['get', 'railway'], 'abandoned'],
+                ['==', ['get', 'railway'], 'razed'],
+              ],
+              ['any',
+                ['==', ['get', 'feature'], 'rail'],
+                ['==', ['get', 'feature'], 'subway'],
+                ['==', ['get', 'feature'], 'light_rail'],
+                ['==', ['get', 'feature'], 'tram'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['any',
+                ['==', ['get', 'railway'], 'construction'],
+                ['==', ['get', 'railway'], 'proposed'],
+              ],
+              ['any',
+                ['==', ['get', 'feature'], 'rail'],
+                ['==', ['get', 'feature'], 'subway'],
+                ['==', ['get', 'feature'], 'light_rail'],
+                ['==', ['get', 'feature'], 'tram'],
+              ],
+              ['any',
+                ['==', ['get', 'usage'], 'main'],
+                ['==', ['get', 'usage'], 'branch'],
+              ],
+              ['==', ['get', 'service'], null],
+            ],
+            ['all',
+              ['==', ['get', 'railway'], 'tram'],
+              ['==', ['get', 'service'], null],
+            ],
+          ],
+          13,
+          true
+        ],
+        paint: {
+          'text-color': '#585858',
+          'text-halo-color': 'white',
+          'text-halo-width': 1,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'symbol-placement': 'line',
+          'text-field': '{label}',
+          'text-font': ['Noto Sans Bold'],
+          'text-size': 11,
+          'text-padding': 10,
+          'text-max-width': 5,
+          'symbol-spacing': 200,
+        },
+      },
+      {
+        id: 'railway_text_high',
+        type: 'symbol',
+        minzoom: 15,
+        maxzoom: 17,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_high',
+        paint: {
+          'text-color': '#585858',
+          'text-halo-color': 'white',
+          'text-halo-width': 1,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'symbol-placement': 'line',
+          'text-field': '{label}',
+          'text-font': ['Noto Sans Bold'],
+          'text-size': 11,
+          'text-padding': 10,
+          'text-max-width': 5,
+          'symbol-spacing': 200,
+        },
+      },
+      {
+        id: 'railway_text_km_med',
+        type: 'symbol',
+        minzoom: 11,
+        maxzoom: 14,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_km_med',
+        paint: {
+          'text-color': 'black',
+          'text-halo-color': 'white',
+          'text-halo-width': 1,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'text-field': '{pos}',
+          'text-font': ['Noto Sans Bold'],
+          'text-size': 11,
+        },
+      },
+      {
+        id: 'railway_text_km_high',
+        type: 'symbol',
+        minzoom: 14,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_km_high',
+        paint: {
+          'text-color': 'black',
+          'text-halo-color': 'white',
+          'text-halo-width': 1,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'text-field': '{pos}',
+          'text-font': ['Noto Sans Bold'],
+          'text-size': 11,
+        },
+      },
+      {
+        id: 'railway_switch_ref',
+        type: 'symbol',
+        minzoom: 16,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_switch_ref',
+        paint: {
+          'text-halo-color': ['case',
+            ['==', ['get', 'railway_local_operated'], 'yes'], 'yellow',
+            'white'
+          ],
+          'text-halo-width': 2,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'text-field': '{ref}',
+          'text-font': ['Noto Sans Medium'],
+          'text-size': 11,
+          'text-padding': 20,
+        },
+      },
+      {
+        id: 'railway_text_detail_line_numbers',
+        type: 'symbol',
+        minzoom: 17,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_detail',
+        filter: ['!=', ['get', 'label'], null],
+        paint: {
+          'text-color': '#585858',
+          'text-halo-color': 'white',
+          'text-halo-width': 1,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'symbol-placement': 'line',
+          'text-field': '{label}',
+          'text-font': ['Noto Sans Bold'],
+          'text-size': 11,
+          'text-padding': 10,
+          'text-max-width': 5,
+          'symbol-spacing': 200,
+        },
+      },
+      {
+        id: 'railway_text_detail_track_numbers',
+        type: 'symbol',
+        minzoom: 17,
+        source: 'openrailwaymap',
+        'source-layer': 'railway_text_detail',
+        filter: ['!=', ['get', 'track_ref'], null],
+        paint: {
+          'text-color': 'white',
+          'text-halo-color': 'blue',
+          'text-halo-width': 4,
+          'text-halo-blur': 2,
+        },
+        layout: {
+          'symbol-z-order': 'source',
+          'symbol-placement': 'line',
+          'text-field': '{track_ref}',
+          'text-font': ['Noto Sans Bold'],
+          'text-size': 10,
+          'text-padding': 10,
+        },
+      },
+    ],
 
+    signals: [
+      backgroundColor,
+      backgroundMap,
       {
         id: 'railway_line_low_casing',
         type: 'line',
@@ -568,8 +1591,8 @@
           ['==', ['get', 'usage'], 'main'],
           ['==', ['get', 'service'], null],
         ],
-        paint: casingPaint([1]),
-        layout: casingLayout,
+        paint: trainProtectionCasingPaint([1]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'railway_line_med_casing',
@@ -586,8 +1609,8 @@
           ],
           ['==', ['get', 'service'], null],
         ],
-        paint: casingPaint([1]),
-        layout: casingLayout,
+        paint: trainProtectionCasingPaint([1]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'railway_line_casing_construction',
@@ -596,8 +1619,8 @@
         minzoom: 9,
         'source-layer': 'railway_line',
         filter: ['==', ['get', 'railway'], 'construction'],
-        paint: casingPaint([2, 2]),
-        layout: casingLayout,
+        paint: trainProtectionCasingPaint([2, 2]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'railway_line_casing',
@@ -606,8 +1629,8 @@
         minzoom: 9,
         'source-layer': 'railway_line',
         filter: ['!=', ['get', 'railway'], 'construction'],
-        paint: casingPaint([1]),
-        layout: casingLayout,
+        paint: trainProtectionCasingPaint([1]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'railway_line_low_fill',
@@ -620,8 +1643,8 @@
           ['==', ['get', 'usage'], 'main'],
           ['==', ['get', 'service'], null],
         ],
-        paint: fillPaint([1]),
-        layout: casingLayout,
+        paint: trainProtectionFillPaint([1]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'railway_line_med_fill',
@@ -638,8 +1661,8 @@
           ],
           ['==', ['get', 'service'], null],
         ],
-        paint: fillPaint([1]),
-        layout: casingLayout,
+        paint: trainProtectionFillPaint([1]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'railway_line_fill_construction',
@@ -648,8 +1671,8 @@
         source: 'openrailwaymap',
         'source-layer': 'railway_line',
         filter: ['==', ['get', 'railway'], 'construction'],
-        paint: fillPaint([2, 2]),
-        layout: casingLayout,
+        paint: trainProtectionFillPaint([2, 2]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'railway_line_fill',
@@ -658,8 +1681,8 @@
         source: 'openrailwaymap',
         'source-layer': 'railway_line',
         filter: ['!=', ['get', 'railway'], 'construction'],
-        paint: fillPaint([1]),
-        layout: casingLayout,
+        paint: trainProtectionFillPaint([1]),
+        layout: trainProtectionLayout,
       },
       {
         id: 'signal_boxes_point',
@@ -799,16 +1822,98 @@
     ],
   };
 
+  const makeStyle = selectedStyle => ({
+    center: [12.55, 51.14], // default
+    zoom: 3.75, // default
+    glyphs: `${location.origin}/font/{fontstack}/{range}`,
+    metadata: {},
+    name: 'OpenRailwayMap',
+    sources: sources[selectedStyle],
+    sprite: [
+      {
+        id: 'general',
+        url: `${location.origin}/sprite/general`,
+      },
+      {
+        id: 'at',
+        url: `${location.origin}/sprite/at`,
+      },
+      {
+        id: 'de',
+        url: `${location.origin}/sprite/de`,
+      },
+      {
+        id: 'fi',
+        url: `${location.origin}/sprite/fi`,
+      },
+      {
+        id: 'nl',
+        url: `${location.origin}/sprite/nl`,
+      },
+      {
+        id: 'flex',
+        url: `${location.origin}/sprite/flex`,
+      },
+    ],
+    version: 8,
+    layers: layers[selectedStyle],
+  });
+
   const map = new maplibregl.Map({
     container: 'map',
-    style,
-    hash: true,
+    style: makeStyle(selectedStyle),
+    hash: 'view',
     maxZoom: 18,
     minPitch: 0,
     maxPitch: 0,
   });
 
+  class StyleControl {
+    constructor(options) {
+      this.options = options
+    }
+
+    onAdd(map) {
+      this._map = map;
+      this._container = createDomElement('div', 'maplibregl-ctrl maplibregl-ctrl-group maplibregl-ctrl-style');
+      const form = createDomElement('form', 'form form-inline', this._container);
+      const span = createDomElement('span', '', form);
+      span.innerHTML = 'Style:&nbsp;'
+
+      Object.entries(knownStyles).forEach(([name, styleLabel]) => {
+        const id = `style-${name}`
+        const wrapper = createDomElement('div', 'form-check form-check-inline', form);
+        const button = createDomElement('input', 'form-check-input', wrapper);
+        button.id = id
+        button.type = 'radio'
+        button.name = 'style'
+        button.value = name
+        button.onclick = () => this.options.onStyleChange(name)
+        button.checked = (this.options.initialSelection === name)
+        const label = createDomElement('label', 'form-check-label', wrapper);
+        label.htmlFor = id
+        label.innerText = styleLabel
+      });
+
+      return this._container;
+    }
+
+    onRemove() {
+      removeDomElement(this._container);
+      this._map = undefined;
+    }
+  }
+
   map.on('load', () => {
+    map.addControl(new StyleControl({
+      initialSelection: selectedStyle,
+      onStyleChange: changedStyle => {
+        map.setStyle(makeStyle(changedStyle));
+        const updatedHash = putStyleInHash(window.location.hash, changedStyle);
+        const location = window.location.href.replace(/(#.+)?$/, updatedHash);
+        window.history.replaceState(window.history.state, null, location);
+      }
+    }));
     map.addControl(new maplibregl.NavigationControl({
       showCompass: false,
       visualizePitch: false,
diff --git a/proxy/proxy.conf.template b/proxy/proxy.conf.template
index d4e200c2..14f3ee65 100644
--- a/proxy/proxy.conf.template
+++ b/proxy/proxy.conf.template
@@ -39,7 +39,8 @@ server {
   }
 
   location / {
-    # rewrite ^/tiles$ /railway_line,railway_signals,signal_boxes_point,signal_boxes_polygon,signal_boxes_text last;
+    # rewrite ^/standard$ /railway_line_low,railway_line_med,railway_turntables,railway_line_fill,railway_text_stations_med,railway_text_stations_high,railway_symbols,railway_text_med,railway_text_high,railway_text_km_med,railway_text_km_high,railway_switch_ref,railway_text_detail last;
+    # rewrite ^/signals$ /railway_line,railway_signals,signal_boxes_point,signal_boxes_polygon,signal_boxes_text last;
 
     proxy_pass http://${PROXY_UPSTREAM};
     proxy_http_version 1.1;
@@ -58,4 +59,4 @@ server {
     # add_header Cache-Control "public, max-age=8182, stale-while-revalidate=604800, stale-if-error=604800";
     add_header Cache-Control "public, max-age=0";
   }
-}
\ No newline at end of file
+}
diff --git a/sql/get_station_importance.sql b/sql/get_station_importance.sql
index 90bfad28..4855e55f 100644
--- a/sql/get_station_importance.sql
+++ b/sql/get_station_importance.sql
@@ -2,7 +2,7 @@
 
 -- Relevant objects referenced by route relations: railway=station, railway=halt, public_transport=stop_position, public_transport=platform, railway=platform
 
---CREATE OR REPLACE VIEW stops_platforms AS
+-- CREATE OR REPLACE VIEW stops_platforms AS
 --  SELECT osm_id, name, railway, public_transport, tags, way AS geom, 1::smallint AS objtype
 --    FROM planet_osm_point
 --    WHERE railway IN ('station', 'halt', 'platform') OR public_transport IN ('stop_position', 'platform')
diff --git a/sql/osm_carto_views.sql b/sql/osm_carto_views.sql
index 4e30e489..d9f70e35 100644
--- a/sql/osm_carto_views.sql
+++ b/sql/osm_carto_views.sql
@@ -73,680 +73,3 @@ CREATE OR REPLACE VIEW openrailwaymap_osm_signals AS
     tags->'railway:signal:direction'   AS "signal_direction",
     tags AS tags
   FROM planet_osm_point;
-
-CREATE OR REPLACE VIEW railway_line AS
-  SELECT
-    way,
-    railway,
-    usage,
-    service,
-    layer,
-    tags->'construction:railway' AS construction_railway,
-    railway_train_protection_rank(
-      tags->'railway:pzb',
-      railway_null_to_no(tags->'railway:lzb'),
-      tags->'railway:atb',
-      tags->'railway:atb-eg',
-      tags->'railway:atb-ng',
-      tags->'railway:atb-vv',
-      tags->'railway:atc',
-      tags->'railway:kvb',
-      tags->'railway:tvm',
-      tags->'railway:scmt',
-      tags->'railway:asfa',
-      railway_null_or_zero_to_no(tags->'railway:ptc'),
-      tags->'railway:zsi127',
-      railway_null_or_zero_to_no(tags->'railway:etcs'),
-      railway_null_or_zero_to_no(tags->'construction:railway:etcs')
-    ) as rank,
-    CASE
-      WHEN railway_null_or_zero_to_no(tags->'railway:etcs') != 'no' THEN 'etcs'
-      WHEN railway_null_or_zero_to_no(tags->'railway:ptc') != 'no' THEN 'ptc'
-      WHEN railway_null_or_zero_to_no(tags->'construction:railway:etcs') != 'no' THEN 'construction_etcs'
-      WHEN tags->'railway:asfa' = 'yes' THEN 'asfa'
-      WHEN tags->'railway:scmt' = 'yes' THEN 'scmt'
-      WHEN railway_null_or_zero_to_no(tags->'railway:tvm') != 'no' THEN 'tvm'
-      WHEN tags->'railway:kvb' = 'yes' THEN 'kvb'
-      WHEN tags->'railway:atc' = 'yes' THEN 'atc'
-      WHEN COALESCE(tags->'railway:atb', tags->'railway:atb-eg', tags->'railway:atb-ng', tags->'railway:atb-vv') = 'yes' THEN 'atb'
-      WHEN tags->'railway:zsi127' = 'yes' THEN 'zsi127'
-      WHEN tags->'railway:lzb' = 'yes' THEN 'lzb'
-      WHEN tags->'railway:pzb' = 'yes' THEN 'pzb'
-      WHEN (tags->'railway:pzb' = 'no' AND tags->'railway:lzb' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:atb' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:atc' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:scmt' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:asfa' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:kvb' = 'no' AND tags->'railway:tvm' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:zsi127' = 'no') THEN 'other'
-    END as train_protection
-    FROM openrailwaymap_osm_line
-    WHERE railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'disused', 'preserved', 'construction')
-    ORDER BY
-      COALESCE(layer, 0),
-      rank NULLS LAST;
-
-CREATE OR REPLACE VIEW signal_boxes_point AS
-  SELECT
-    way
-  FROM (
-    SELECT
-        way
-      FROM openrailwaymap_osm_point
-      WHERE railway = 'signal_box'
-  ) AS boxes;
-
-CREATE OR REPLACE VIEW signal_boxes_polygon AS
-  SELECT
-    way
-  FROM openrailwaymap_osm_polygon
-  WHERE
-    railway = 'signal_box'
-;
-
-CREATE OR REPLACE VIEW railway_signals AS
-  WITH pre_signals AS (
-    SELECT
-      way,
-      railway,
-      ref,
-      COALESCE(
-          tags->'railway:signal:combined',
-          tags->'railway:signal:main',
-          tags->'railway:signal:distant',
-          tags->'railway:signal:train_protection',
-          tags->'railway:signal:main_repeated',
-          tags->'railway:signal:minor',
-          tags->'railway:signal:passing',
-          tags->'railway:signal:shunting',
-          tags->'railway:signal:stop',
-          tags->'railway:signal:stop_demand',
-          tags->'railway:signal:station_distant',
-          tags->'railway:signal:crossing_distant',
-          tags->'railway:signal:crossing',
-          tags->'railway:signal:ring',
-          tags->'railway:signal:whistle',
-          tags->'railway:signal:departure',
-          tags->'railway:signal:main_repeated',
-          tags->'railway:signal:humping',
-          tags->'railway:signal:speed_limit'
-      ) AS feature,
-      COALESCE(
-          tags->'railway:signal:combined:deactivated',
-          tags->'railway:signal:main:deactivated',
-          tags->'railway:signal:distant:deactivated',
-          tags->'railway:signal:train_protection:deactivated',
-          tags->'railway:signal:main_repeated:deactivated',
-          tags->'railway:signal:minor:deactivated',
-          tags->'railway:signal:passing:deactivated',
-          tags->'railway:signal:shunting:deactivated',
-          tags->'railway:signal:stop:deactivated',
-          tags->'railway:signal:stop_demand:deactivated',
-          tags->'railway:signal:station_distant:deactivated',
-          tags->'railway:signal:crossing_distant:deactivated',
-          tags->'railway:signal:crossing:deactivated',
-          tags->'railway:signal:ring:deactivated',
-          tags->'railway:signal:whistle:deactivated',
-          tags->'railway:signal:departure:deactivated',
-          tags->'railway:signal:main_repeated:deactivated',
-          tags->'railway:signal:humping:deactivated',
-          tags->'railway:signal:speed_limit:deactivated'
-      ) = 'yes' AS deactivated,
-      tags->'railway:signal:passing:caption' AS passing_caption,
-      tags->'railway:signal:stop:caption' AS stop_caption,
-      tags->'railway:signal:combined:deactivated' AS combined_deactivated,
-      tags->'railway:signal:main:deactivated' AS main_deactivated,
-      tags->'railway:signal:distant:deactivated' AS distant_deactivated,
-      tags->'railway:signal:train_protection:deactivated' AS train_protection_deactivated,
-      tags->'railway:signal:main_repeated:deactivated' AS main_repeated_deactivated,
-      tags->'railway:signal:wrong_road' AS wrong_road,
-      tags->'railway:signal:wrong_road:form' AS wrong_road_form,
-      tags->'railway:signal:minor:deactivated' AS minor_deactivated,
-      tags->'railway:signal:passing:deactivated' AS passing_deactivated,
-      tags->'railway:signal:shunting:deactivated' AS shunting_deactivated,
-      tags->'railway:signal:stop:deactivated' AS stop_deactivated,
-      tags->'railway:signal:stop_demand:deactivated' AS stop_demand_deactivated,
-      tags->'railway:signal:station:distant:deactivated' AS station_distant_deactivated,
-      tags->'railway:signal:crossing:distant:deactivated' AS crossing_distant_deactivated,
-      tags->'railway:signal:crossing:deactivated' AS crossing_deactivated,
-      tags->'railway:signal:ring:deactivated' AS ring_deactivated,
-      tags->'railway:signal:whistle:deactivated' AS whistle_deactivated,
-      tags->'railway:signal:departure:deactivated' AS departure_deactivated,
-      tags->'railway:signal:combined:form' AS combined_form,
-      tags->'railway:signal:main:form' AS main_form,
-      tags->'railway:signal:distant:form' AS distant_form,
-      tags->'railway:signal:train_protection:form' AS train_protection_form,
-      tags->'railway:signal:main_repeated:form' AS main_repeated_form,
-      tags->'railway:signal:minor:form' AS minor_form,
-      tags->'railway:signal:passing:form' AS passing_form,
-      tags->'railway:signal:shunting:form' AS shunting_form,
-      tags->'railway:signal:stop:form' AS stop_form,
-      tags->'railway:signal:stop_demand:form' AS stop_demand_form,
-      tags->'railway:signal:station:distant:form' AS station_distant_form,
-      tags->'railway:signal:crossing:distant:form' AS crossing_distant_form,
-      tags->'railway:signal:crossing:form' AS crossing_form,
-      tags->'railway:signal:ring:form' AS ring_form,
-      tags->'railway:signal:whistle:form' AS whistle_form,
-      tags->'railway:signal:departure:form' AS departure_form,
-      tags->'railway:signal:humping:form' AS humping_form,
-      tags->'railway:signal:speed_limit:form' AS speed_limit_form,
-      tags->'railway:signal:combined:height' AS combined_height,
-      tags->'railway:signal:main:height' AS main_height,
-      tags->'railway:signal:distant:height' AS distant_height,
-      tags->'railway:signal:train_protection:height' AS train_protection_height,
-      tags->'railway:signal:minor:height' AS minor_height,
-      tags->'railway:signal:passing:height' AS passing_height,
-      tags->'railway:signal:shunting:height' AS shunting_height,
-      tags->'railway:signal:stop:height' AS stop_height,
-      tags->'railway:signal:stop_demand:height' AS stop_demand_height,
-      tags->'railway:signal:station:distant:height' AS station_distant_height,
-      tags->'railway:signal:crossing:distant:height' AS crossing_distant_height,
-      tags->'railway:signal:crossing:height' AS crossing_height,
-      tags->'railway:signal:ring:height' AS ring_height,
-      tags->'railway:signal:whistle:height' AS whistle_height,
-      tags->'railway:signal:departure:height' AS departure_height,
-      tags->'railway:signal:combined:states' AS combined_states,
-      tags->'railway:signal:main:states' AS main_states,
-      tags->'railway:signal:distant:states' AS distant_states,
-      tags->'railway:signal:train_protection:states' AS train_protection_states,
-      tags->'railway:signal:minor:states' AS minor_states,
-      tags->'railway:signal:passing:states' AS passing_states,
-      tags->'railway:signal:shunting:states' AS shunting_states,
-      tags->'railway:signal:stop:states' AS stop_states,
-      tags->'railway:signal:stop_demand:states' AS stop_demand_states,
-      tags->'railway:signal:station:distant:states' AS station_distant_states,
-      tags->'railway:signal:crossing:distant:states' AS crossing_distant_states,
-      tags->'railway:signal:crossing:states' AS crossing_states,
-      tags->'railway:signal:ring:states' AS ring_states,
-      tags->'railway:signal:whistle:states' AS whistle_states,
-      tags->'railway:signal:departure:states' AS departure_states,
-      tags->'railway:signal:main_repeated:states' AS main_repeated_states,
-      tags->'railway:signal:humping:states' AS humping_states,
-      tags->'railway:signal:speed_limit:states' AS speed_limit_states,
-      tags->'railway:signal:combined:repeated' AS combined_repeated,
-      tags->'railway:signal:main:repeated' AS main_repeated,
-      tags->'railway:signal:distant:repeated' AS distant_repeated,
-      tags->'railway:signal:train_protection:repeated' AS train_protection_repeated,
-      tags->'railway:signal:minor:repeated' AS minor_repeated,
-      tags->'railway:signal:passing:repeated' AS passing_repeated,
-      tags->'railway:signal:shunting:repeated' AS shunting_repeated,
-      tags->'railway:signal:stop:repeated' AS stop_repeated,
-      tags->'railway:signal:stop_demand:repeated' AS stop_demand_repeated,
-      tags->'railway:signal:station:distant:repeated' AS station_distant_repeated,
-      tags->'railway:signal:crossing:distant:repeated' AS crossing_distant_repeated,
-      tags->'railway:signal:crossing:repeated' AS crossing_repeated,
-      tags->'railway:signal:ring:repeated' AS ring_repeated,
-      tags->'railway:signal:whistle:repeated' AS whistle_repeated,
-      tags->'railway:signal:departure:repeated' AS departure_repeated,
-      tags->'railway:signal:combined:shortened' AS combined_shortened,
-      tags->'railway:signal:main:shortened' AS main_shortened,
-      tags->'railway:signal:distant:shortened' AS distant_shortened,
-      tags->'railway:signal:train_protection:shortened' AS train_protection_shortened,
-      tags->'railway:signal:minor:shortened' AS minor_shortened,
-      tags->'railway:signal:passing:shortened' AS passing_shortened,
-      tags->'railway:signal:shunting:shortened' AS shunting_shortened,
-      tags->'railway:signal:stop:shortened' AS stop_shortened,
-      tags->'railway:signal:stop_demand:shortened' AS stop_demand_shortened,
-      tags->'railway:signal:station:distant:shortened' AS station_distant_shortened,
-      tags->'railway:signal:crossing:distant:shortened' AS crossing_distant_shortened,
-      tags->'railway:signal:crossing:shortened' AS crossing_shortened,
-      tags->'railway:signal:ring:shortened' AS ring_shortened,
-      tags->'railway:signal:whistle:shortened' AS whistle_shortened,
-      tags->'railway:signal:departure:shortened' AS departure_shortened,
-      tags->'railway:signal:combined:only_transit' AS combined_only_transit,
-      tags->'railway:signal:main:only_transit' AS main_only_transit,
-      tags->'railway:signal:distant:only_transit' AS distant_only_transit,
-      tags->'railway:signal:train_protection:only_transit' AS train_protection_only_transit,
-      tags->'railway:signal:minor:only_transit' AS minor_only_transit,
-      tags->'railway:signal:passing:only_transit' AS passing_only_transit,
-      tags->'railway:signal:shunting:only_transit' AS shunting_only_transit,
-      tags->'railway:signal:stop:only_transit' AS stop_only_transit,
-      tags->'railway:signal:stop_demand:only_transit' AS stop_demand_only_transit,
-      tags->'railway:signal:station:distant:only_transit' AS station_distant_only_transit,
-      tags->'railway:signal:crossing:distant:only_transit' AS crossing_distant_only_transit,
-      tags->'railway:signal:crossing:only_transit' AS crossing_only_transit,
-      tags->'railway:signal:ring:only_transit' AS ring_only_transit,
-      tags->'railway:signal:whistle:only_transit' AS whistle_only_transit,
-      tags->'railway:signal:departure:only_transit' AS departure_only_transit,
-      tags->'railway:signal:combined:type' AS combined_type,
-      tags->'railway:signal:main:type' AS main_type,
-      tags->'railway:signal:distant:type' AS distant_type,
-      tags->'railway:signal:train_protection:type' AS train_protection_type,
-      tags->'railway:signal:minor:type' AS minor_type,
-      tags->'railway:signal:passing:type' AS passing_type,
-      tags->'railway:signal:shunting:type' AS shunting_type,
-      tags->'railway:signal:stop:type' AS stop_type,
-      tags->'railway:signal:stop_demand:type' AS stop_demand_type,
-      tags->'railway:signal:station:distant:type' AS station_distant_type,
-      tags->'railway:signal:crossing:distant:type' AS crossing_distant_type,
-      tags->'railway:signal:crossing:type' AS crossing_type,
-      tags->'railway:signal:ring:type' AS ring_type,
-      tags->'railway:signal:whistle:type' AS whistle_type,
-      tags->'railway:signal:departure:type' AS departure_type,
-      tags->'railway:signal:train_protection:shape' AS train_protection_shape,
-      tags
-    FROM openrailwaymap_osm_signals
-    WHERE
-      (railway IN ('signal', 'buffer_stop'))
-        AND "signal_direction" IS NOT NULL
-       OR railway = 'derail'
-  )
-  SELECT
-    way,
-    railway,
-    ref,
-    deactivated,
-    CASE
-
-      -- AT --
-
-      -- AT shunting light signals (Verschubverbot)
-      WHEN feature = 'AT-V2:verschubsignal' AND shunting_form = 'light' THEN 'at:verschubverbot-aufgehoben'
-
-      -- AT minor light signals (Sperrsignale) as sign
-      WHEN feature = 'AT-V2:weiterfahrt_verboten' AND minor_form = 'sign' THEN 'at:weiterfahrt-verboten'
-
-      -- AT minor light signals (Sperrsignale) as semaphore signals
-      WHEN feature = 'AT-V2:sperrsignal' AND minor_form = 'semaphore' THEN 'at:weiterfahrt-erlaubt'
-
-      -- AT distant light signals
-      WHEN feature = 'AT-V2:vorsignal' AND distant_form = 'light' THEN
-        CASE
-          WHEN distant_states ~ '^(.*;)?AT-V2:hauptsignal_frei_mit_60(;.*)?$' THEN 'at:vorsignal-hauptsignal-frei-mit-60'
-          WHEN distant_states ~ '^(.*;)?AT-V2:hauptsignal_frei_mit_(2|4)0(;.*)?$' THEN 'at:vorsignal-hauptsignal-frei-mit-40'
-          WHEN distant_states ~ '^(.*;)?AT-V2:hauptsignal_frei(;.*)?$' THEN 'at:vorsignal-hauptsignal-frei'
-          ELSE 'at:vorsignal-vorsicht'
-        END
-
-      -- AT distant semaphore signals
-      WHEN feature = 'AT-V2:vorsignal' AND distant_form = 'semaphore' THEN 'at:vorsicht-semaphore'
-
-      -- AT main light signals
-      WHEN feature = 'AT-V2:hauptsignal' AND main_form = 'light' THEN
-        CASE
-          WHEN main_states ~ '^(.*;)?AT-V2:frei_mit_60(;.*)?$' THEN 'at:hauptsignal-frei-mit-60'
-          WHEN main_states ~ '^(.*;)?AT-V2:frei_mit_(2|4)0(;.*)?$' THEN 'at:hauptsignal-frei-mit-40'
-          WHEN main_states ~ '^(.*;)?AT-V2:frei(;.*)?$' THEN 'at:hauptsignal-frei'
-          ELSE 'at:hauptsignal-halt'
-        END
-
-      -- DE --
-
-      -- DE crossing distant sign Bü 2
-      WHEN feature = 'DE-ESO:db:bü4' THEN
-        CASE
-          WHEN ring_only_transit = 'yes' THEN 'bue4-ds-only-transit'
-          ELSE 'de:bue4-ds'
-        END
-
-      -- DE whistle sign Bü 4 (DS 301)
-      WHEN feature = 'DE-ESO:bü2' THEN
-        CASE
-          WHEN  crossing_distant_shortened = 'yes' THEN 'de:bue2-ds-reduced-distance'
-          ELSE 'de:bue2-ds'
-        END
-
-      -- DE whistle sign Pf 1 (DV 301)
-      WHEN feature = 'DE-ESO:dr:pf1' THEN
-        CASE
-          WHEN ring_only_transit = 'yes' THEN 'de:pf1-dv-only-transit'
-          ELSE 'de:pf1-dv'
-        END
-
-      -- DE ring sign Bü 5
-      WHEN feature = 'DE-ESO:bü5' THEN
-        CASE
-          WHEN  ring_only_transit = 'yes' THEN 'de:bue5-only-transit'
-          ELSE 'de:bue5'
-        END
-
-      -- DE crossing signal Bü 0/1
-      WHEN feature = 'DE-ESO:bü' THEN
-        CASE
-          WHEN crossing_form = 'sign' THEN
-            CASE
-              WHEN crossing_repeated = 'yes' THEN 'de:bue0-ds-repeated'
-              WHEN crossing_shortened = 'yes' THEN 'de:bue0-ds-shortened'
-              ELSE 'de:bue0-ds'
-            END
-          WHEN crossing_repeated = 'yes' THEN 'de:bue1-ds-repeated'
-          WHEN crossing_shortened = 'yes' THEN 'de:bue1-ds-shortened'
-          ELSE 'de:bue1-ds'
-        END
-
-      -- DE crossing signal Bü 0/1 (ex. So 16a/b) which can show Bü 1 (ex. So 16b)
-      WHEN feature = 'DE-ESO:so16' AND crossing_form = 'light' THEN
-        CASE
-          WHEN crossing_repeated = 'yes' THEN 'de:bue1-dv-repeated'
-          WHEN crossing_shortened = 'yes' THEN 'de:bue1-dv-shortened'
-          ELSE 'de:bue1-dv'
-        END
-
-      -- DE tram signal "start of train protection" So 1
-      WHEN feature IN ('DE-BOStrab:so1', 'DE-AVG:so1') AND train_protection_form = 'sign' AND train_protection_type = 'start' THEN 'de:bostrab/so1'
-
-      -- DE tram signal "end of train protection" So 2
-      WHEN feature IN ('DE-BOStrab:so2', 'DE-AVG:so2') AND train_protection_form = 'sign' AND train_protection_type = 'end' THEN 'de:bostrab/so2'
-
-      -- DE station distant sign Ne 6
-      WHEN feature = 'DE-ESO:ne6' AND station_distant_form = 'sign' THEN 'de:ne6'
-
-      -- DE stop demand post Ne 5 (light)
-      WHEN feature = 'DE-ESO:ne5' AND stop_demand_form = 'light' AND stop_form IS NULL THEN 'de:ne5-light'
-
-      -- DE stop demand post Ne 5 (sign)
-      WHEN feature = 'DE-ESO:ne5' AND stop_demand_form IS NULL AND stop_form = 'sign' THEN 'de:ne5-sign'
-
-      -- DE shunting stop sign Ra 10
-      -- AT shunting stop sign "Verschubhalttafel"
-      WHEN feature IN ('DE-ESO:ra10', 'AT-V2:verschubhalttafel') AND shunting_form = 'sign' THEN 'de:ra10'
-
-      -- DE wrong road signal Zs 6 (DB) / Zs 7 (DR)
-      WHEN wrong_road = 'DE-ESO:db:zs6' AND wrong_road_form = 'sign' THEN 'de:zs6-sign'
-      WHEN wrong_road = 'DE-ESO:db:zs6' AND wrong_road_form = 'light' THEN 'de:zs6-light'
-      WHEN wrong_road = 'DE-ESO:db:zs7' AND wrong_road_form = 'light' THEN 'de:zs7-dr-light'
-
-      -- DE tram minor stop sign Sh 1
-      WHEN feature = 'DE-BOStrab:sh1' AND minor_form = 'sign' THEN 'de:bostrab/sh1'
-
-      -- DE tram passing prohibited sign So 5
-      WHEN feature = 'DE-BOStrab:so5' AND passing_form = 'sign' AND passing_type = 'no_type' THEN 'de:bostrab/so5'
-
-      -- DE tram passing prohibited end sign So 6
-      WHEN feature = 'DE-BOStrab:so6' AND passing_form = 'sign' AND passing_type = 'passing_allowed' THEN 'de:bostrab/so6'
-
-      -- DE shunting signal Ra 11 without Sh 1
-      -- AT Wartesignal ohne "Verschubverbot aufgehoben"
-      WHEN feature IN ('DE-ESO:ra11', 'AT-V2:wartesignal') AND shunting_form = 'sign' THEN 'de:ra11-sign'
-
-      -- DE shunting signal Ra 11 with Sh 1
-      WHEN feature = 'DE-ESO:ra11' AND shunting_form = 'light' THEN 'de:ra11-sh1'
-
-      -- DE shunting signal Ra 11b (without Sh 1)
-      WHEN feature = 'DE-ESO:ra11b' AND shunting_form = 'sign' THEN 'de:ra11b'
-
-      -- DE minor light signals type Sh
-      WHEN feature = 'DE-ESO:sh' AND minor_form = 'light' THEN
-        CASE
-          WHEN (minor_height = 'normal' AND (minor_states IS NULL OR minor_states ~ '^(.*;)?DE-ESO:sh1(;.*)?$'))
-            OR (minor_height IS NULL AND minor_states IS NULL)
-          THEN 'de:sh1-light-normal'
-          ELSE 'de:sh0-light-dwarf'
-        END
-
-      -- DE minor semaphore signals and signs type Sh
-      WHEN (feature = 'DE-ESO:sh' AND minor_form = 'semaphore')
-        OR (feature = 'DE-ESO:sh0' AND minor_form = 'sign')
-      THEN
-        CASE
-          WHEN minor_states ~ '^(.*;)?DE-ESO:wn7(;.*)?$' THEN 'de:wn7-semaphore-normal'
-          WHEN minor_form = 'semaphore' AND (minor_height IS NULL or minor_height = 'normal') THEN 'de:sh1-semaphore-normal'
-          ELSE 'de:sh0-semaphore-dwarf'
-        END
-
-      -- DE signal Sh 2 as signal and at buffer stops
-      WHEN feature IN ('DE-ESO:sh2', 'DE-BOStrab:sh2') THEN 'de:sh2'
-
-      -- DE Signalhaltmelder Zugleitbetrieb
-      --   repeats DE-ESO:hp0 of the entrance main signal to the halt position
-      WHEN feature = 'DE-DB:signalhaltmelder' AND main_repeated_form = 'light' THEN 'de:zlb-haltmelder-light'
-
-      -- DE main entry sign Ne 1
-      WHEN feature IN ('DE-ESO:bü2', 'AT-V2:trapeztafel') AND main_form = 'sign' THEN 'de:ne1'
-
-      -- DE distant light signals type Vr which
-      --  - are repeaters or shortened
-      --  - have no railway:signal:states=* tag
-      --  - OR have railway:signal:states=* tag that does neither include Vr1 nor Vr2
-      WHEN feature = 'DE-ESO:vr' AND distant_form = 'light' THEN
-        CASE
-          WHEN distant_shortened = 'yes' OR distant_repeated = 'yes' THEN
-          CASE
-            WHEN distant_states ~ '^(.*;)?DE-ESO:vr2(;.*)?$' THEN 'de:vr2-light-repeated'
-            WHEN distant_states ~ '^(.*;)?DE-ESO:vr1(;.*)?$' THEN 'de:vr1-light-repeated'
-            ELSE 'de:vr0-light-repeated'
-          END
-          WHEN distant_states ~ '^(.*;)?DE-ESO:vr2(;.*)?$' THEN 'de:vr2-light'
-          WHEN distant_states ~ '^(.*;)?DE-ESO:vr1(;.*)?$' THEN 'de:vr1-light'
-          ELSE 'de:vr0-light'
-        END
-
-      -- DE distant semaphore signals type Vr which
-      --  - have no railway:signal:states=* tag
-      --  - OR have railway:signal:states=* tag that does neither include Vr1 nor Vr2
-      WHEN feature = 'DE-ESO:vr' AND distant_form = 'semaphore' THEN
-        CASE
-          WHEN distant_states ~ '^(.*;)?DE-ESO:vr2(;.*)?$' THEN 'de:vr2-semaphore'
-          WHEN distant_states ~ '^(.*;)?DE-ESO:vr1(;.*)?$' THEN 'de:vr1-semaphore'
-          ELSE 'de:vr0-semaphore'
-        END
-
-      -- DE Hamburger Hochbahn distant signal
-      WHEN feature = 'DE-HHA:v' AND distant_form = 'light' THEN 'de:hha/v1'
-
-      -- DE block marker ("Blockkennzeichen")
-      -- TODO adopt flex/de/blockkennzeichen-[width]x[height]
-      WHEN feature = 'DE-ESO:blockkennzeichen' THEN 'de:blockkennzeichen'
-
-      -- DE distant signal replacement by sign So 106
-      -- AT Kreuztafel
-      WHEN feature IN ('DE-ESO:so106', 'AT-V2:kreuztafel') AND distant_form = 'sign' THEN 'de:so106'
-
-      -- DE distant signal replacement by sign Ne 2
-      WHEN feature = 'DE-ESO:db:ne2' AND distant_form = 'sign' THEN
-        CASE
-          WHEN distant_shortened = 'yes' THEN 'de:ne2-reduced-distance'
-          ELSE 'de:ne2'
-        END
-
-      -- DE main semaphore signals type Hp
-      -- AT main semaphore signal "Hauptsignal"
-      WHEN feature IN ('DE-ESO:hp', 'AT-V2:hauptsignal') AND main_form = 'semaphore' THEN
-        CASE
-          WHEN main_states ~ '^(.*;)?(DE-ESO:hp2|AT-V2:frei_mit_(4|2)0)(;.*)?$' THEN 'de:hp2-semaphore'
-          WHEN main_states ~ '^(.*;)?(DE-ESO:hp1|AT-V2:frei)(;.*)?$' THEN 'de:hp1-semaphore'
-          ELSE 'de:hp0-semaphore'
-        END
-
-      -- DE main light signals type Hp
-      WHEN feature = 'DE-ESO:hp' AND main_form = 'light' THEN
-        CASE
-          WHEN main_states ~ '^(.*;)?DE-ESO:hp2(;.*)?$' THEN 'de:hp2-light'
-          WHEN main_states ~ '^(.*;)?DE-ESO:hp1(;.*)?$' THEN 'de:hp1-light'
-          ELSE 'de:hp0-light'
-        END
-
-      -- DE main, combined and distant light signals type Hl
-      WHEN feature = 'DE-ESO:hl' AND main_form = 'light' THEN
-        CASE
-          WHEN main_form IS NULL AND distant_form = 'light' AND combined_form IS NULL THEN 'de:hl1-distant'
-          WHEN main_form = 'light' AND distant_form IS NULL AND combined_form IS NULL THEN
-            CASE
-              WHEN main_states ~ '^(.*;)?DE-ESO:hl2(;.*)?$' THEN 'de:hl2'
-              WHEN main_states ~ '^(.*;)?DE-ESO:hl3b(;.*)?$' THEN 'de:hl3b'
-              WHEN main_states ~ '^(.*;)?DE-ESO:hl3a(;.*)?$' THEN 'de:hl3a'
-              WHEN main_states ~ '^(.*;)?DE-ESO:hl1(;.*)?$' THEN 'de:hl1'
-              ELSE 'de:hl0'
-            END
-          WHEN main_form IS NULL AND distant_form IS NULL AND combined_form = 'light' THEN
-            CASE
-              WHEN combined_states ~ '^(.*;)?DE-ESO:hl11(;.*)?$' THEN 'de:hl11'
-              WHEN combined_states ~ '^(.*;)?DE-ESO:hl12b(;.*)?$' THEN 'de:hl12b'
-              WHEN combined_states ~ '^(.*;)?DE-ESO:hl12a(;.*)?$' THEN 'de:hl12a'
-              WHEN combined_states ~ '^(.*;)?DE-ESO:hl10(;.*)?$' THEN 'de:hl10'
-              ELSE 'de:hl0'
-            END
-          ELSE ''
-        END
-
-      -- DE combined light signals type Sv
-      WHEN feature = 'DE-ESO:sv' THEN
-        CASE
-          WHEN combined_states ~ '^(.*;)?DE-ESO:hp0(;.*)?$' THEN 'de:hp0'
-          WHEN combined_states ~ '^(.*;)?DE-ESO:sv0(;.*)?$' THEN 'de:sv0'
-          ELSE ''
-        END
-
-      -- DE tram main signal "Fahrsignal"
-      WHEN feature IN ('DE-AVG:f', 'DE-BOStrab:f') AND main_form = 'light' THEN
-        CASE
-          WHEN main_states ~ '^(.*;)?DE-BOStrab:f3(;.*)?$' THEN 'de:bostrab/f3'
-          WHEN main_states ~ '^(.*;)?DE-BOStrab:f2(;.*)?$' THEN 'de:bostrab/f2'
-          WHEN main_states ~ '^(.*;)?DE-BOStrab:f1(;.*)?$' THEN 'de:bostrab/f1'
-          ELSE 'de:bostrab/f0'
-        END
-
-      -- DE Hamburger Hochbahn main signal
-      WHEN feature = 'DE-HHA:h' AND main_form = 'light' THEN
-        CASE
-          WHEN main_states IS NULL THEN 'de:hha/h1'
-          ELSE 'de:hha/h0'
-        END
-
-      -- DE main, combined and distant signals type Ks
-      WHEN feature = 'DE-ESO:ks' THEN
-        CASE
-          WHEN main_form IS NULL AND distant_form = 'light' AND combined_form IS NULL THEN
-            CASE
-              WHEN distant_repeated = 'yes' THEN 'de:ks-distant-repeated'
-              WHEN distant_shortened = 'yes' THEN 'de:ks-distant-shortened'
-              ELSE 'de:ks-distant'
-            END
-          WHEN main_form = 'light' AND distant_form IS NULL AND combined_form IS NULL THEN 'ks-main'
-          WHEN main_form IS NULL AND distant_form IS NULL AND combined_form = 'light' THEN
-            CASE
-              WHEN combined_shortened = 'yes' THEN 'de:ks-combined-shortened'
-              ELSE 'de:ks-combined'
-            END
-          ELSE ''
-        END
-
-
-      -- FI --
-
-      -- FI crossing signal To
-      WHEN feature = 'FI:To' AND crossing_form = 'light' THEN 'fi:to1'
-
-      -- FI shunting light signals type Ro (new)
-      WHEN feature = 'FI:Ro' AND shunting_form = 'light' AND shunting_states ~ '^(.*;)?FI:Ro0(;.*)?$' THEN 'fi:ro0-new'
-
-      -- FI minor light signals type Lo at moveable bridges
-      WHEN feature = 'FI:Lo' AND minor_form = 'light' AND shunting_states ~ '^(.*;)?FI:Lo0(;.*)?$' THEN 'fi:lo0'
-
-      -- FI distant light signals
-      WHEN feature = 'FI:Eo' AND distant_form = 'light' AND distant_repeated != 'yes' THEN
-        CASE
-          WHEN distant_states ~ '^(.*;)?FI:Eo2(;.*)?$' THEN 'fi:eo2-new'
-          WHEN distant_states ~ '^(.*;)?FI:Eo1(;.*)?$' THEN 'fi:eo1-new'
-          ELSE 'fi:eo0-new'
-        END
-      WHEN feature = 'FI:Eo-v' AND distant_form = 'light' AND distant_repeated != 'yes' THEN
-        CASE
-          WHEN distant_states ~ '^(.*;)?FI:Eo1(;.*)?$' THEN 'fi:eo1-old'
-          ELSE 'fi:eo0-old'
-        END
-
-      -- FI main light signals
-      WHEN feature = 'FI:Po' AND main_form = 'light' THEN
-        CASE
-          WHEN main_states ~ '^(.*;)?FI:Po2(;.*)?$' THEN 'fi:po2-new'
-          WHEN main_states ~ '^(.*;)?FI:Po1(;.*)?$' THEN 'fi:po1-new'
-          ELSE 'fi:po0-new'
-        END
-      WHEN feature = 'FI:Po-v' AND main_form = 'light' THEN
-        CASE
-          WHEN main_states ~ '^(.*;)?FI:Po2(;.*)?$' THEN 'fi:po2-old'
-          WHEN main_states ~ '^(.*;)?FI:Po1(;.*)?$' THEN 'fi:po1-old'
-          ELSE 'fi:po0-old'
-        END
-
-      -- FI combined block signal type So
-      WHEN feature = 'FI:So' AND combined_form = 'light' AND combined_states ~ '^(.*;)?FI:Po1(;.*)?$' AND combined_states ~ '^(.*;)?FI:Eo1(;.*)?$' THEN 'fi:eo1-po1-combined-block'
-
-
-      -- NL --
-
-      -- NL departure signals
-      WHEN feature IN ('NL', 'NL:VL') AND departure_form = 'light' THEN 'nl:departure'
-
-      WHEN feature = 'NL' THEN
-        CASE
-          -- NL dwarf shunting signals
-          WHEN shunting_form = 'light' AND main_height = 'dwarf' THEN 'nl:main_light_dwarf_shunting'
-
-          -- NL train protection block marker light
-          WHEN train_protection_form = 'light' AND train_protection_type = 'block_marker' THEN 'nl:main_light_white_bar'
-
-          -- NL main dwarf signals
-          WHEN main_height = 'dwarf' THEN 'nl:main_light_dwarf'
-
-          -- NL main shunting light
-          WHEN shunting_form = 'light' THEN 'nl:main_light_shunting'
-
-          -- NL distant light
-          WHEN distant_form = 'light' THEN 'nl:distant_light'
-
-          -- NL main repeated light
-          WHEN (main_repeated_form = 'light' OR main_repeated_states = 'NL:272;NL:273') THEN 'nl:main_repeated_light'
-
-          -- NL (freight) speed limits
-          WHEN speed_limit_form = 'light' AND speed_limit_states = 'H;off' THEN 'nl:H'
-          WHEN speed_limit_form = 'light' AND speed_limit_states = 'L;off' THEN 'nl:L'
-          WHEN main_form = 'light' AND speed_limit_form = 'light' THEN 'nl:main_light_speed_limit'
-          WHEN distant_form = 'light' AND speed_limit_form = 'light' THEN 'nl:distant_light_speed_limit'
-
-          -- NL main light
-          WHEN main_form = 'light' THEN 'nl:main_light'
-          WHEN speed_limit_form = 'light' THEN 'nl:speed_limit_light'
-          ELSE ''
-        END
-
-      -- NL Humping ("heuvelen")
-      WHEN feature = 'NL:270' THEN 'nl:270a'
-
-      -- NL ATB codewissel
-      WHEN feature = 'NL:330' THEN 'nl:atb-codewissel'
-
-      -- NL train protection block markers
-      WHEN feature IN ('NL:227b', 'DE-ESO:ne14') AND train_protection_form = 'sign' AND train_protection_type = 'block_marker' THEN
-        CASE
-          WHEN feature = 'NL:227b' AND train_protection_shape = 'triangle' THEN 'general:etcs-stop-marker-arrow-left'
-          ELSE 'general:etcs-stop-marker-triangle-left'
-        END
-
-      ELSE ''
-    END as feature
-  FROM pre_signals
-  ORDER BY
-    -- distant signals are less important, signals for slower speeds are more important
-    (CASE
-      WHEN railway_has_key(tags, 'railway:signal:main') THEN 10000
-      WHEN railway_has_key(tags, 'railway:signal:combined') THEN 10000
-      WHEN railway_has_key(tags, 'railway:signal:distant') THEN 9000
-      WHEN railway_has_key(tags, 'railway:signal:train_protection') THEN 8500
-      WHEN railway_has_key(tags, 'railway:signal:main_repeated') THEN 8000
-      WHEN railway_has_key(tags, 'railway:signal:minor') THEN 4000
-      WHEN railway_has_key(tags, 'railway:signal:passing') THEN 3500
-      WHEN railway_has_key(tags, 'railway:signal:shunting') THEN 3000
-      WHEN railway_has_key(tags, 'railway:signal:stop') THEN 1000
-      WHEN railway_has_key(tags, 'railway:signal:stop_demand') THEN 900
-      WHEN railway_has_key(tags, 'railway:signal:station_distant') THEN 550
-      WHEN railway_has_key(tags, 'railway:signal:crossing') THEN 1000
-      WHEN railway_has_key(tags, 'railway:signal:crossing_distant') THEN 500
-      WHEN railway_has_key(tags, 'railway:signal:ring') THEN 500
-      WHEN railway_has_key(tags, 'railway:signal:whistle') THEN 500
-      WHEN railway_has_key(tags, 'railway:signal:departure') THEN 400
-      ELSE 0
-    END) ASC NULLS FIRST;
-
-CREATE OR REPLACE VIEW signal_boxes_text AS
-    (SELECT
-        ST_PointOnSurface(way) AS way,
-        tags->'railway:ref' AS ref,
-        name
-      FROM openrailwaymap_osm_polygon
-      WHERE railway = 'signal_box'
-    ORDER BY way_area DESC NULLS LAST)
-
-    UNION ALL
-
-    (SELECT
-        way,
-        tags->'railway:ref' AS ref,
-        name
-      FROM openrailwaymap_osm_point
-      WHERE railway = 'signal_box');
diff --git a/sql/tile_views.sql b/sql/tile_views.sql
new file mode 100644
index 00000000..fd1ad2e5
--- /dev/null
+++ b/sql/tile_views.sql
@@ -0,0 +1,1084 @@
+CREATE OR REPLACE VIEW railway_line_low AS
+  SELECT
+    way,
+    railway,
+    railway as feature,
+    usage,
+    highspeed,
+    NULL AS service,
+    false as tunnel,
+    false as bridge,
+    CASE
+      WHEN railway = 'rail' AND usage = 'main' AND highspeed = 'yes' THEN 2000
+      WHEN railway = 'rail' AND usage = 'main' THEN 1100
+      WHEN railway = 'rail' AND usage = 'branch' THEN 1000
+      ELSE 50
+    END AS rank
+  FROM
+    (SELECT
+       way,
+       railway,
+       usage,
+       tags->'highspeed' AS highspeed,
+       layer
+     FROM openrailwaymap_osm_line
+     WHERE railway = 'rail' AND usage IN ('main', 'branch') AND service IS NULL
+    ) AS r
+  ORDER by layer, rank NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_line_med AS
+  SELECT
+    way,
+    railway,
+    railway as feature,
+    usage,
+    highspeed,
+    NULL AS service,
+    false as tunnel,
+    false as bridge,
+    CASE
+      WHEN railway = 'rail' AND usage = 'main' AND highspeed = 'yes' THEN 2000
+      WHEN railway = 'rail' AND usage = 'main' THEN 1100
+      WHEN railway = 'rail' AND usage = 'branch' THEN 1000
+      ELSE 50
+    END AS rank
+  FROM
+    (SELECT
+        way,
+        railway,
+        usage,
+        tags->'highspeed' AS highspeed,
+        layer
+      FROM openrailwaymap_osm_line
+      WHERE railway = 'rail' AND usage IN ('main', 'branch') AND service IS NULL
+    ) AS r
+  ORDER by layer, rank NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_turntables AS
+  SELECT
+    way,
+    railway
+  FROM openrailwaymap_osm_polygon
+  WHERE railway IN ('turntable', 'traverser');
+
+CREATE OR REPLACE VIEW railway_line_fill AS
+  SELECT
+    way,
+    railway,
+    CASE
+      WHEN railway = 'proposed' THEN proposed_railway
+      WHEN railway = 'construction' THEN construction_railway
+      WHEN railway = 'razed' THEN razed_railway
+      WHEN railway = 'abandoned' THEN abandoned_railway
+      WHEN railway = 'disused' THEN disused_railway
+      ELSE railway
+    END as feature,
+    usage,
+    highspeed,
+    service,
+    (bridge IS NOT NULL AND bridge != 'no') as bridge,
+    (tunnel IS NOT NULL AND tunnel != 'no') as tunnel,
+    CASE
+      WHEN railway = 'rail' AND usage IN ('tourism', 'military', 'test') AND service IS NULL THEN 400
+        WHEN railway = 'rail' AND usage IS NULL AND service IS NULL THEN 400
+        WHEN railway = 'rail' AND usage IS NULL AND service = 'siding' THEN 870
+        WHEN railway = 'rail' AND usage IS NULL AND service = 'yard' THEN 860
+        WHEN railway = 'rail' AND usage IS NULL AND service = 'spur' THEN 880
+        WHEN railway = 'rail' AND usage IS NULL AND service = 'crossover' THEN 300
+        WHEN railway = 'rail' AND usage = 'main' AND service IS NULL AND highspeed = 'yes' THEN 2000
+        WHEN railway = 'rail' AND usage = 'main' AND service IS NULL THEN 1100
+        WHEN railway = 'rail' AND usage = 'branch' AND service IS NULL THEN 1000
+        WHEN railway = 'rail' AND usage = 'industrial' AND service IS NULL THEN 850
+        WHEN railway = 'rail' AND usage = 'industrial' AND service IN ('siding', 'spur', 'yard', 'crossover') THEN 850
+        WHEN railway IN ('preserved', 'construction') THEN 400
+        WHEN railway = 'proposed' THEN 350
+        WHEN railway = 'disused' THEN 300
+        WHEN railway = 'abandoned' THEN 250
+        WHEN railway = 'razed' THEN 200
+        ELSE 50
+      END AS rank
+  FROM
+    (SELECT
+       way, railway, usage, service, tags->'highspeed' AS highspeed,
+       tags->'disused:railway' AS disused_railway, tags->'abandoned:railway' AS abandoned_railway,
+       tags->'razed:railway' AS razed_railway, tags->'construction:railway' AS construction_railway,
+       tags->'proposed:railway' AS proposed_railway,
+       layer,
+       bridge,
+       tunnel
+     FROM openrailwaymap_osm_line
+     WHERE railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'disused', 'abandoned', 'razed', 'construction', 'proposed')
+    ) AS r
+  ORDER by layer, rank NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_text_stations_med AS
+  SELECT
+    way, railway, station,
+    CASE WHEN railway = 'station' AND station = 'light_rail' THEN 450
+         WHEN railway = 'station' AND station = 'subway' THEN 400
+         WHEN railway = 'station' THEN 800
+         WHEN railway = 'halt' AND station = 'light_rail' THEN 500
+         WHEN railway = 'halt' THEN 550
+         WHEN railway = 'tram_stop' THEN 300
+         WHEN railway = 'service_station' THEN 600
+         WHEN railway = 'yard' THEN 700
+         WHEN railway = 'junction' THEN 650
+         WHEN railway = 'spur_junction' THEN 420
+         WHEN railway = 'site' THEN 600
+         WHEN railway = 'crossover' THEN 700
+         ELSE 50
+      END AS rank,
+    label
+  FROM
+    (SELECT
+       way,
+       railway,
+       route_count,
+       tags->'station' AS station,
+       tags->'railway:ref' AS label
+     FROM stations_with_route_counts
+     WHERE railway IN ('station', 'halt', 'service_station', 'yard', 'junction', 'spur_junction', 'crossover', 'site')
+       AND (name IS NOT NULL OR tags ? 'short_name')
+    ) AS r
+  ORDER by rank DESC NULLS LAST, route_count DESC NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_text_stations_high AS
+  SELECT
+    way, railway, station,
+    CASE WHEN railway = 'station' AND station = 'light_rail' THEN 450
+         WHEN railway = 'station' AND station = 'subway' THEN 400
+         WHEN railway = 'station' THEN 800
+         WHEN railway = 'halt' AND station = 'light_rail' THEN 500
+         WHEN railway = 'halt' THEN 550
+         WHEN railway = 'tram_stop' THEN 300
+         WHEN railway = 'service_station' THEN 600
+         WHEN railway = 'yard' THEN 700
+         WHEN railway = 'junction' THEN 650
+         WHEN railway = 'spur_junction' THEN 420
+         WHEN railway = 'site' THEN 600
+         WHEN railway = 'crossover' THEN 700
+         ELSE 50
+      END AS rank,
+    label
+  FROM
+    (SELECT
+       way,
+       railway,
+       CASE
+         WHEN railway = 'tram_stop' OR (tags?'station' AND tags->'station' IN ('subway', 'light_rail', 'miniature')) THEN route_count / 2
+         WHEN railway IN ('station', 'service_station', 'yard') AND route_count < 4 THEN 4::int
+         WHEN railway IN ('halt', 'junction') AND route_count < 2 THEN 2::int
+         ELSE route_count::int
+         END AS route_count,
+       tags->'station' AS station,
+       COALESCE(tags->'short_name', name) AS label
+     FROM stations_with_route_counts
+     WHERE railway IN ('station', 'halt', 'service_station', 'yard', 'junction', 'spur_junction', 'crossover', 'site', 'tram_stop')
+       AND (name IS NOT NULL OR tags ? 'short_name')
+    ) AS r
+  ORDER by rank DESC NULLS LAST, route_count DESC NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_symbols AS
+  SELECT
+    way,
+    railway,
+    man_made,
+    CASE
+      WHEN railway = 'crossing' THEN -1::int
+      WHEN railway = 'tram_stop' THEN 1::int
+      ELSE 0
+    END AS prio
+  FROM openrailwaymap_osm_point
+  WHERE railway IN ('crossing', 'level_crossing', 'phone', 'tram_stop', 'border', 'owner_change', 'radio')
+  ORDER BY prio DESC;
+
+CREATE OR REPLACE VIEW railway_text_med AS
+  SELECT
+    way,
+    railway,
+    usage,
+    service,
+    CASE
+      WHEN railway = 'proposed' THEN proposed_railway
+      WHEN railway = 'construction' THEN construction_railway
+      WHEN railway = 'razed' THEN razed_railway
+      WHEN railway = 'abandoned' THEN abandoned_railway
+      WHEN railway = 'disused' THEN disused_railway
+      ELSE railway
+    END as feature,
+    CASE WHEN railway = 'rail' AND usage IN ('tourism', 'military', 'test') AND service IS NULL THEN 400
+         WHEN railway = 'rail' AND usage IS NULL AND service IS NULL THEN 400
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'siding' THEN 870
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'yard' THEN 860
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'spur' THEN 880
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'crossover' THEN 300
+         WHEN railway = 'rail' AND usage = 'main' AND service IS NULL AND highspeed = 'yes' THEN 2000
+         WHEN railway = 'rail' AND usage = 'main' AND service IS NULL THEN 1100
+         WHEN railway = 'rail' AND usage = 'branch' AND service IS NULL THEN 1000
+         WHEN railway = 'rail' AND usage = 'industrial' AND service IS NULL THEN 850
+         WHEN railway = 'rail' AND usage = 'industrial' AND service IN ('siding', 'spur', 'yard', 'crossover') THEN 850
+         WHEN railway IN ('preserved', 'construction') THEN 400
+         WHEN railway = 'proposed' THEN 350
+         WHEN railway = 'disused' THEN 300
+         WHEN railway = 'abandoned' THEN 250
+         WHEN railway = 'razed' THEN 200
+
+         ELSE 50
+      END AS rank,
+    ref AS label
+  FROM
+    (SELECT
+       way, railway, usage, service, tags->'highspeed' AS highspeed,
+       tags->'disused:railway' AS disused_railway, tags->'abandoned:railway' AS abandoned_railway,
+       tags->'razed:railway' AS razed_railway, tags->'construction:railway' AS construction_railway,
+       tags->'proposed:railway' AS proposed_railway,
+       ref,
+       layer
+     FROM openrailwaymap_osm_line
+     WHERE railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'disused', 'abandoned', 'razed', 'construction', 'proposed') AND (tunnel IS NULL OR tunnel = 'no')
+    ) AS r
+  ORDER by layer, rank NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_text_high AS
+  SELECT
+    way,
+    railway,
+    usage,
+    service,
+    CASE
+      WHEN railway = 'proposed' THEN proposed_railway
+      WHEN railway = 'construction' THEN construction_railway
+      WHEN railway = 'razed' THEN razed_railway
+      WHEN railway = 'abandoned' THEN abandoned_railway
+      WHEN railway = 'disused' THEN disused_railway
+      ELSE railway
+    END as feature,
+    CASE WHEN railway = 'rail' AND usage IN ('tourism', 'military', 'test') AND service IS NULL THEN 400
+         WHEN railway = 'rail' AND usage IS NULL AND service IS NULL THEN 400
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'siding' THEN 870
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'yard' THEN 860
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'spur' THEN 880
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'crossover' THEN 300
+         WHEN railway = 'rail' AND usage = 'main' AND service IS NULL AND highspeed = 'yes' THEN 2000
+         WHEN railway = 'rail' AND usage = 'main' AND service IS NULL THEN 1100
+         WHEN railway = 'rail' AND usage = 'branch' AND service IS NULL THEN 1000
+         WHEN railway = 'rail' AND usage = 'industrial' AND service IS NULL THEN 850
+         WHEN railway = 'rail' AND usage = 'industrial' AND service IN ('siding', 'spur', 'yard', 'crossover') THEN 850
+         WHEN railway IN ('preserved', 'construction') THEN 400
+         WHEN railway = 'proposed' THEN 350
+         WHEN railway = 'disused' THEN 300
+         WHEN railway = 'abandoned' THEN 250
+         WHEN railway = 'razed' THEN 200
+         ELSE 50
+      END AS rank,
+    CASE
+      WHEN ref IS NOT NULL AND label_name IS NOT NULL THEN ref || ' ' || label_name
+      ELSE COALESCE(ref, label_name)
+      END AS label
+  FROM
+    (SELECT
+       way, railway, usage, service, tags->'highspeed' AS highspeed,
+       tags->'disused:railway' AS disused_railway, tags->'abandoned:railway' AS abandoned_railway,
+       tags->'razed:railway' AS razed_railway, tags->'construction:railway' AS construction_railway,
+       tags->'proposed:railway' AS proposed_railway,
+       tags, tunnel, bridge,
+       ref,
+       CASE
+         WHEN railway = 'abandoned' THEN
+           railway_label_name(COALESCE(tags->'abandoned:name',name), tags, tunnel, bridge)
+         WHEN railway = 'razed' THEN
+           railway_label_name(COALESCE(tags->'razed:name',name), tags, tunnel, bridge)
+         ELSE railway_label_name(name, tags, tunnel, bridge)
+         END AS label_name,
+       layer
+     FROM openrailwaymap_osm_line
+     WHERE
+       railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'disused', 'abandoned', 'razed', 'construction', 'proposed')
+       AND (ref IS NOT NULL OR name IS NOT NULL OR tags ? 'bridge:name' OR tags ? 'tunnel:name')
+    ) AS r
+  ORDER by layer, rank NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_text_km_med AS
+  SELECT
+    way,
+    railway,
+    pos
+  FROM
+    (SELECT
+       way,
+       railway,
+       COALESCE(railway_position, railway_pos_round(railway_position_detail)::text) AS pos
+     FROM openrailwaymap_osm_point
+     WHERE railway IN ('milestone', 'level_crossing', 'crossing')
+       AND (railway_position IS NOT NULL OR railway_position_detail IS NOT NULL)
+    ) AS r
+  WHERE railway_pos_decimal(pos) = '0';
+
+CREATE OR REPLACE VIEW railway_text_km_high AS
+  SELECT
+    way,
+    railway,
+    pos
+  FROM
+    (SELECT
+       way,
+       railway,
+       COALESCE(railway_position, railway_pos_round(railway_position_detail)::text) AS pos
+     FROM openrailwaymap_osm_point
+     WHERE railway IN ('milestone', 'level_crossing', 'crossing')
+       AND (railway_position IS NOT NULL OR railway_position_detail IS NOT NULL)
+    ) AS r
+  WHERE pos IS NOT NULL
+  ORDER by (railway_pos_decimal(pos) = '0');
+
+CREATE OR REPLACE VIEW railway_switch_ref AS
+  SELECT
+    way, railway, ref, railway_local_operated
+  FROM openrailwaymap_osm_point
+  WHERE railway IN ('switch', 'railway_crossing') AND ref IS NOT NULL
+  ORDER by char_length(ref) ASC;
+
+CREATE OR REPLACE VIEW railway_text_detail AS
+  SELECT
+    way,
+    railway,
+    usage,
+    service,
+    CASE
+      WHEN railway = 'proposed' THEN proposed_railway
+      WHEN railway = 'construction' THEN construction_railway
+      WHEN railway = 'razed' THEN razed_railway
+      WHEN railway = 'abandoned' THEN abandoned_railway
+      WHEN railway = 'disused' THEN disused_railway
+      ELSE railway
+    END as feature,
+    CASE WHEN railway = 'rail' AND usage IN ('tourism', 'military', 'test') AND service IS NULL THEN 400
+         WHEN railway = 'rail' AND usage IS NULL AND service IS NULL THEN 400
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'siding' THEN 870
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'yard' THEN 860
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'spur' THEN 880
+         WHEN railway = 'rail' AND usage IS NULL AND service = 'crossover' THEN 300
+         WHEN railway = 'rail' AND usage = 'main' AND service IS NULL AND highspeed = 'yes' THEN 2000
+         WHEN railway = 'rail' AND usage = 'main' AND service IS NULL THEN 1100
+         WHEN railway = 'rail' AND usage = 'branch' AND service IS NULL THEN 1000
+         WHEN railway = 'rail' AND usage = 'industrial' AND service IS NULL THEN 850
+         WHEN railway = 'rail' AND usage = 'industrial' AND service IN ('siding', 'spur', 'yard', 'crossover') THEN 850
+         WHEN railway IN ('preserved', 'construction') THEN 400
+         WHEN railway = 'proposed' THEN 350
+         WHEN railway = 'disused' THEN 300
+         WHEN railway = 'abandoned' THEN 250
+         WHEN railway = 'razed' THEN 200
+         ELSE 50
+      END AS rank,
+    CASE
+      WHEN ref IS NOT NULL AND label_name IS NOT NULL THEN ref || ' ' || label_name
+      ELSE COALESCE(ref, label_name)
+    END AS label,
+    track_ref
+  FROM
+    (SELECT
+       way, railway, usage, service, tags->'highspeed' AS highspeed,
+       tags->'disused' AS disused, tags->'abandoned' AS abandoned, tags->'razed' AS razed, construction, tags->'proposed' AS proposed,
+       tags->'disused:railway' AS disused_railway, tags->'abandoned:railway' AS abandoned_railway,
+       tags->'razed:railway' AS razed_railway, tags->'construction:railway' AS construction_railway,
+       tags->'proposed:railway' AS proposed_railway,
+       tags,
+       name, ref,
+       tags->'railway:track_ref' AS track_ref,
+       tunnel, bridge,
+       CASE
+         WHEN railway = 'abandoned' THEN
+           railway_label_name(COALESCE(tags->'abandoned:name',name), tags, tunnel, bridge)
+         WHEN railway = 'razed' THEN
+           railway_label_name(COALESCE(tags->'razed:name',name), tags, tunnel, bridge)
+         ELSE railway_label_name(name, tags, tunnel, bridge)
+         END AS label_name,
+       layer
+     FROM openrailwaymap_osm_line
+     WHERE
+       railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'disused', 'abandoned', 'razed', 'construction', 'proposed')
+       AND (ref IS NOT NULL OR name IS NOT NULL OR tags ? 'bridge:name' OR tags ? 'tunnel:name' OR tags ? 'railway:track_ref')
+    ) AS r
+  ORDER by layer, rank NULLS LAST;
+
+CREATE OR REPLACE VIEW railway_line AS
+  SELECT
+    way,
+    railway,
+    usage,
+    service,
+    layer,
+    CASE
+      WHEN railway = 'construction' THEN tags->'construction:railway'
+      WHEN railway = 'disused' THEN tags->'disused:railway'
+      WHEN railway = 'preserved' THEN tags->'preserved:railway'
+      ELSE railway
+    END as feature,
+    railway_train_protection_rank(
+      tags->'railway:pzb',
+      railway_null_to_no(tags->'railway:lzb'),
+      tags->'railway:atb',
+      tags->'railway:atb-eg',
+      tags->'railway:atb-ng',
+      tags->'railway:atb-vv',
+      tags->'railway:atc',
+      tags->'railway:kvb',
+      tags->'railway:tvm',
+      tags->'railway:scmt',
+      tags->'railway:asfa',
+      railway_null_or_zero_to_no(tags->'railway:ptc'),
+      tags->'railway:zsi127',
+      railway_null_or_zero_to_no(tags->'railway:etcs'),
+      railway_null_or_zero_to_no(tags->'construction:railway:etcs')
+    ) as rank,
+    CASE
+      WHEN railway_null_or_zero_to_no(tags->'railway:etcs') != 'no' THEN 'etcs'
+      WHEN railway_null_or_zero_to_no(tags->'railway:ptc') != 'no' THEN 'ptc'
+      WHEN railway_null_or_zero_to_no(tags->'construction:railway:etcs') != 'no' THEN 'construction_etcs'
+      WHEN tags->'railway:asfa' = 'yes' THEN 'asfa'
+      WHEN tags->'railway:scmt' = 'yes' THEN 'scmt'
+      WHEN railway_null_or_zero_to_no(tags->'railway:tvm') != 'no' THEN 'tvm'
+      WHEN tags->'railway:kvb' = 'yes' THEN 'kvb'
+      WHEN tags->'railway:atc' = 'yes' THEN 'atc'
+      WHEN COALESCE(tags->'railway:atb', tags->'railway:atb-eg', tags->'railway:atb-ng', tags->'railway:atb-vv') = 'yes' THEN 'atb'
+      WHEN tags->'railway:zsi127' = 'yes' THEN 'zsi127'
+      WHEN tags->'railway:lzb' = 'yes' THEN 'lzb'
+      WHEN tags->'railway:pzb' = 'yes' THEN 'pzb'
+      WHEN (tags->'railway:pzb' = 'no' AND tags->'railway:lzb' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:atb' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:atc' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:scmt' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:asfa' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:kvb' = 'no' AND tags->'railway:tvm' = 'no' AND tags->'railway:etcs' = 'no') OR (tags->'railway:zsi127' = 'no') THEN 'other'
+    END as train_protection
+    FROM openrailwaymap_osm_line
+    WHERE railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'disused', 'preserved', 'construction')
+    ORDER BY
+      COALESCE(layer, 0),
+      rank NULLS LAST;
+
+CREATE OR REPLACE VIEW signal_boxes_point AS
+  SELECT
+    way
+  FROM (
+    SELECT
+        way
+      FROM openrailwaymap_osm_point
+      WHERE railway = 'signal_box'
+  ) AS boxes;
+
+CREATE OR REPLACE VIEW signal_boxes_polygon AS
+  SELECT
+    way
+  FROM openrailwaymap_osm_polygon
+  WHERE
+    railway = 'signal_box'
+;
+
+CREATE OR REPLACE VIEW railway_signals AS
+  WITH pre_signals AS (
+    SELECT
+      way,
+      railway,
+      ref,
+      COALESCE(
+          tags->'railway:signal:combined',
+          tags->'railway:signal:main',
+          tags->'railway:signal:distant',
+          tags->'railway:signal:train_protection',
+          tags->'railway:signal:main_repeated',
+          tags->'railway:signal:minor',
+          tags->'railway:signal:passing',
+          tags->'railway:signal:shunting',
+          tags->'railway:signal:stop',
+          tags->'railway:signal:stop_demand',
+          tags->'railway:signal:station_distant',
+          tags->'railway:signal:crossing_distant',
+          tags->'railway:signal:crossing',
+          tags->'railway:signal:ring',
+          tags->'railway:signal:whistle',
+          tags->'railway:signal:departure',
+          tags->'railway:signal:main_repeated',
+          tags->'railway:signal:humping',
+          tags->'railway:signal:speed_limit'
+      ) AS feature,
+      COALESCE(
+          tags->'railway:signal:combined:deactivated',
+          tags->'railway:signal:main:deactivated',
+          tags->'railway:signal:distant:deactivated',
+          tags->'railway:signal:train_protection:deactivated',
+          tags->'railway:signal:main_repeated:deactivated',
+          tags->'railway:signal:minor:deactivated',
+          tags->'railway:signal:passing:deactivated',
+          tags->'railway:signal:shunting:deactivated',
+          tags->'railway:signal:stop:deactivated',
+          tags->'railway:signal:stop_demand:deactivated',
+          tags->'railway:signal:station_distant:deactivated',
+          tags->'railway:signal:crossing_distant:deactivated',
+          tags->'railway:signal:crossing:deactivated',
+          tags->'railway:signal:ring:deactivated',
+          tags->'railway:signal:whistle:deactivated',
+          tags->'railway:signal:departure:deactivated',
+          tags->'railway:signal:main_repeated:deactivated',
+          tags->'railway:signal:humping:deactivated',
+          tags->'railway:signal:speed_limit:deactivated'
+      ) = 'yes' AS deactivated,
+      tags->'railway:signal:passing:caption' AS passing_caption,
+      tags->'railway:signal:stop:caption' AS stop_caption,
+      tags->'railway:signal:combined:deactivated' AS combined_deactivated,
+      tags->'railway:signal:main:deactivated' AS main_deactivated,
+      tags->'railway:signal:distant:deactivated' AS distant_deactivated,
+      tags->'railway:signal:train_protection:deactivated' AS train_protection_deactivated,
+      tags->'railway:signal:main_repeated:deactivated' AS main_repeated_deactivated,
+      tags->'railway:signal:wrong_road' AS wrong_road,
+      tags->'railway:signal:wrong_road:form' AS wrong_road_form,
+      tags->'railway:signal:minor:deactivated' AS minor_deactivated,
+      tags->'railway:signal:passing:deactivated' AS passing_deactivated,
+      tags->'railway:signal:shunting:deactivated' AS shunting_deactivated,
+      tags->'railway:signal:stop:deactivated' AS stop_deactivated,
+      tags->'railway:signal:stop_demand:deactivated' AS stop_demand_deactivated,
+      tags->'railway:signal:station:distant:deactivated' AS station_distant_deactivated,
+      tags->'railway:signal:crossing:distant:deactivated' AS crossing_distant_deactivated,
+      tags->'railway:signal:crossing:deactivated' AS crossing_deactivated,
+      tags->'railway:signal:ring:deactivated' AS ring_deactivated,
+      tags->'railway:signal:whistle:deactivated' AS whistle_deactivated,
+      tags->'railway:signal:departure:deactivated' AS departure_deactivated,
+      tags->'railway:signal:combined:form' AS combined_form,
+      tags->'railway:signal:main:form' AS main_form,
+      tags->'railway:signal:distant:form' AS distant_form,
+      tags->'railway:signal:train_protection:form' AS train_protection_form,
+      tags->'railway:signal:main_repeated:form' AS main_repeated_form,
+      tags->'railway:signal:minor:form' AS minor_form,
+      tags->'railway:signal:passing:form' AS passing_form,
+      tags->'railway:signal:shunting:form' AS shunting_form,
+      tags->'railway:signal:stop:form' AS stop_form,
+      tags->'railway:signal:stop_demand:form' AS stop_demand_form,
+      tags->'railway:signal:station:distant:form' AS station_distant_form,
+      tags->'railway:signal:crossing:distant:form' AS crossing_distant_form,
+      tags->'railway:signal:crossing:form' AS crossing_form,
+      tags->'railway:signal:ring:form' AS ring_form,
+      tags->'railway:signal:whistle:form' AS whistle_form,
+      tags->'railway:signal:departure:form' AS departure_form,
+      tags->'railway:signal:humping:form' AS humping_form,
+      tags->'railway:signal:speed_limit:form' AS speed_limit_form,
+      tags->'railway:signal:combined:height' AS combined_height,
+      tags->'railway:signal:main:height' AS main_height,
+      tags->'railway:signal:distant:height' AS distant_height,
+      tags->'railway:signal:train_protection:height' AS train_protection_height,
+      tags->'railway:signal:minor:height' AS minor_height,
+      tags->'railway:signal:passing:height' AS passing_height,
+      tags->'railway:signal:shunting:height' AS shunting_height,
+      tags->'railway:signal:stop:height' AS stop_height,
+      tags->'railway:signal:stop_demand:height' AS stop_demand_height,
+      tags->'railway:signal:station:distant:height' AS station_distant_height,
+      tags->'railway:signal:crossing:distant:height' AS crossing_distant_height,
+      tags->'railway:signal:crossing:height' AS crossing_height,
+      tags->'railway:signal:ring:height' AS ring_height,
+      tags->'railway:signal:whistle:height' AS whistle_height,
+      tags->'railway:signal:departure:height' AS departure_height,
+      tags->'railway:signal:combined:states' AS combined_states,
+      tags->'railway:signal:main:states' AS main_states,
+      tags->'railway:signal:distant:states' AS distant_states,
+      tags->'railway:signal:train_protection:states' AS train_protection_states,
+      tags->'railway:signal:minor:states' AS minor_states,
+      tags->'railway:signal:passing:states' AS passing_states,
+      tags->'railway:signal:shunting:states' AS shunting_states,
+      tags->'railway:signal:stop:states' AS stop_states,
+      tags->'railway:signal:stop_demand:states' AS stop_demand_states,
+      tags->'railway:signal:station:distant:states' AS station_distant_states,
+      tags->'railway:signal:crossing:distant:states' AS crossing_distant_states,
+      tags->'railway:signal:crossing:states' AS crossing_states,
+      tags->'railway:signal:ring:states' AS ring_states,
+      tags->'railway:signal:whistle:states' AS whistle_states,
+      tags->'railway:signal:departure:states' AS departure_states,
+      tags->'railway:signal:main_repeated:states' AS main_repeated_states,
+      tags->'railway:signal:humping:states' AS humping_states,
+      tags->'railway:signal:speed_limit:states' AS speed_limit_states,
+      tags->'railway:signal:combined:repeated' AS combined_repeated,
+      tags->'railway:signal:main:repeated' AS main_repeated,
+      tags->'railway:signal:distant:repeated' AS distant_repeated,
+      tags->'railway:signal:train_protection:repeated' AS train_protection_repeated,
+      tags->'railway:signal:minor:repeated' AS minor_repeated,
+      tags->'railway:signal:passing:repeated' AS passing_repeated,
+      tags->'railway:signal:shunting:repeated' AS shunting_repeated,
+      tags->'railway:signal:stop:repeated' AS stop_repeated,
+      tags->'railway:signal:stop_demand:repeated' AS stop_demand_repeated,
+      tags->'railway:signal:station:distant:repeated' AS station_distant_repeated,
+      tags->'railway:signal:crossing:distant:repeated' AS crossing_distant_repeated,
+      tags->'railway:signal:crossing:repeated' AS crossing_repeated,
+      tags->'railway:signal:ring:repeated' AS ring_repeated,
+      tags->'railway:signal:whistle:repeated' AS whistle_repeated,
+      tags->'railway:signal:departure:repeated' AS departure_repeated,
+      tags->'railway:signal:combined:shortened' AS combined_shortened,
+      tags->'railway:signal:main:shortened' AS main_shortened,
+      tags->'railway:signal:distant:shortened' AS distant_shortened,
+      tags->'railway:signal:train_protection:shortened' AS train_protection_shortened,
+      tags->'railway:signal:minor:shortened' AS minor_shortened,
+      tags->'railway:signal:passing:shortened' AS passing_shortened,
+      tags->'railway:signal:shunting:shortened' AS shunting_shortened,
+      tags->'railway:signal:stop:shortened' AS stop_shortened,
+      tags->'railway:signal:stop_demand:shortened' AS stop_demand_shortened,
+      tags->'railway:signal:station:distant:shortened' AS station_distant_shortened,
+      tags->'railway:signal:crossing:distant:shortened' AS crossing_distant_shortened,
+      tags->'railway:signal:crossing:shortened' AS crossing_shortened,
+      tags->'railway:signal:ring:shortened' AS ring_shortened,
+      tags->'railway:signal:whistle:shortened' AS whistle_shortened,
+      tags->'railway:signal:departure:shortened' AS departure_shortened,
+      tags->'railway:signal:combined:only_transit' AS combined_only_transit,
+      tags->'railway:signal:main:only_transit' AS main_only_transit,
+      tags->'railway:signal:distant:only_transit' AS distant_only_transit,
+      tags->'railway:signal:train_protection:only_transit' AS train_protection_only_transit,
+      tags->'railway:signal:minor:only_transit' AS minor_only_transit,
+      tags->'railway:signal:passing:only_transit' AS passing_only_transit,
+      tags->'railway:signal:shunting:only_transit' AS shunting_only_transit,
+      tags->'railway:signal:stop:only_transit' AS stop_only_transit,
+      tags->'railway:signal:stop_demand:only_transit' AS stop_demand_only_transit,
+      tags->'railway:signal:station:distant:only_transit' AS station_distant_only_transit,
+      tags->'railway:signal:crossing:distant:only_transit' AS crossing_distant_only_transit,
+      tags->'railway:signal:crossing:only_transit' AS crossing_only_transit,
+      tags->'railway:signal:ring:only_transit' AS ring_only_transit,
+      tags->'railway:signal:whistle:only_transit' AS whistle_only_transit,
+      tags->'railway:signal:departure:only_transit' AS departure_only_transit,
+      tags->'railway:signal:combined:type' AS combined_type,
+      tags->'railway:signal:main:type' AS main_type,
+      tags->'railway:signal:distant:type' AS distant_type,
+      tags->'railway:signal:train_protection:type' AS train_protection_type,
+      tags->'railway:signal:minor:type' AS minor_type,
+      tags->'railway:signal:passing:type' AS passing_type,
+      tags->'railway:signal:shunting:type' AS shunting_type,
+      tags->'railway:signal:stop:type' AS stop_type,
+      tags->'railway:signal:stop_demand:type' AS stop_demand_type,
+      tags->'railway:signal:station:distant:type' AS station_distant_type,
+      tags->'railway:signal:crossing:distant:type' AS crossing_distant_type,
+      tags->'railway:signal:crossing:type' AS crossing_type,
+      tags->'railway:signal:ring:type' AS ring_type,
+      tags->'railway:signal:whistle:type' AS whistle_type,
+      tags->'railway:signal:departure:type' AS departure_type,
+      tags->'railway:signal:train_protection:shape' AS train_protection_shape,
+      tags
+    FROM openrailwaymap_osm_signals
+    WHERE
+      (railway IN ('signal', 'buffer_stop'))
+        AND "signal_direction" IS NOT NULL
+       OR railway = 'derail'
+  )
+  SELECT
+    way,
+    railway,
+    ref,
+    deactivated,
+    CASE
+
+      -- AT --
+
+      -- AT shunting light signals (Verschubverbot)
+      WHEN feature = 'AT-V2:verschubsignal' AND shunting_form = 'light' THEN 'at:verschubverbot-aufgehoben'
+
+      -- AT minor light signals (Sperrsignale) as sign
+      WHEN feature = 'AT-V2:weiterfahrt_verboten' AND minor_form = 'sign' THEN 'at:weiterfahrt-verboten'
+
+      -- AT minor light signals (Sperrsignale) as semaphore signals
+      WHEN feature = 'AT-V2:sperrsignal' AND minor_form = 'semaphore' THEN 'at:weiterfahrt-erlaubt'
+
+      -- AT distant light signals
+      WHEN feature = 'AT-V2:vorsignal' AND distant_form = 'light' THEN
+        CASE
+          WHEN distant_states ~ '^(.*;)?AT-V2:hauptsignal_frei_mit_60(;.*)?$' THEN 'at:vorsignal-hauptsignal-frei-mit-60'
+          WHEN distant_states ~ '^(.*;)?AT-V2:hauptsignal_frei_mit_(2|4)0(;.*)?$' THEN 'at:vorsignal-hauptsignal-frei-mit-40'
+          WHEN distant_states ~ '^(.*;)?AT-V2:hauptsignal_frei(;.*)?$' THEN 'at:vorsignal-hauptsignal-frei'
+          ELSE 'at:vorsignal-vorsicht'
+        END
+
+      -- AT distant semaphore signals
+      WHEN feature = 'AT-V2:vorsignal' AND distant_form = 'semaphore' THEN 'at:vorsicht-semaphore'
+
+      -- AT main light signals
+      WHEN feature = 'AT-V2:hauptsignal' AND main_form = 'light' THEN
+        CASE
+          WHEN main_states ~ '^(.*;)?AT-V2:frei_mit_60(;.*)?$' THEN 'at:hauptsignal-frei-mit-60'
+          WHEN main_states ~ '^(.*;)?AT-V2:frei_mit_(2|4)0(;.*)?$' THEN 'at:hauptsignal-frei-mit-40'
+          WHEN main_states ~ '^(.*;)?AT-V2:frei(;.*)?$' THEN 'at:hauptsignal-frei'
+          ELSE 'at:hauptsignal-halt'
+        END
+
+      -- DE --
+
+      -- DE crossing distant sign Bü 2
+      WHEN feature = 'DE-ESO:db:bü4' THEN
+        CASE
+          WHEN ring_only_transit = 'yes' THEN 'bue4-ds-only-transit'
+          ELSE 'de:bue4-ds'
+        END
+
+      -- DE whistle sign Bü 4 (DS 301)
+      WHEN feature = 'DE-ESO:bü2' THEN
+        CASE
+          WHEN  crossing_distant_shortened = 'yes' THEN 'de:bue2-ds-reduced-distance'
+          ELSE 'de:bue2-ds'
+        END
+
+      -- DE whistle sign Pf 1 (DV 301)
+      WHEN feature = 'DE-ESO:dr:pf1' THEN
+        CASE
+          WHEN ring_only_transit = 'yes' THEN 'de:pf1-dv-only-transit'
+          ELSE 'de:pf1-dv'
+        END
+
+      -- DE ring sign Bü 5
+      WHEN feature = 'DE-ESO:bü5' THEN
+        CASE
+          WHEN  ring_only_transit = 'yes' THEN 'de:bue5-only-transit'
+          ELSE 'de:bue5'
+        END
+
+      -- DE crossing signal Bü 0/1
+      WHEN feature = 'DE-ESO:bü' THEN
+        CASE
+          WHEN crossing_form = 'sign' THEN
+            CASE
+              WHEN crossing_repeated = 'yes' THEN 'de:bue0-ds-repeated'
+              WHEN crossing_shortened = 'yes' THEN 'de:bue0-ds-shortened'
+              ELSE 'de:bue0-ds'
+            END
+          WHEN crossing_repeated = 'yes' THEN 'de:bue1-ds-repeated'
+          WHEN crossing_shortened = 'yes' THEN 'de:bue1-ds-shortened'
+          ELSE 'de:bue1-ds'
+        END
+
+      -- DE crossing signal Bü 0/1 (ex. So 16a/b) which can show Bü 1 (ex. So 16b)
+      WHEN feature = 'DE-ESO:so16' AND crossing_form = 'light' THEN
+        CASE
+          WHEN crossing_repeated = 'yes' THEN 'de:bue1-dv-repeated'
+          WHEN crossing_shortened = 'yes' THEN 'de:bue1-dv-shortened'
+          ELSE 'de:bue1-dv'
+        END
+
+      -- DE tram signal "start of train protection" So 1
+      WHEN feature IN ('DE-BOStrab:so1', 'DE-AVG:so1') AND train_protection_form = 'sign' AND train_protection_type = 'start' THEN 'de:bostrab/so1'
+
+      -- DE tram signal "end of train protection" So 2
+      WHEN feature IN ('DE-BOStrab:so2', 'DE-AVG:so2') AND train_protection_form = 'sign' AND train_protection_type = 'end' THEN 'de:bostrab/so2'
+
+      -- DE station distant sign Ne 6
+      WHEN feature = 'DE-ESO:ne6' AND station_distant_form = 'sign' THEN 'de:ne6'
+
+      -- DE stop demand post Ne 5 (light)
+      WHEN feature = 'DE-ESO:ne5' AND stop_demand_form = 'light' AND stop_form IS NULL THEN 'de:ne5-light'
+
+      -- DE stop demand post Ne 5 (sign)
+      WHEN feature = 'DE-ESO:ne5' AND stop_demand_form IS NULL AND stop_form = 'sign' THEN 'de:ne5-sign'
+
+      -- DE shunting stop sign Ra 10
+      -- AT shunting stop sign "Verschubhalttafel"
+      WHEN feature IN ('DE-ESO:ra10', 'AT-V2:verschubhalttafel') AND shunting_form = 'sign' THEN 'de:ra10'
+
+      -- DE wrong road signal Zs 6 (DB) / Zs 7 (DR)
+      WHEN wrong_road = 'DE-ESO:db:zs6' AND wrong_road_form = 'sign' THEN 'de:zs6-sign'
+      WHEN wrong_road = 'DE-ESO:db:zs6' AND wrong_road_form = 'light' THEN 'de:zs6-light'
+      WHEN wrong_road = 'DE-ESO:db:zs7' AND wrong_road_form = 'light' THEN 'de:zs7-dr-light'
+
+      -- DE tram minor stop sign Sh 1
+      WHEN feature = 'DE-BOStrab:sh1' AND minor_form = 'sign' THEN 'de:bostrab/sh1'
+
+      -- DE tram passing prohibited sign So 5
+      WHEN feature = 'DE-BOStrab:so5' AND passing_form = 'sign' AND passing_type = 'no_type' THEN 'de:bostrab/so5'
+
+      -- DE tram passing prohibited end sign So 6
+      WHEN feature = 'DE-BOStrab:so6' AND passing_form = 'sign' AND passing_type = 'passing_allowed' THEN 'de:bostrab/so6'
+
+      -- DE shunting signal Ra 11 without Sh 1
+      -- AT Wartesignal ohne "Verschubverbot aufgehoben"
+      WHEN feature IN ('DE-ESO:ra11', 'AT-V2:wartesignal') AND shunting_form = 'sign' THEN 'de:ra11-sign'
+
+      -- DE shunting signal Ra 11 with Sh 1
+      WHEN feature = 'DE-ESO:ra11' AND shunting_form = 'light' THEN 'de:ra11-sh1'
+
+      -- DE shunting signal Ra 11b (without Sh 1)
+      WHEN feature = 'DE-ESO:ra11b' AND shunting_form = 'sign' THEN 'de:ra11b'
+
+      -- DE minor light signals type Sh
+      WHEN feature = 'DE-ESO:sh' AND minor_form = 'light' THEN
+        CASE
+          WHEN (minor_height = 'normal' AND (minor_states IS NULL OR minor_states ~ '^(.*;)?DE-ESO:sh1(;.*)?$'))
+            OR (minor_height IS NULL AND minor_states IS NULL)
+          THEN 'de:sh1-light-normal'
+          ELSE 'de:sh0-light-dwarf'
+        END
+
+      -- DE minor semaphore signals and signs type Sh
+      WHEN (feature = 'DE-ESO:sh' AND minor_form = 'semaphore')
+        OR (feature = 'DE-ESO:sh0' AND minor_form = 'sign')
+      THEN
+        CASE
+          WHEN minor_states ~ '^(.*;)?DE-ESO:wn7(;.*)?$' THEN 'de:wn7-semaphore-normal'
+          WHEN minor_form = 'semaphore' AND (minor_height IS NULL or minor_height = 'normal') THEN 'de:sh1-semaphore-normal'
+          ELSE 'de:sh0-semaphore-dwarf'
+        END
+
+      -- DE signal Sh 2 as signal and at buffer stops
+      WHEN feature IN ('DE-ESO:sh2', 'DE-BOStrab:sh2') THEN 'de:sh2'
+
+      -- DE Signalhaltmelder Zugleitbetrieb
+      --   repeats DE-ESO:hp0 of the entrance main signal to the halt position
+      WHEN feature = 'DE-DB:signalhaltmelder' AND main_repeated_form = 'light' THEN 'de:zlb-haltmelder-light'
+
+      -- DE main entry sign Ne 1
+      WHEN feature IN ('DE-ESO:bü2', 'AT-V2:trapeztafel') AND main_form = 'sign' THEN 'de:ne1'
+
+      -- DE distant light signals type Vr which
+      --  - are repeaters or shortened
+      --  - have no railway:signal:states=* tag
+      --  - OR have railway:signal:states=* tag that does neither include Vr1 nor Vr2
+      WHEN feature = 'DE-ESO:vr' AND distant_form = 'light' THEN
+        CASE
+          WHEN distant_shortened = 'yes' OR distant_repeated = 'yes' THEN
+          CASE
+            WHEN distant_states ~ '^(.*;)?DE-ESO:vr2(;.*)?$' THEN 'de:vr2-light-repeated'
+            WHEN distant_states ~ '^(.*;)?DE-ESO:vr1(;.*)?$' THEN 'de:vr1-light-repeated'
+            ELSE 'de:vr0-light-repeated'
+          END
+          WHEN distant_states ~ '^(.*;)?DE-ESO:vr2(;.*)?$' THEN 'de:vr2-light'
+          WHEN distant_states ~ '^(.*;)?DE-ESO:vr1(;.*)?$' THEN 'de:vr1-light'
+          ELSE 'de:vr0-light'
+        END
+
+      -- DE distant semaphore signals type Vr which
+      --  - have no railway:signal:states=* tag
+      --  - OR have railway:signal:states=* tag that does neither include Vr1 nor Vr2
+      WHEN feature = 'DE-ESO:vr' AND distant_form = 'semaphore' THEN
+        CASE
+          WHEN distant_states ~ '^(.*;)?DE-ESO:vr2(;.*)?$' THEN 'de:vr2-semaphore'
+          WHEN distant_states ~ '^(.*;)?DE-ESO:vr1(;.*)?$' THEN 'de:vr1-semaphore'
+          ELSE 'de:vr0-semaphore'
+        END
+
+      -- DE Hamburger Hochbahn distant signal
+      WHEN feature = 'DE-HHA:v' AND distant_form = 'light' THEN 'de:hha/v1'
+
+      -- DE block marker ("Blockkennzeichen")
+      -- TODO adopt flex/de/blockkennzeichen-[width]x[height]
+      WHEN feature = 'DE-ESO:blockkennzeichen' THEN 'de:blockkennzeichen'
+
+      -- DE distant signal replacement by sign So 106
+      -- AT Kreuztafel
+      WHEN feature IN ('DE-ESO:so106', 'AT-V2:kreuztafel') AND distant_form = 'sign' THEN 'de:so106'
+
+      -- DE distant signal replacement by sign Ne 2
+      WHEN feature = 'DE-ESO:db:ne2' AND distant_form = 'sign' THEN
+        CASE
+          WHEN distant_shortened = 'yes' THEN 'de:ne2-reduced-distance'
+          ELSE 'de:ne2'
+        END
+
+      -- DE main semaphore signals type Hp
+      -- AT main semaphore signal "Hauptsignal"
+      WHEN feature IN ('DE-ESO:hp', 'AT-V2:hauptsignal') AND main_form = 'semaphore' THEN
+        CASE
+          WHEN main_states ~ '^(.*;)?(DE-ESO:hp2|AT-V2:frei_mit_(4|2)0)(;.*)?$' THEN 'de:hp2-semaphore'
+          WHEN main_states ~ '^(.*;)?(DE-ESO:hp1|AT-V2:frei)(;.*)?$' THEN 'de:hp1-semaphore'
+          ELSE 'de:hp0-semaphore'
+        END
+
+      -- DE main light signals type Hp
+      WHEN feature = 'DE-ESO:hp' AND main_form = 'light' THEN
+        CASE
+          WHEN main_states ~ '^(.*;)?DE-ESO:hp2(;.*)?$' THEN 'de:hp2-light'
+          WHEN main_states ~ '^(.*;)?DE-ESO:hp1(;.*)?$' THEN 'de:hp1-light'
+          ELSE 'de:hp0-light'
+        END
+
+      -- DE main, combined and distant light signals type Hl
+      WHEN feature = 'DE-ESO:hl' AND main_form = 'light' THEN
+        CASE
+          WHEN main_form IS NULL AND distant_form = 'light' AND combined_form IS NULL THEN 'de:hl1-distant'
+          WHEN main_form = 'light' AND distant_form IS NULL AND combined_form IS NULL THEN
+            CASE
+              WHEN main_states ~ '^(.*;)?DE-ESO:hl2(;.*)?$' THEN 'de:hl2'
+              WHEN main_states ~ '^(.*;)?DE-ESO:hl3b(;.*)?$' THEN 'de:hl3b'
+              WHEN main_states ~ '^(.*;)?DE-ESO:hl3a(;.*)?$' THEN 'de:hl3a'
+              WHEN main_states ~ '^(.*;)?DE-ESO:hl1(;.*)?$' THEN 'de:hl1'
+              ELSE 'de:hl0'
+            END
+          WHEN main_form IS NULL AND distant_form IS NULL AND combined_form = 'light' THEN
+            CASE
+              WHEN combined_states ~ '^(.*;)?DE-ESO:hl11(;.*)?$' THEN 'de:hl11'
+              WHEN combined_states ~ '^(.*;)?DE-ESO:hl12b(;.*)?$' THEN 'de:hl12b'
+              WHEN combined_states ~ '^(.*;)?DE-ESO:hl12a(;.*)?$' THEN 'de:hl12a'
+              WHEN combined_states ~ '^(.*;)?DE-ESO:hl10(;.*)?$' THEN 'de:hl10'
+              ELSE 'de:hl0'
+            END
+          ELSE ''
+        END
+
+      -- DE combined light signals type Sv
+      WHEN feature = 'DE-ESO:sv' THEN
+        CASE
+          WHEN combined_states ~ '^(.*;)?DE-ESO:hp0(;.*)?$' THEN 'de:hp0'
+          WHEN combined_states ~ '^(.*;)?DE-ESO:sv0(;.*)?$' THEN 'de:sv0'
+          ELSE ''
+        END
+
+      -- DE tram main signal "Fahrsignal"
+      WHEN feature IN ('DE-AVG:f', 'DE-BOStrab:f') AND main_form = 'light' THEN
+        CASE
+          WHEN main_states ~ '^(.*;)?DE-BOStrab:f3(;.*)?$' THEN 'de:bostrab/f3'
+          WHEN main_states ~ '^(.*;)?DE-BOStrab:f2(;.*)?$' THEN 'de:bostrab/f2'
+          WHEN main_states ~ '^(.*;)?DE-BOStrab:f1(;.*)?$' THEN 'de:bostrab/f1'
+          ELSE 'de:bostrab/f0'
+        END
+
+      -- DE Hamburger Hochbahn main signal
+      WHEN feature = 'DE-HHA:h' AND main_form = 'light' THEN
+        CASE
+          WHEN main_states IS NULL THEN 'de:hha/h1'
+          ELSE 'de:hha/h0'
+        END
+
+      -- DE main, combined and distant signals type Ks
+      WHEN feature = 'DE-ESO:ks' THEN
+        CASE
+          WHEN main_form IS NULL AND distant_form = 'light' AND combined_form IS NULL THEN
+            CASE
+              WHEN distant_repeated = 'yes' THEN 'de:ks-distant-repeated'
+              WHEN distant_shortened = 'yes' THEN 'de:ks-distant-shortened'
+              ELSE 'de:ks-distant'
+            END
+          WHEN main_form = 'light' AND distant_form IS NULL AND combined_form IS NULL THEN 'ks-main'
+          WHEN main_form IS NULL AND distant_form IS NULL AND combined_form = 'light' THEN
+            CASE
+              WHEN combined_shortened = 'yes' THEN 'de:ks-combined-shortened'
+              ELSE 'de:ks-combined'
+            END
+          ELSE ''
+        END
+
+
+      -- FI --
+
+      -- FI crossing signal To
+      WHEN feature = 'FI:To' AND crossing_form = 'light' THEN 'fi:to1'
+
+      -- FI shunting light signals type Ro (new)
+      WHEN feature = 'FI:Ro' AND shunting_form = 'light' AND shunting_states ~ '^(.*;)?FI:Ro0(;.*)?$' THEN 'fi:ro0-new'
+
+      -- FI minor light signals type Lo at moveable bridges
+      WHEN feature = 'FI:Lo' AND minor_form = 'light' AND shunting_states ~ '^(.*;)?FI:Lo0(;.*)?$' THEN 'fi:lo0'
+
+      -- FI distant light signals
+      WHEN feature = 'FI:Eo' AND distant_form = 'light' AND distant_repeated != 'yes' THEN
+        CASE
+          WHEN distant_states ~ '^(.*;)?FI:Eo2(;.*)?$' THEN 'fi:eo2-new'
+          WHEN distant_states ~ '^(.*;)?FI:Eo1(;.*)?$' THEN 'fi:eo1-new'
+          ELSE 'fi:eo0-new'
+        END
+      WHEN feature = 'FI:Eo-v' AND distant_form = 'light' AND distant_repeated != 'yes' THEN
+        CASE
+          WHEN distant_states ~ '^(.*;)?FI:Eo1(;.*)?$' THEN 'fi:eo1-old'
+          ELSE 'fi:eo0-old'
+        END
+
+      -- FI main light signals
+      WHEN feature = 'FI:Po' AND main_form = 'light' THEN
+        CASE
+          WHEN main_states ~ '^(.*;)?FI:Po2(;.*)?$' THEN 'fi:po2-new'
+          WHEN main_states ~ '^(.*;)?FI:Po1(;.*)?$' THEN 'fi:po1-new'
+          ELSE 'fi:po0-new'
+        END
+      WHEN feature = 'FI:Po-v' AND main_form = 'light' THEN
+        CASE
+          WHEN main_states ~ '^(.*;)?FI:Po2(;.*)?$' THEN 'fi:po2-old'
+          WHEN main_states ~ '^(.*;)?FI:Po1(;.*)?$' THEN 'fi:po1-old'
+          ELSE 'fi:po0-old'
+        END
+
+      -- FI combined block signal type So
+      WHEN feature = 'FI:So' AND combined_form = 'light' AND combined_states ~ '^(.*;)?FI:Po1(;.*)?$' AND combined_states ~ '^(.*;)?FI:Eo1(;.*)?$' THEN 'fi:eo1-po1-combined-block'
+
+
+      -- NL --
+
+      -- NL departure signals
+      WHEN feature IN ('NL', 'NL:VL') AND departure_form = 'light' THEN 'nl:departure'
+
+      WHEN feature = 'NL' THEN
+        CASE
+          -- NL dwarf shunting signals
+          WHEN shunting_form = 'light' AND main_height = 'dwarf' THEN 'nl:main_light_dwarf_shunting'
+
+          -- NL train protection block marker light
+          WHEN train_protection_form = 'light' AND train_protection_type = 'block_marker' THEN 'nl:main_light_white_bar'
+
+          -- NL main dwarf signals
+          WHEN main_height = 'dwarf' THEN 'nl:main_light_dwarf'
+
+          -- NL main shunting light
+          WHEN shunting_form = 'light' THEN 'nl:main_light_shunting'
+
+          -- NL distant light
+          WHEN distant_form = 'light' THEN 'nl:distant_light'
+
+          -- NL main repeated light
+          WHEN (main_repeated_form = 'light' OR main_repeated_states = 'NL:272;NL:273') THEN 'nl:main_repeated_light'
+
+          -- NL (freight) speed limits
+          WHEN speed_limit_form = 'light' AND speed_limit_states = 'H;off' THEN 'nl:H'
+          WHEN speed_limit_form = 'light' AND speed_limit_states = 'L;off' THEN 'nl:L'
+          WHEN main_form = 'light' AND speed_limit_form = 'light' THEN 'nl:main_light_speed_limit'
+          WHEN distant_form = 'light' AND speed_limit_form = 'light' THEN 'nl:distant_light_speed_limit'
+
+          -- NL main light
+          WHEN main_form = 'light' THEN 'nl:main_light'
+          WHEN speed_limit_form = 'light' THEN 'nl:speed_limit_light'
+          ELSE ''
+        END
+
+      -- NL Humping ("heuvelen")
+      WHEN feature = 'NL:270' THEN 'nl:270a'
+
+      -- NL ATB codewissel
+      WHEN feature = 'NL:330' THEN 'nl:atb-codewissel'
+
+      -- NL train protection block markers
+      WHEN feature IN ('NL:227b', 'DE-ESO:ne14') AND train_protection_form = 'sign' AND train_protection_type = 'block_marker' THEN
+        CASE
+          WHEN feature = 'NL:227b' AND train_protection_shape = 'triangle' THEN 'general:etcs-stop-marker-arrow-left'
+          ELSE 'general:etcs-stop-marker-triangle-left'
+        END
+
+      ELSE ''
+    END as feature
+  FROM pre_signals
+  ORDER BY
+    -- distant signals are less important, signals for slower speeds are more important
+    (CASE
+      WHEN railway_has_key(tags, 'railway:signal:main') THEN 10000
+      WHEN railway_has_key(tags, 'railway:signal:combined') THEN 10000
+      WHEN railway_has_key(tags, 'railway:signal:distant') THEN 9000
+      WHEN railway_has_key(tags, 'railway:signal:train_protection') THEN 8500
+      WHEN railway_has_key(tags, 'railway:signal:main_repeated') THEN 8000
+      WHEN railway_has_key(tags, 'railway:signal:minor') THEN 4000
+      WHEN railway_has_key(tags, 'railway:signal:passing') THEN 3500
+      WHEN railway_has_key(tags, 'railway:signal:shunting') THEN 3000
+      WHEN railway_has_key(tags, 'railway:signal:stop') THEN 1000
+      WHEN railway_has_key(tags, 'railway:signal:stop_demand') THEN 900
+      WHEN railway_has_key(tags, 'railway:signal:station_distant') THEN 550
+      WHEN railway_has_key(tags, 'railway:signal:crossing') THEN 1000
+      WHEN railway_has_key(tags, 'railway:signal:crossing_distant') THEN 500
+      WHEN railway_has_key(tags, 'railway:signal:ring') THEN 500
+      WHEN railway_has_key(tags, 'railway:signal:whistle') THEN 500
+      WHEN railway_has_key(tags, 'railway:signal:departure') THEN 400
+      ELSE 0
+    END) ASC NULLS FIRST;
+
+CREATE OR REPLACE VIEW signal_boxes_text AS
+    (SELECT
+        ST_PointOnSurface(way) AS way,
+        tags->'railway:ref' AS ref,
+        name
+      FROM openrailwaymap_osm_polygon
+      WHERE railway = 'signal_box'
+    ORDER BY way_area DESC NULLS LAST)
+
+    UNION ALL
+
+    (SELECT
+        way,
+        tags->'railway:ref' AS ref,
+        name
+      FROM openrailwaymap_osm_point
+      WHERE railway = 'signal_box');
diff --git a/symbols/general/border.svg b/symbols/general/border.svg
index 11b3f6a5..ecfac9a8 100644
--- a/symbols/general/border.svg
+++ b/symbols/general/border.svg
@@ -1,73 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32.000001"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="border.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="17.67177"
-     inkscape:cy="20.966915"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1366"
-     inkscape:window-height="719"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.87171936;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 28.110257,1036.3622 A 12.110257,12.110257 0 0 1 16,1048.4725 12.110257,12.110257 0 0 1 3.8897432,1036.3622 12.110257,12.110257 0 0 1 16,1024.2519 a 12.110257,12.110257 0 0 1 12.110257,12.1103 z"
-       id="circle4140"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1.894035,1033.3966 27.779196,0 0,6.1113 -27.779196,0 z"
-       id="rect4138"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2.87171936;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16 0 A 16 16 0 0 0 0 16 A 16 16 0 0 0 16 32 A 16 16 0 0 0 32 16 A 16 16 0 0 0 16 0 z M 16 4.1269531 A 11.872801 11.872801 0 0 1 27.873047 16 A 11.872801 11.872801 0 0 1 16 27.873047 A 11.872801 11.872801 0 0 1 4.1269531 16 A 11.872801 11.872801 0 0 1 16 4.1269531 z "
-       transform="translate(0,1020.3622)"
-       id="path4136" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 14.054688 8 C 14.054688 11.339844 11.339844 14.054688 8 14.054688 C 4.660156 14.054688 1.945312 11.339844 1.945312 8 C 1.945312 4.660156 4.660156 1.945312 8 1.945312 C 11.339844 1.945312 14.054688 4.660156 14.054688 8 Z M 14.054688 8 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 0.945312 6.515625 L 14.835938 6.515625 L 14.835938 9.574219 L 0.945312 9.574219 Z M 0.945312 6.515625 "/>
+<path fill-rule="nonzero" fill="rgb(100%, 0%, 0%)" fill-opacity="1" d="M 8 0 C 3.582031 0 0 3.582031 0 8 C 0 12.417969 3.582031 16 8 16 C 12.417969 16 16 12.417969 16 8 C 16 3.582031 12.417969 0 8 0 Z M 8 2.0625 C 11.277344 2.0625 13.9375 4.722656 13.9375 8 C 13.9375 11.277344 11.277344 13.9375 8 13.9375 C 4.722656 13.9375 2.0625 11.277344 2.0625 8 C 2.0625 4.722656 4.722656 2.0625 8 2.0625 Z M 8 2.0625 "/>
 </svg>
diff --git a/symbols/general/crossing.svg b/symbols/general/crossing.svg
index fb2bd40f..a5121fcb 100644
--- a/symbols/general/crossing.svg
+++ b/symbols/general/crossing.svg
@@ -1,75 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="12.00018"
-   height="6.9992766"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="crossing.svg"
-   inkscape:export-filename="/home/michael/Entwicklung/OpenRailwayMap/styles/icons/crossing-24.png"
-   inkscape:export-xdpi="180"
-   inkscape:export-ydpi="180">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="33.583986"
-     inkscape:cx="8.1370685"
-     inkscape:cy="4.4365906"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4" />
-  <g
-     id="g4135"
-     transform="scale(0.83518526,0.78880402)">
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4139"
-       width="14.356"
-       height="8.8660002"
-       x="0.006143047"
-       y="0.0036383341" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 0.51231703,8.3660525 13.862143,0.50363851"
-       id="path4143"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path4155"
-       d="M 0.50614305,0.50363851 13.862143,8.3696385"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       inkscape:connector-curvature="0" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.00142" height="7" viewBox="0 0 12.00142 7">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 0.00390625 0.00390625 L 11.996094 0.00390625 L 11.996094 6.996094 L 0.00390625 6.996094 Z M 0.00390625 0.00390625 "/>
+<path fill="none" stroke-width="1" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.514428 8.368214 L 13.861509 0.505064 " transform="matrix(0.835272, 0, 0, 0.788886, 0, 0)"/>
+<path fill="none" stroke-width="1" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.505075 0.505064 L 13.861509 8.368214 " transform="matrix(0.835272, 0, 0, 0.788886, 0, 0)"/>
 </svg>
diff --git a/symbols/general/level-crossing.svg b/symbols/general/level-crossing.svg
index 7868682f..14ab4bea 100644
--- a/symbols/general/level-crossing.svg
+++ b/symbols/general/level-crossing.svg
@@ -1,75 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="11.999177"
-   height="6.9997869"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="level-crossing.svg"
-   inkscape:export-filename="/home/michael/Entwicklung/OpenRailwayMap/styles/icons/level-crossing-24.png"
-   inkscape:export-xdpi="180.00999"
-   inkscape:export-ydpi="180.00999">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="23.747464"
-     inkscape:cx="5.2930495"
-     inkscape:cy="5.8769409"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4" />
-  <g
-     id="g4135"
-     transform="matrix(0.85708407,0,0,0.80961341,0,-0.1841374)">
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4139"
-       width="13.988029"
-       height="8.6387482"
-       x="0.0059855892"
-       y="0.23098376" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.97436816;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 0.49918539,8.3790536 13.50683,0.718168"
-       id="path4143" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4155"
-       d="M 0.49316966,0.718168 13.50683,8.3825477"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.97436816;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11.999542" height="7" viewBox="0 0 11.999542 7">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 0.00390625 0.00390625 L 11.996094 0.00390625 L 11.996094 6.996094 L 0.00390625 6.996094 Z M 0.00390625 0.00390625 "/>
+<path fill="none" stroke-width="0.974368" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(100%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.501321 8.381159 L 13.508327 0.719557 " transform="matrix(0.85711, 0, 0, 0.809638, 0, -0.184143)"/>
+<path fill="none" stroke-width="0.974368" stroke-linecap="round" stroke-linejoin="miter" stroke="rgb(100%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.492206 0.719557 L 13.508327 8.381159 " transform="matrix(0.85711, 0, 0, 0.809638, 0, -0.184143)"/>
 </svg>
diff --git a/symbols/general/phone.svg b/symbols/general/phone.svg
index 67494600..53b8ebba 100644
--- a/symbols/general/phone.svg
+++ b/symbols/general/phone.svg
@@ -1,69 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   width="23.692749"
-   height="32"
-   viewBox="0 0 23.692749 32"
-   sodipodi:docname="phone.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1151"
-     id="namedview4"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="8.34386"
-     inkscape:cx="-0.42138177"
-     inkscape:cy="25.498659"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <rect
-     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:16.6343441;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="rect812"
-     width="23.629999"
-     height="32"
-     x="0"
-     y="-9.5367432e-07" />
-  <path
-     style="fill:#000000"
-     d="M 15.495349,31.974252 C 13.058384,31.749555 10.47115,30.166171 7.819497,27.2766 6.821077,26.188611 5.7912474,24.887224 4.6888984,23.320339 4.2133332,22.644446 3.2929524,21.26736 3.1141842,20.964263 1.6765786,18.526887 0.64592877,14.774525 0.21955303,10.425569 0.05818465,8.7796856 -0.04071436,6.5256076 0.01622507,5.7918156 0.08482438,4.9073246 0.25334269,4.2409316 0.58125942,3.5566376 1.2631428,2.1339516 2.5251001,1.1065626 4.331602,0.50346855 c 0.703703,-0.234898 1.6095339,-0.411296 2.3815161,-0.463796 l 0.1812682,-0.012 0,0.168698 c 0,0.093 0.0391,1.50128505 0.086799,3.13016905 0.0477,1.628783 0.098199,3.360866 0.1122689,3.849061 0.014,0.488195 0.0312,1.039489 0.0382,1.225188 0.007,0.185598 0.0143,0.461295 0.0163,0.612493 l 0.004,0.275098 -0.2296577,0.125298 c -0.8631518,0.471197 -1.3352671,1.1362904 -1.4549159,2.0498804 -0.054099,0.413096 10e-4,0.99289 0.1402386,1.475486 0.081999,0.284297 1.0795992,2.269077 2.494445,4.96275 1.5549744,2.96047 2.4762148,4.596854 3.1134278,5.530244 0.390517,0.571994 0.815272,0.897891 1.367407,1.04919 0.244477,0.067 0.819011,0.08 1.100119,0.024 0.274497,-0.054 0.743582,-0.215497 0.9751,-0.335696 l 0.211238,-0.109699 1.069519,0.840991 c 0.588234,0.462496 1.609574,1.265988 2.269647,1.785483 0.660074,0.519494 1.826872,1.435985 2.592884,2.036679 0.766013,0.600794 1.393276,1.099489 1.393906,1.108489 0.002,0.028 -0.668543,0.414696 -1.073969,0.619694 -1.125369,0.568794 -2.552294,1.091089 -3.887931,1.423185 -0.477805,0.118799 -1.127709,0.156199 -1.737693,0.1 z m 4.145789,-5.288346 c -1.847012,-1.466686 -3.535565,-2.807672 -3.752332,-2.979971 -0.227388,-0.180698 -0.384817,-0.322596 -0.372097,-0.335296 0.0121,-0.012 0.459506,-0.254498 0.9942,-0.538695 l 0.972161,-0.516695 0.175018,0 c 0.351456,0.01 0.778032,0.190798 1.281967,0.549395 0.483575,0.344096 1.727383,1.297187 2.94351,2.255377 0.357537,0.281697 0.799152,0.629594 0.98136,0.773192 0.399216,0.314397 0.566045,0.489596 0.685334,0.719493 0.111388,0.214598 0.156538,0.401496 0.138718,0.574095 -0.0197,0.191098 -0.631093,2.161878 -0.670663,2.161878 -0.0104,0 -1.530165,-1.199988 -3.377176,-2.666773 z M 8.0318449,9.0690826 c -0.053299,-0.046 -0.069499,-0.089 -0.087099,-0.231198 -0.077299,-0.623594 -0.1476386,-2.809472 -0.199558,-6.200638 -0.0141,-0.92139 -0.0297,-1.88578105 -0.0346,-2.14307805 l -0.009,-0.467795 0.1120289,-0.017 c 0.5449645,-0.082 1.6416435,0.386596 2.1382685,0.912991 0.2894967,0.30689705 0.2752867,0.24389705 0.2964167,1.31458605 0.0272,1.380187 0.0723,4.561755 0.0718,5.07265 l -4e-4,0.447095 -0.238887,0.283197 C 9.7623275,8.4172886 9.5471697,8.6117866 9.2793624,8.7641856 8.712958,9.0864826 8.1983732,9.2121806 8.0317849,9.0688826 Z"
-     id="path3338"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11.846375" height="16" viewBox="0 0 11.846375 16">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 0 0 L 11.816406 0 L 11.816406 16 L 0 16 Z M 0 0 "/>
+<path fill-rule="nonzero" fill="rgb(0%, 0%, 0%)" fill-opacity="1" d="M 7.746094 15.988281 C 6.527344 15.875 5.234375 15.082031 3.910156 13.636719 C 3.410156 13.09375 2.894531 12.445312 2.34375 11.660156 C 2.105469 11.320312 1.644531 10.632812 1.558594 10.480469 C 0.839844 9.261719 0.324219 7.386719 0.109375 5.210938 C 0.0273438 4.390625 -0.0195312 3.261719 0.0078125 2.894531 C 0.0429688 2.453125 0.125 2.121094 0.289062 1.777344 C 0.632812 1.066406 1.261719 0.554688 2.164062 0.25 C 2.519531 0.132812 2.96875 0.046875 3.355469 0.0195312 L 3.445312 0.015625 L 3.445312 0.0976562 C 3.445312 0.144531 3.464844 0.847656 3.492188 1.664062 C 3.515625 2.476562 3.539062 3.34375 3.546875 3.585938 C 3.554688 3.832031 3.5625 4.109375 3.566406 4.199219 C 3.570312 4.292969 3.574219 4.429688 3.574219 4.507812 L 3.574219 4.644531 L 3.460938 4.707031 C 3.03125 4.941406 2.792969 5.273438 2.734375 5.730469 C 2.707031 5.9375 2.734375 6.226562 2.804688 6.46875 C 2.84375 6.613281 3.34375 7.605469 4.050781 8.949219 C 4.828125 10.429688 5.289062 11.25 5.609375 11.714844 C 5.804688 12.003906 6.015625 12.164062 6.292969 12.242188 C 6.414062 12.273438 6.699219 12.28125 6.839844 12.253906 C 6.980469 12.226562 7.214844 12.144531 7.328125 12.085938 L 7.433594 12.03125 L 7.96875 12.449219 C 8.261719 12.683594 8.773438 13.082031 9.105469 13.34375 C 9.433594 13.601562 10.019531 14.0625 10.402344 14.363281 C 10.785156 14.660156 11.097656 14.910156 11.097656 14.914062 C 11.097656 14.929688 10.761719 15.125 10.5625 15.226562 C 9.996094 15.511719 9.285156 15.769531 8.617188 15.9375 C 8.378906 15.996094 8.054688 16.015625 7.746094 15.988281 Z M 9.820312 13.34375 C 8.898438 12.609375 8.054688 11.9375 7.945312 11.851562 C 7.832031 11.761719 7.753906 11.691406 7.757812 11.683594 C 7.765625 11.679688 7.988281 11.558594 8.253906 11.414062 L 8.742188 11.15625 L 8.828125 11.15625 C 9.003906 11.164062 9.21875 11.253906 9.46875 11.433594 C 9.710938 11.605469 10.332031 12.082031 10.941406 12.558594 C 11.121094 12.699219 11.339844 12.875 11.433594 12.945312 C 11.632812 13.105469 11.714844 13.191406 11.773438 13.304688 C 11.832031 13.414062 11.851562 13.507812 11.84375 13.59375 C 11.835938 13.6875 11.527344 14.675781 11.507812 14.675781 C 11.503906 14.675781 10.742188 14.074219 9.820312 13.339844 Z M 4.015625 4.535156 C 3.988281 4.511719 3.980469 4.488281 3.972656 4.417969 C 3.933594 4.105469 3.898438 3.015625 3.871094 1.320312 C 3.867188 0.859375 3.859375 0.375 3.855469 0.246094 L 3.851562 0.0117188 L 3.90625 0.00390625 C 4.179688 -0.0351562 4.726562 0.199219 4.976562 0.460938 C 5.121094 0.613281 5.113281 0.582031 5.125 1.117188 C 5.136719 1.808594 5.160156 3.398438 5.160156 3.65625 L 5.160156 3.878906 L 5.039062 4.019531 C 4.882812 4.207031 4.773438 4.304688 4.640625 4.382812 C 4.355469 4.542969 4.097656 4.605469 4.015625 4.535156 Z M 4.015625 4.535156 "/>
 </svg>
diff --git a/symbols/general/radio-antenna.svg b/symbols/general/radio-antenna.svg
index 79e90ba9..8ba276f3 100644
--- a/symbols/general/radio-antenna.svg
+++ b/symbols/general/radio-antenna.svg
@@ -1,97 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20.000189"
-   viewBox="0 0 5.2916665 5.2917169"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="radio-antenna.svg"
-   inkscape:export-filename="/home/michael/Entwicklung/OpenRailwayMap/styles/icons/radio-antenna-20.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="13.509677"
-     inkscape:cy="3.3078405"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1151"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.84099723,-289.44601)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8.037714;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect819"
-       width="5.2916665"
-       height="5.2916665"
-       x="0.84099722"
-       y="289.44604" />
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5f5f5f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.09375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       d="m 1.5767135,290.75169 0,1.42736 c 0.5267746,0 2.5768219,-0.31281 2.5768219,-0.71368 0,-0.40087 -2.0500473,-0.71368 -2.5768219,-0.71368 z"
-       id="path4218"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsc" />
-    <rect
-       style="opacity:1;fill:#242424;fill-opacity:1;stroke:none;stroke-width:0.33811995;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect36"
-       width="0.78830272"
-       height="4.2934813"
-       x="0.84099698"
-       y="290.44424" />
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.55320519;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       d="m 4.5324699,290.63931 c 0.4031613,0.76549 0.4206898,1.28745 0,1.82677"
-       id="path4188"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path4190"
-       d="m 5.2381063,289.7261 c 0.8063226,1.531 0.8413795,2.5749 0,3.65355"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.55320519;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9.999906" height="10" viewBox="0 0 9.999906 10">
+<rect x="-0.999991" y="-1" width="11.999887" height="12" fill="rgb(100%, 100%, 100%)" fill-opacity="1"/>
+<path fill-rule="evenodd" fill="rgb(37.254903%, 37.254903%, 37.254903%)" fill-opacity="1" d="M 1.390625 2.46875 L 1.390625 5.164062 C 2.386719 5.164062 6.261719 4.574219 6.261719 3.816406 C 6.261719 3.058594 2.386719 2.46875 1.390625 2.46875 Z M 1.390625 2.46875 "/>
+<path fill-rule="nonzero" fill="rgb(14.117648%, 14.117648%, 14.117648%)" fill-opacity="1" d="M 0 1.886719 L 1.488281 1.886719 L 1.488281 10 L 0 10 Z M 0 1.886719 "/>
+<path fill="none" stroke-width="0.553205" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 4.532796 290.638718 C 4.935876 291.405603 4.952413 291.926507 4.532796 292.466014 " transform="matrix(1.889746, 0, 0, 1.889746, -1.58927, -546.979386)"/>
+<path fill="none" stroke-width="0.553205" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.23767 289.72507 C 6.04383 291.256774 6.07897 292.300648 5.23767 293.379662 " transform="matrix(1.889746, 0, 0, 1.889746, -1.58927, -546.979386)"/>
 </svg>
diff --git a/symbols/general/radio-mast.svg b/symbols/general/radio-mast.svg
index 25252d1d..0b0e2ffc 100644
--- a/symbols/general/radio-mast.svg
+++ b/symbols/general/radio-mast.svg
@@ -1,103 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="29.999964"
-   viewBox="0 0 5.2916665 7.9374907"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="radio-mast.svg"
-   inkscape:export-filename="/home/michael/Entwicklung/OpenRailwayMap/styles/icons/radio-mast-30.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="-1.7542771"
-     inkscape:cy="17.493719"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1151"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.57205039,-289.77681)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.33721399;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect817"
-       width="5.2916665"
-       height="7.9375"
-       x="0.57205039"
-       y="289.77679" />
-    <rect
-       style="opacity:1;fill:#242424;fill-opacity:1;stroke:none;stroke-width:0.33811995;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect36"
-       width="1.0547485"
-       height="6.9928064"
-       x="2.7691195"
-       y="290.7215" />
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52430737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       d="m 4.3444946,290.90596 c 0.3828986,0.72401 0.3995462,1.21766 0,1.72776"
-       id="path4188"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path4190"
-       d="m 5.0146661,290.04227 c 0.7657974,1.44801 0.7990925,2.43531 0,3.45549"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52430737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path4192"
-       d="m 2.0912729,290.90596 c -0.3828986,0.72401 -0.3995462,1.21766 0,1.72776"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52430737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52430737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       d="m 1.4211014,290.04227 c -0.76579745,1.44801 -0.79909249,2.43531 0,3.45549"
-       id="path4194"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10.000012" height="15" viewBox="0 0 10.000012 15">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 0 0 L 10 0 L 10 15 L 0 15 Z M 0 0 "/>
+<path fill-rule="nonzero" fill="rgb(14.117648%, 14.117648%, 14.117648%)" fill-opacity="1" d="M 4.152344 1.785156 L 6.144531 1.785156 L 6.144531 15 L 4.152344 15 Z M 4.152344 1.785156 "/>
+<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 4.344425 290.905437 C 4.72683 291.630973 4.743367 292.122932 4.344425 292.633495 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
+<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 5.014151 290.041408 C 5.781028 291.490413 5.814101 292.478466 5.014151 293.497524 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
+<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 2.091336 290.905437 C 1.70893 291.630973 1.692394 292.122932 2.091336 292.633495 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
+<path fill="none" stroke-width="0.524307" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="4" d="M 1.42161 290.041408 C 0.654732 291.490413 0.62166 292.478466 1.42161 293.497524 " transform="matrix(1.889766, 0, 0, 1.889766, -1.081041, -547.610406)"/>
 </svg>
diff --git a/symbols/general/tram-stop.svg b/symbols/general/tram-stop.svg
index a4216367..5d931a1d 100644
--- a/symbols/general/tram-stop.svg
+++ b/symbols/general/tram-stop.svg
@@ -1,38 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 2.6458333 2.6458333"
-   height="2.6458333mm"
-   width="2.6458333mm">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-133.80357,-122.75298)"
-     id="layer1">
-    <rect
-       y="122.75298"
-       x="133.80357"
-       height="2.6458333"
-       width="2.6458333"
-       id="rect815"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25355622;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 8 8">
+<rect x="-0.8" y="-0.8" width="9.6" height="9.6" fill="rgb(84.705883%, 46.666667%, 72.156864%)" fill-opacity="1"/>
 </svg>