diff --git a/data/imagery.json b/data/imagery.json
index 63c2811f9..ef28d4fb8 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -10510,7 +10510,7 @@
         "name": "Locator Overlay",
         "type": "tms",
         "description": "Shows major features to help orient you.",
-        "template": "http://{switch:a,b,c}.tiles.mapbox.com/v4/openstreetmap.map-inh76ba2/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJhNVlHd29ZIn0.ti6wATGDWOmCnCYen-Ip7Q",
+        "template": "http://{switch:a,b,c}.tiles.mapbox.com/v4/openstreetmap.map-inh76ba2/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJncjlmd0t3In0.DmZsIeOW-3x-C5eX-wAqTw",
         "scaleExtent": [
             0,
             16
@@ -12370,7 +12370,7 @@
         "name": "Mapbox Satellite",
         "type": "tms",
         "description": "Satellite and aerial imagery.",
-        "template": "http://{switch:a,b,c}.tiles.mapbox.com/v4/openstreetmap.map-inh7ifmo/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJhNVlHd29ZIn0.ti6wATGDWOmCnCYen-Ip7Q",
+        "template": "http://{switch:a,b,c}.tiles.mapbox.com/v4/openstreetmap.map-inh7ifmo/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJncjlmd0t3In0.DmZsIeOW-3x-C5eX-wAqTw",
         "scaleExtent": [
             0,
             19
@@ -25556,6 +25556,479 @@
         "terms_url": "http://wiki.openstreetmap.org/wiki/Tours/Orthophoto",
         "terms_text": "Orthophoto Tour(s) Plus 2008"
     },
+    {
+        "name": "U.S. Forest Service roads",
+        "type": "tms",
+        "template": "http://osm.cycle.travel/forest/{zoom}/{x}/{y}.png",
+        "scaleExtent": [
+            0,
+            19
+        ],
+        "polygon": [
+            [
+                [
+                    -124.7617886,
+                    48.4130148
+                ],
+                [
+                    -124.6059492,
+                    45.90245
+                ],
+                [
+                    -124.9934269,
+                    40.0557614
+                ],
+                [
+                    -122.5369737,
+                    36.8566086
+                ],
+                [
+                    -119.9775867,
+                    33.0064099
+                ],
+                [
+                    -117.675935,
+                    32.4630223
+                ],
+                [
+                    -114.8612307,
+                    32.4799891
+                ],
+                [
+                    -111.0089311,
+                    31.336015
+                ],
+                [
+                    -108.1992687,
+                    31.3260016
+                ],
+                [
+                    -108.1871123,
+                    31.7755116
+                ],
+                [
+                    -106.5307225,
+                    31.7820947
+                ],
+                [
+                    -106.4842052,
+                    31.7464455
+                ],
+                [
+                    -106.429317,
+                    31.7520583
+                ],
+                [
+                    -106.2868855,
+                    31.5613291
+                ],
+                [
+                    -106.205248,
+                    31.446704
+                ],
+                [
+                    -105.0205259,
+                    30.5360988
+                ],
+                [
+                    -104.5881916,
+                    29.6997856
+                ],
+                [
+                    -103.2518856,
+                    28.8908685
+                ],
+                [
+                    -102.7173632,
+                    29.3920567
+                ],
+                [
+                    -102.1513983,
+                    29.7475702
+                ],
+                [
+                    -101.2552871,
+                    29.4810523
+                ],
+                [
+                    -100.0062436,
+                    28.0082173
+                ],
+                [
+                    -99.2351068,
+                    26.4475962
+                ],
+                [
+                    -98.0109067,
+                    25.9928035
+                ],
+                [
+                    -97.435024,
+                    25.8266009
+                ],
+                [
+                    -96.9555259,
+                    25.9821589
+                ],
+                [
+                    -96.8061741,
+                    27.7978168
+                ],
+                [
+                    -95.5563349,
+                    28.5876066
+                ],
+                [
+                    -93.7405308,
+                    29.4742093
+                ],
+                [
+                    -90.9028456,
+                    28.8564513
+                ],
+                [
+                    -88.0156706,
+                    28.9944338
+                ],
+                [
+                    -88.0162494,
+                    30.0038862
+                ],
+                [
+                    -86.0277506,
+                    30.0047454
+                ],
+                [
+                    -84.0187909,
+                    28.9961781
+                ],
+                [
+                    -81.9971976,
+                    25.9826768
+                ],
+                [
+                    -81.9966618,
+                    25.0134917
+                ],
+                [
+                    -84.0165592,
+                    25.0125783
+                ],
+                [
+                    -84.0160068,
+                    24.0052745
+                ],
+                [
+                    -80.0199985,
+                    24.007096
+                ],
+                [
+                    -79.8901116,
+                    26.8550713
+                ],
+                [
+                    -80.0245309,
+                    32.0161282
+                ],
+                [
+                    -75.4147385,
+                    35.0531894
+                ],
+                [
+                    -74.0211163,
+                    39.5727927
+                ],
+                [
+                    -72.002019,
+                    40.9912464
+                ],
+                [
+                    -69.8797398,
+                    40.9920457
+                ],
+                [
+                    -69.8489304,
+                    43.2619916
+                ],
+                [
+                    -66.9452845,
+                    44.7104937
+                ],
+                [
+                    -67.7596632,
+                    47.0990024
+                ],
+                [
+                    -69.2505131,
+                    47.5122328
+                ],
+                [
+                    -70.4614886,
+                    46.2176574
+                ],
+                [
+                    -71.412273,
+                    45.254878
+                ],
+                [
+                    -72.0222508,
+                    45.0059846
+                ],
+                [
+                    -75.0798841,
+                    44.9802854
+                ],
+                [
+                    -76.9023061,
+                    43.8024568
+                ],
+                [
+                    -78.7623935,
+                    43.6249578
+                ],
+                [
+                    -79.15798,
+                    43.4462589
+                ],
+                [
+                    -79.0060087,
+                    42.8005317
+                ],
+                [
+                    -82.662475,
+                    41.6889458
+                ],
+                [
+                    -82.1761642,
+                    43.588535
+                ],
+                [
+                    -83.2813977,
+                    46.138853
+                ],
+                [
+                    -87.5064535,
+                    48.0142702
+                ],
+                [
+                    -88.3492194,
+                    48.2963271
+                ],
+                [
+                    -89.4353148,
+                    47.9837822
+                ],
+                [
+                    -93.9981078,
+                    49.0067142
+                ],
+                [
+                    -95.1105379,
+                    49.412004
+                ],
+                [
+                    -96.0131199,
+                    49.0060547
+                ],
+                [
+                    -123.3228926,
+                    49.0042878
+                ],
+                [
+                    -123.2275233,
+                    48.1849927
+                ]
+            ],
+            [
+                [
+                    -160.5787616,
+                    22.5062947
+                ],
+                [
+                    -160.5782192,
+                    21.4984647
+                ],
+                [
+                    -158.7470604,
+                    21.2439843
+                ],
+                [
+                    -157.5083185,
+                    20.995803
+                ],
+                [
+                    -155.9961942,
+                    18.7790194
+                ],
+                [
+                    -154.6217803,
+                    18.7586966
+                ],
+                [
+                    -154.6890176,
+                    19.8805722
+                ],
+                [
+                    -156.2927622,
+                    21.2225888
+                ],
+                [
+                    -157.5047384,
+                    21.9984962
+                ],
+                [
+                    -159.0093692,
+                    22.5070181
+                ]
+            ],
+            [
+                [
+                    -167.1571546,
+                    68.721974
+                ],
+                [
+                    -164.8553982,
+                    67.0255078
+                ],
+                [
+                    -168.002195,
+                    66.0017503
+                ],
+                [
+                    -169.0087448,
+                    66.001546
+                ],
+                [
+                    -169.0075381,
+                    64.9987675
+                ],
+                [
+                    -172.5143281,
+                    63.8767267
+                ],
+                [
+                    -173.8197023,
+                    59.74014
+                ],
+                [
+                    -162.5018149,
+                    58.0005815
+                ],
+                [
+                    -160.0159024,
+                    58.0012389
+                ],
+                [
+                    -160.0149725,
+                    57.000035
+                ],
+                [
+                    -160.5054788,
+                    56.9999017
+                ],
+                [
+                    -165.8092575,
+                    54.824847
+                ],
+                [
+                    -178.000097,
+                    52.2446469
+                ],
+                [
+                    -177.9992996,
+                    51.2554252
+                ],
+                [
+                    -171.4689067,
+                    51.8215329
+                ],
+                [
+                    -162.40251,
+                    53.956664
+                ],
+                [
+                    -159.0075717,
+                    55.002502
+                ],
+                [
+                    -158.0190709,
+                    55.0027849
+                ],
+                [
+                    -151.9963213,
+                    55.9991902
+                ],
+                [
+                    -151.500341,
+                    57.9987853
+                ],
+                [
+                    -151.5012894,
+                    58.9919816
+                ],
+                [
+                    -138.5159989,
+                    58.9953194
+                ],
+                [
+                    -138.5150471,
+                    57.9986434
+                ],
+                [
+                    -133.9948193,
+                    54.0031685
+                ],
+                [
+                    -130.0044418,
+                    54.0043387
+                ],
+                [
+                    -130.0070826,
+                    57.0000507
+                ],
+                [
+                    -131.975877,
+                    56.9995156
+                ],
+                [
+                    -135.1229873,
+                    59.756601
+                ],
+                [
+                    -138.0071813,
+                    59.991805
+                ],
+                [
+                    -139.1715881,
+                    60.4127229
+                ],
+                [
+                    -140.9874011,
+                    61.0118551
+                ],
+                [
+                    -140.9683975,
+                    69.9535069
+                ],
+                [
+                    -156.176891,
+                    71.5633329
+                ],
+                [
+                    -160.413634,
+                    70.7397728
+                ],
+                [
+                    -163.0218273,
+                    69.9707435
+                ],
+                [
+                    -164.9717003,
+                    68.994689
+                ]
+            ]
+        ]
+    },
     {
         "name": "USGS Large Scale Imagery",
         "type": "tms",