diff --git a/layers/components/highway-road-width-casing.yml b/layers/components/highway-road-width-casing.yml
index 6f70d0d..a525ce5 100644
--- a/layers/components/highway-road-width-casing.yml
+++ b/layers/components/highway-road-width-casing.yml
@@ -3,9 +3,9 @@
     - 0.9 # カーブが大きい
   - - zoom
   - 4     # zl
-  - 2
+  - 1.5
   - 6     # zl
-  - 3
+  - 2.5
   - 8     # zl
   - 3
   - 14    # zl
diff --git a/layers/oc-label-pref.yml b/layers/oc-label-pref.yml
deleted file mode 100644
index e151f69..0000000
--- a/layers/oc-label-pref.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-id: oc-label-pref
-type: symbol
-source: geolonia
-source-layer: place
-minzoom: 3
-maxzoom: 6
-filter:
-  - all
-  - - '=='
-    - - get
-      - class
-    - pref
-layout:
-  text-font:
-    - Noto Sans Universal Regular
-  text-size:
-    stops:
-      - - 3
-        - 10
-      - - 6
-        - 12
-  text-field: '{name}'
-  text-padding:
-    - interpolate
-    - - linear
-    - - zoom
-    - 3
-    - 10
-    - 6
-    - 25
-  text-max-width: 8
-  visibility: visible
-paint:
-  text-color: rgba(102, 102, 102, 1)
-  text-halo-width: 1.2
-  text-halo-color: rgba(255,255,255,0.8)
diff --git a/layers/oc-label-town-ja.yml b/layers/oc-label-town-ja.yml
deleted file mode 100644
index 42e2bb4..0000000
--- a/layers/oc-label-town-ja.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-id: oc-label-town-ja
-type: symbol
-source: geolonia
-source-layer: place
-minzoom: 7
-maxzoom: 6
-filter:
-  - all
-  - - '=='
-    - - get
-      - class
-    - town
-  - - has
-    - jflag
-  - - '=='
-    - - has
-      - pref-capital
-    - false
-layout:
-  text-padding: 2
-  text-font:
-    - Noto Sans Universal Regular
-  text-anchor: top
-  icon-image: circle-stroked
-  icon-size: 0.8
-  text-field: '{name}'
-  text-offset:
-    - 0
-    - 0.6
-  text-size: 12
-  text-max-width: 9
-paint:
-  text-halo-blur: 0.5
-  text-color: '#333'
-  text-halo-width: 1
-  text-halo-color: '#ffffff'
diff --git a/layers/oc-label-town.yml b/layers/oc-label-town.yml
deleted file mode 100644
index ffb4330..0000000
--- a/layers/oc-label-town.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-id: oc-label-town
-type: symbol
-source: geolonia
-source-layer: place
-minzoom: 5
-maxzoom: 6
-filter:
-  - all
-  - - '=='
-    - - get
-      - class
-    - town
-layout:
-  text-padding: 30
-  text-font:
-    - Noto Sans Universal Regular
-  text-anchor: top
-  icon-image: circle-stroked
-  text-field: '{name}'
-  text-offset:
-    - 0
-    - 0.6
-  text-size: 12
-  text-max-width: 9
-  icon-size: 0.5
-paint:
-  text-halo-blur: 0.5
-  text-color: '#000000'
-  text-halo-width: 1
-  text-halo-color: '#ffffff'
diff --git a/layers/oc-road-other.yml b/layers/oc-road-other.yml
new file mode 100644
index 0000000..89e67ab
--- /dev/null
+++ b/layers/oc-road-other.yml
@@ -0,0 +1,27 @@
+id: oc-road-other
+type: line
+source: geolonia
+source-layer: transportation
+minzoom: 6
+filter:
+  - all
+  - - '=='
+    - $type
+    - LineString
+  - - '!in'
+    - class
+    - motorway
+layout:
+  line-cap: round
+  line-join: round
+paint:
+  line-color: '#ffffff'
+  line-opacity:
+    - interpolate
+    - - linear
+    - - zoom
+    - 6
+    - 1
+    - 10
+    - 0
+  line-width: !!inc/file layers/components/broad-road-width.yml
diff --git a/layers/place-city-capital.yml b/layers/place-city-capital.yml
index 031caa9..c831ca3 100644
--- a/layers/place-city-capital.yml
+++ b/layers/place-city-capital.yml
@@ -27,7 +27,7 @@ layout:
     - 23
   text-field: '{name}'
   text-max-width: 8
-  icon-image: circle-stroked
+  icon-image: circle-double
   text-offset:
     - 0
     - 0.2
@@ -36,7 +36,7 @@ layout:
     - - linear
     - - zoom
     - 6
-    - 0.5
+    - 0.7
     - 16
     - 1
   text-anchor: top
diff --git a/layers/place-city-state.yml b/layers/place-city-state.yml
new file mode 100644
index 0000000..7225cf8
--- /dev/null
+++ b/layers/place-city-state.yml
@@ -0,0 +1,56 @@
+id: place-city-state
+type: symbol
+source: geolonia
+source-layer: place
+minzoom: 6
+maxzoom: 13
+filter:
+  - all
+  - - '=='
+    - class
+    - state
+  - - '!='
+    - disputed
+    - japan_northern_territories
+layout:
+  icon-image: circle-stroked
+  icon-size: 0.5
+  icon-padding:
+    - interpolate
+    - - linear
+    - - zoom
+    - 6
+    - 100
+    - 13
+    - 0
+  text-anchor: top
+  text-offset:
+    stops:
+      - - 6
+        - [0, 0.2]
+      - - 12
+        - [0, 0]
+  text-font:
+    - Noto Sans Universal Regular
+  text-size:
+    - interpolate
+    - - linear
+    - - zoom
+    - 6
+    - 14
+    - 13
+    - 24
+  text-field: '{name}'
+  text-max-width: 8
+  visibility: visible
+paint:
+  icon-color: '#000000'
+  icon-opacity:
+    stops:
+      - - 10
+        - 1
+      - - 12
+        - 0
+  text-color: '#000000'
+  text-halo-width: 1.2
+  text-halo-color: rgba(255,255,255,0.8)
diff --git a/style.yml b/style.yml
index caee5c8..bea4db4 100644
--- a/style.yml
+++ b/style.yml
@@ -67,6 +67,7 @@ layers:
   - !!inc/file layers/building.yml
   - !!inc/file layers/building-3d.yml
   - !!inc/file layers/highway-area.yml
+  - !!inc/file layers/oc-road-other.yml
   - !!inc/file layers/highway-motorway-link-casing.yml
   - !!inc/file layers/highway-link-casing.yml
   - !!inc/file layers/highway-minor-casing.yml
@@ -138,6 +139,7 @@ layers:
   - !!inc/file layers/place-city-rank4.yml
   - !!inc/file layers/place-city-rank3.yml
   - !!inc/file layers/place-city-rank2.yml
+  - !!inc/file layers/place-city-state.yml
   - !!inc/file layers/place-city-capital.yml
   - !!inc/file layers/oc-boundary-land-level-1-ja.yml
   - !!inc/file layers/oc-boundary-land-level-1.yml
@@ -147,10 +149,7 @@ layers:
   - !!inc/file layers/nt-water-name-ocean.yml
   - !!inc/file layers/nt-water-name-river.yml
   - !!inc/file layers/oc-airport.yml
-  - !!inc/file layers/oc-label-town-ja.yml
-  - !!inc/file layers/oc-label-town.yml
   - !!inc/file layers/oc-label-pref-capital-ja.yml
   - !!inc/file layers/oc-label-pref-ja.yml
-  # - !!inc/file layers/oc-label-pref.yml
   - !!inc/file layers/oc-label-capital.yml
   - !!inc/file layers/oc-label-country.yml