diff --git a/core/badge-urls/make-badge-url.js b/core/badge-urls/make-badge-url.js
index f272f5ec5f..e011a3719b 100644
--- a/core/badge-urls/make-badge-url.js
+++ b/core/badge-urls/make-badge-url.js
@@ -9,7 +9,7 @@ function badgeUrlFromPath({
   path,
   queryParams,
   style,
-  format = 'svg',
+  format = '',
   longCache = false,
 }) {
   const outExt = format.length ? `.${format}` : ''
@@ -30,7 +30,7 @@ function badgeUrlFromPattern({
   namedParams,
   queryParams,
   style,
-  format = 'svg',
+  format = '',
   longCache = false,
 }) {
   const toPath = pathToRegexp.compile(pattern, {
@@ -61,15 +61,16 @@ function staticBadgeUrl({
   color = 'lightgray',
   style,
   namedLogo,
-  format = 'svg',
+  format = '',
 }) {
   const path = [label, message, color].map(encodeField).join('-')
   const outQueryString = queryString.stringify({
     style,
     logo: namedLogo,
   })
+  const outExt = format.length ? `.${format}` : ''
   const suffix = outQueryString ? `?${outQueryString}` : ''
-  return `${baseUrl}/badge/${path}.${format}${suffix}`
+  return `${baseUrl}/badge/${path}${outExt}${suffix}`
 }
 
 function queryStringStaticBadgeUrl({
@@ -83,7 +84,7 @@ function queryStringStaticBadgeUrl({
   logoColor,
   logoWidth,
   logoPosition,
-  format = 'svg',
+  format = '',
 }) {
   // schemaVersion could be a parameter if we iterate on it,
   // for now it's hardcoded to the only supported version.
@@ -99,7 +100,8 @@ function queryStringStaticBadgeUrl({
     logoWidth,
     logoPosition,
   })}`
-  return `${baseUrl}/static/v${schemaVersion}.${format}${suffix}`
+  const outExt = format.length ? `.${format}` : ''
+  return `${baseUrl}/static/v${schemaVersion}${outExt}${suffix}`
 }
 
 function dynamicBadgeUrl({
@@ -112,8 +114,10 @@ function dynamicBadgeUrl({
   suffix,
   color,
   style,
-  format = 'svg',
+  format = '',
 }) {
+  const outExt = format.length ? `.${format}` : ''
+
   const queryParams = {
     label,
     url: dataUrl,
@@ -132,7 +136,7 @@ function dynamicBadgeUrl({
   }
 
   const outQueryString = queryString.stringify(queryParams)
-  return `${baseUrl}/badge/dynamic/${datatype}.${format}?${outQueryString}`
+  return `${baseUrl}/badge/dynamic/${datatype}${outExt}?${outQueryString}`
 }
 
 function rasterRedirectUrl({ rasterUrl }, badgeUrl) {
diff --git a/core/badge-urls/make-badge-url.spec.js b/core/badge-urls/make-badge-url.spec.js
index 1d0f183cff..450b15d673 100644
--- a/core/badge-urls/make-badge-url.spec.js
+++ b/core/badge-urls/make-badge-url.spec.js
@@ -18,7 +18,7 @@ describe('Badge URL generation functions', function() {
       style: 'flat-square',
       longCache: true,
     }).expect(
-      'http://example.com/npm/v/gh-badges.svg?cacheSeconds=2592000&style=flat-square'
+      'http://example.com/npm/v/gh-badges?cacheSeconds=2592000&style=flat-square'
     )
   })
 
@@ -30,7 +30,7 @@ describe('Badge URL generation functions', function() {
       style: 'flat-square',
       longCache: true,
     }).expect(
-      'http://example.com/npm/v/gh-badges.svg?cacheSeconds=2592000&style=flat-square'
+      'http://example.com/npm/v/gh-badges?cacheSeconds=2592000&style=flat-square'
     )
   })
 
@@ -48,7 +48,7 @@ describe('Badge URL generation functions', function() {
       message: 'bar',
       color: 'blue',
       style: 'flat-square',
-    }).expect('/badge/foo-bar-blue.svg?style=flat-square')
+    }).expect('/badge/foo-bar-blue?style=flat-square')
     given({
       label: 'foo',
       message: 'bar',
@@ -62,24 +62,24 @@ describe('Badge URL generation functions', function() {
       message: 'Привет Мир',
       color: '#aabbcc',
     }).expect(
-      '/badge/Hello%20World-%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%D0%9C%D0%B8%D1%80-%23aabbcc.svg'
+      '/badge/Hello%20World-%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%D0%9C%D0%B8%D1%80-%23aabbcc'
     )
     given({
       label: '123-123',
       message: 'abc-abc',
       color: 'blue',
-    }).expect('/badge/123--123-abc--abc-blue.svg')
+    }).expect('/badge/123--123-abc--abc-blue')
     given({
       label: '123-123',
       message: '',
       color: 'blue',
       style: 'social',
-    }).expect('/badge/123--123--blue.svg?style=social')
+    }).expect('/badge/123--123--blue?style=social')
     given({
       label: '',
       message: 'blue',
       color: 'blue',
-    }).expect('/badge/-blue-blue.svg')
+    }).expect('/badge/-blue-blue')
   })
 
   test(queryStringStaticBadgeUrl, () => {
@@ -89,9 +89,7 @@ describe('Badge URL generation functions', function() {
       message: 'bar',
       color: 'blue',
       style: 'flat-square',
-    }).expect(
-      '/static/v1.svg?color=blue&label=foo&message=bar&style=flat-square'
-    )
+    }).expect('/static/v1?color=blue&label=foo&message=bar&style=flat-square')
     given({
       label: 'foo Bar',
       message: 'bar Baz',
@@ -107,7 +105,7 @@ describe('Badge URL generation functions', function() {
       message: 'Привет Мир',
       color: '#aabbcc',
     }).expect(
-      '/static/v1.svg?color=%23aabbcc&label=Hello%20World&message=%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%D0%9C%D0%B8%D1%80'
+      '/static/v1?color=%23aabbcc&label=Hello%20World&message=%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%D0%9C%D0%B8%D1%80'
     )
   })
 
@@ -125,7 +123,7 @@ describe('Badge URL generation functions', function() {
       style: 'plastic',
     }).expect(
       [
-        'http://img.example.com/badge/dynamic/json.svg',
+        'http://img.example.com/badge/dynamic/json',
         '?label=foo',
         `&prefix=${encodeURIComponent(prefix)}`,
         `&query=${encodeURIComponent(query)}`,
@@ -146,7 +144,7 @@ describe('Badge URL generation functions', function() {
       style: 'plastic',
     }).expect(
       [
-        'http://img.example.com/badge/dynamic/json.svg',
+        'http://img.example.com/badge/dynamic/json',
         '?color=blue',
         '&label=foo',
         `&query=${encodeURIComponent(query)}`,
diff --git a/core/base-service/base-non-memory-caching.js b/core/base-service/base-non-memory-caching.js
index 0b442e5aa5..8aaacf3a2b 100644
--- a/core/base-service/base-non-memory-caching.js
+++ b/core/base-service/base-non-memory-caching.js
@@ -50,7 +50,7 @@ module.exports = class NonMemoryCachingBaseService extends BaseService {
       )
 
       // The final capture group is the extension.
-      const format = match.slice(-1)[0]
+      const format = (match.slice(-1)[0] || '.svg').replace(/^\./, '')
       badgeData.format = format
 
       const svg = makeBadge(badgeData)
diff --git a/core/base-service/base-static.js b/core/base-service/base-static.js
index 3d3b48d720..7ecd598f32 100644
--- a/core/base-service/base-static.js
+++ b/core/base-service/base-static.js
@@ -45,7 +45,7 @@ module.exports = class BaseStaticService extends BaseService {
       )
 
       // The final capture group is the extension.
-      const format = match.slice(-1)[0]
+      const format = (match.slice(-1)[0] || '.svg').replace(/^\./, '')
       badgeData.format = format
 
       if (shouldProfileMakeBadge) {
diff --git a/core/base-service/base.js b/core/base-service/base.js
index c692430dab..7ca0923cce 100644
--- a/core/base-service/base.js
+++ b/core/base-service/base.js
@@ -438,7 +438,7 @@ class BaseService {
             this
           )
           // The final capture group is the extension.
-          const format = match.slice(-1)[0]
+          const format = (match.slice(-1)[0] || '.svg').replace(/^\./, '')
           sendBadge(format, badgeData)
 
           serviceRequestCounter.inc()
diff --git a/core/base-service/base.spec.js b/core/base-service/base.spec.js
index 7c0d68e1e2..8964cd0b27 100644
--- a/core/base-service/base.spec.js
+++ b/core/base-service/base.spec.js
@@ -316,7 +316,7 @@ describe('BaseService', function() {
   })
 
   describe('ScoutCamp integration', function() {
-    const expectedRouteRegex = /^\/foo\/([^/]+?)\.(svg|json)$/
+    const expectedRouteRegex = /^\/foo\/([^/]+?)(|\.svg|\.json)$/
 
     let mockCamp
     let mockHandleRequest
diff --git a/core/base-service/redirector.js b/core/base-service/redirector.js
index d0a5d15c51..9b9acbf8d4 100644
--- a/core/base-service/redirector.js
+++ b/core/base-service/redirector.js
@@ -106,7 +106,7 @@ module.exports = function redirector(attrs) {
         }
 
         // The final capture group is the extension.
-        const format = match.slice(-1)[0]
+        const format = (match.slice(-1)[0] || '.svg').replace(/^\./, '')
         const redirectUrl = `${
           format === 'png' ? rasterUrl : ''
         }${targetPath}.${format}${urlSuffix}`
diff --git a/core/base-service/route.js b/core/base-service/route.js
index 3bdf15de7c..d9bb8e0aca 100644
--- a/core/base-service/route.js
+++ b/core/base-service/route.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const escapeStringRegexp = require('escape-string-regexp')
 const Joi = require('@hapi/joi')
 const pathToRegexp = require('path-to-regexp')
 
@@ -27,15 +28,16 @@ function assertValidRoute(route, message = undefined) {
 }
 
 function prepareRoute({ base, pattern, format, capture, withPng }) {
-  const extensionRegex = ['svg', 'json']
-    .concat(withPng ? ['png'] : [])
+  const extensionRegex = ['', '.svg', '.json']
+    .concat(withPng ? ['.png'] : [])
+    .map(escapeStringRegexp)
     .join('|')
   let regex, captureNames
   if (pattern === undefined) {
-    regex = new RegExp(`^${makeFullUrl(base, format)}\\.(${extensionRegex})$`)
+    regex = new RegExp(`^${makeFullUrl(base, format)}(${extensionRegex})$`)
     captureNames = capture || []
   } else {
-    const fullPattern = `${makeFullUrl(base, pattern)}.:ext(${extensionRegex})`
+    const fullPattern = `${makeFullUrl(base, pattern)}:ext(${extensionRegex})`
     const keys = []
     regex = pathToRegexp(fullPattern, keys, {
       strict: true,
diff --git a/core/base-service/route.spec.js b/core/base-service/route.spec.js
index 5b5331f8da..113162d9c9 100644
--- a/core/base-service/route.spec.js
+++ b/core/base-service/route.spec.js
@@ -19,13 +19,7 @@ describe('Route helpers', function() {
 
     const regexExec = str => regex.exec(str)
     test(regexExec, () => {
-      forCases([
-        given('/foo/bar.bar.bar.zip'),
-        given('/foo/bar/bar.svg'),
-        // This is a valid example with the wrong extension separator, to
-        // test that we only accept a `.`.
-        given('/foo/bar.bar.bar_svg'),
-      ]).expect(null)
+      given('/foo/bar/bar.svg').expect(null)
     })
 
     const namedParams = str =>
@@ -35,25 +29,23 @@ describe('Route helpers', function() {
         given('/foo/bar.bar.bar.svg'),
         given('/foo/bar.bar.bar.json'),
       ]).expect({ namedParamA: 'bar.bar.bar' })
+
+      // This pattern catches bugs related to escaping the extension separator.
+      given('/foo/bar.bar.bar_svg').expect({ namedParamA: 'bar.bar.bar_svg' })
+      given('/foo/bar.bar.bar.zip').expect({ namedParamA: 'bar.bar.bar.zip' })
     })
   })
 
   context('A `format` with a named param is declared', function() {
     const { regex, captureNames } = prepareRoute({
       base: 'foo',
-      format: '([^/]+)',
+      format: '([^/]+?)',
       capture: ['namedParamA'],
     })
 
     const regexExec = str => regex.exec(str)
     test(regexExec, () => {
-      forCases([
-        given('/foo/bar.bar.bar.zip'),
-        given('/foo/bar/bar.svg'),
-        // This is a valid example with the wrong extension separator, to
-        // test that we only accept a `.`.
-        given('/foo/bar.bar.bar_svg'),
-      ]).expect(null)
+      given('/foo/bar/bar.svg').expect(null)
     })
 
     const namedParams = str =>
@@ -63,6 +55,10 @@ describe('Route helpers', function() {
         given('/foo/bar.bar.bar.svg'),
         given('/foo/bar.bar.bar.json'),
       ]).expect({ namedParamA: 'bar.bar.bar' })
+
+      // This pattern catches bugs related to escaping the extension separator.
+      given('/foo/bar.bar.bar_svg').expect({ namedParamA: 'bar.bar.bar_svg' })
+      given('/foo/bar.bar.bar.zip').expect({ namedParamA: 'bar.bar.bar.zip' })
     })
   })
 
diff --git a/core/server/server.js b/core/server/server.js
index 048cdaf530..e038f9cdc8 100644
--- a/core/server/server.js
+++ b/core/server/server.js
@@ -3,7 +3,6 @@
  * @module
  */
 
-const fs = require('fs')
 const path = require('path')
 const url = require('url')
 const bytes = require('bytes')
@@ -27,11 +26,6 @@ const PrometheusMetrics = require('./prometheus-metrics')
 const optionalUrl = Joi.string().uri({ scheme: ['http', 'https'] })
 const requiredUrl = optionalUrl.required()
 
-const notFound = fs.readFileSync(
-  path.resolve(__dirname, 'error-pages', '404.html'),
-  'utf-8'
-)
-
 const publicConfigSchema = Joi.object({
   bind: {
     port: Joi.number().port(),
@@ -189,7 +183,7 @@ class Server {
       public: { rasterUrl },
     } = config
 
-    camp.notfound(/\.(gif|jpg)$/, (query, match, end, request) => {
+    camp.route(/\.(gif|jpg)$/, (query, match, end, request) => {
       const [, format] = match
       makeSend('svg', request.res, end)(
         makeBadge({
@@ -201,7 +195,7 @@ class Server {
     })
 
     if (!rasterUrl) {
-      camp.notfound(/\.png$/, (query, match, end, request) => {
+      camp.route(/\.png$/, (query, match, end, request) => {
         makeSend('svg', request.res, end)(
           makeBadge({
             text: ['404', 'raster badges not available'],
@@ -212,8 +206,10 @@ class Server {
       })
     }
 
-    camp.notfound(/\.(svg|json)$/, (query, match, end, request) => {
-      const [, format] = match
+    camp.notfound(/(.svg|.json|)$/, (query, match, end, request) => {
+      const [, extension] = match
+      const format = (extension || '.svg').replace(/^\./, '')
+
       makeSend(format, request.res, end)(
         makeBadge({
           text: ['404', 'badge not found'],
@@ -222,34 +218,6 @@ class Server {
         })
       )
     })
-
-    camp.notfound(/.*/, (query, match, end, request) => {
-      end(notFound)
-    })
-  }
-
-  /**
-   * Iterate all the service classes defined in /services,
-   * load each service and register a Scoutcamp route for each service.
-   */
-  registerServices() {
-    const { config, camp } = this
-    const { apiProvider: githubApiProvider } = this.githubConstellation
-    const { requestCounter } = this.metrics || {}
-
-    loadServiceClasses().forEach(serviceClass =>
-      serviceClass.register(
-        { camp, handleRequest, githubApiProvider, requestCounter },
-        {
-          handleInternalErrors: config.public.handleInternalErrors,
-          cacheHeaders: config.public.cacheHeaders,
-          profiling: config.public.profiling,
-          fetchLimitBytes: bytes(config.public.fetchLimit),
-          rasterUrl: config.public.rasterUrl,
-          private: config.private,
-        }
-      )
-    )
   }
 
   /**
@@ -290,6 +258,30 @@ class Server {
     }
   }
 
+  /**
+   * Iterate all the service classes defined in /services,
+   * load each service and register a Scoutcamp route for each service.
+   */
+  registerServices() {
+    const { config, camp } = this
+    const { apiProvider: githubApiProvider } = this.githubConstellation
+    const { requestCounter } = this.metrics || {}
+
+    loadServiceClasses().forEach(serviceClass =>
+      serviceClass.register(
+        { camp, handleRequest, githubApiProvider, requestCounter },
+        {
+          handleInternalErrors: config.public.handleInternalErrors,
+          cacheHeaders: config.public.cacheHeaders,
+          profiling: config.public.profiling,
+          fetchLimitBytes: bytes(config.public.fetchLimit),
+          rasterUrl: config.public.rasterUrl,
+          private: config.private,
+        }
+      )
+    )
+  }
+
   /**
    * Start the HTTP server:
    * Bootstrap Scoutcamp,
@@ -327,8 +319,8 @@ class Server {
     suggest.setRoutes(allowedOrigin, githubApiProvider, camp)
 
     this.registerErrorHandlers()
-    this.registerServices()
     this.registerRedirects()
+    this.registerServices()
 
     await new Promise(resolve => camp.on('listening', () => resolve()))
   }
diff --git a/core/server/server.spec.js b/core/server/server.spec.js
index 55916fcab7..53acc855bc 100644
--- a/core/server/server.spec.js
+++ b/core/server/server.spec.js
@@ -55,6 +55,15 @@ describe('The server', function() {
     )
   })
 
+  it('should produce json badges', async function() {
+    const { statusCode, body, headers } = await got(
+      `${baseUrl}npm/v/express.json`
+    )
+    expect(statusCode).to.equal(200)
+    expect(headers['content-type']).to.equal('application/json')
+    expect(() => JSON.parse(body)).not.to.throw()
+  })
+
   it('should preserve label case', async function() {
     const { statusCode, body } = await got(`${baseUrl}:fRuiT-apple-green.svg`)
     expect(statusCode).to.equal(200)
@@ -109,13 +118,16 @@ describe('The server', function() {
       .and.to.include('badge not found')
   })
 
-  it('should return the 404 html page for rando links', async function() {
+  it('should return the 404 badge page for rando links', async function() {
     const { statusCode, body } = await got(
       `${baseUrl}this/is/most/definitely/not/a/badge.js`,
       { throwHttpErrors: false }
     )
     expect(statusCode).to.equal(404)
-    expect(body).to.include('blood, toil, tears and sweat')
+    expect(body)
+      .to.satisfy(isSvg)
+      .and.to.include('404')
+      .and.to.include('badge not found')
   })
 
   it('should redirect the root as configured', async function() {
@@ -132,7 +144,8 @@ describe('The server', function() {
     const { statusCode, body } = await got(`${baseUrl}npm/v/express.jpg`, {
       throwHttpErrors: false,
     })
-    expect(statusCode).to.equal(404)
+    // TODO It would be nice if this were 404 or 410.
+    expect(statusCode).to.equal(200)
     expect(body)
       .to.satisfy(isSvg)
       .and.to.include('410')
diff --git a/cypress/integration/main-page.spec.js b/cypress/integration/main-page.spec.js
index 0f165ef20f..31624c0cb3 100644
--- a/cypress/integration/main-page.spec.js
+++ b/cypress/integration/main-page.spec.js
@@ -26,13 +26,13 @@ describe('Main page', function() {
 
     expectBadgeExample(
       'Discourse status',
-      'http://localhost:8080/badge/discourse-online-brightgreen.svg',
-      '/discourse/:scheme/:host/status.svg'
+      'http://localhost:8080/badge/discourse-online-brightgreen',
+      '/discourse/:scheme/:host/status'
     )
   })
 
   it('Suggest badges', function() {
-    const badgeUrl = `${backendUrl}/github/issues/badges/shields.svg`
+    const badgeUrl = `${backendUrl}/github/issues/badges/shields`
     cy.visit('/')
 
     cy.get(SEARCH_INPUT).type('https://github.com/badges/shields')
@@ -42,7 +42,7 @@ describe('Main page', function() {
   })
 
   it('Customization form is filled with suggested badge details', function() {
-    const badgeUrl = `${backendUrl}/github/issues/badges/shields.svg`
+    const badgeUrl = `${backendUrl}/github/issues/badges/shields`
     cy.visit('/')
     cy.get(SEARCH_INPUT).type('https://github.com/badges/shields')
     cy.contains('Suggest badges').click()
@@ -54,7 +54,7 @@ describe('Main page', function() {
   })
 
   it('Customizate suggested badge', function() {
-    const badgeUrl = `${backendUrl}/github/issues/badges/shields.svg`
+    const badgeUrl = `${backendUrl}/github/issues/badges/shields`
     cy.visit('/')
     cy.get(SEARCH_INPUT).type('https://github.com/badges/shields')
     cy.contains('Suggest badges').click()
@@ -62,8 +62,6 @@ describe('Main page', function() {
 
     cy.get('table input[name="color"]').type('orange')
 
-    cy.get(
-      `img[src='${backendUrl}/github/issues/badges/shields.svg?color=orange']`
-    )
+    cy.get(`img[src='${backendUrl}/github/issues/badges/shields?color=orange']`)
   })
 })
diff --git a/doc/deprecating-badges.md b/doc/deprecating-badges.md
index 9f6ad38a9c..353b56de6b 100644
--- a/doc/deprecating-badges.md
+++ b/doc/deprecating-badges.md
@@ -22,7 +22,7 @@ module.exports = deprecatedService({
   category: 'size',
   route: {
     base: 'imagelayers',
-    format: '(?:.+)',
+    format: '(?:.+?)',
   },
   label: 'imagelayers',
   dateAdded: new Date('2019-xx-xx'), // Be sure to update this with today's date!
diff --git a/frontend/components/common.spec.tsx b/frontend/components/common.spec.tsx
index 4fc495d30b..40f227e646 100644
--- a/frontend/components/common.spec.tsx
+++ b/frontend/components/common.spec.tsx
@@ -33,14 +33,12 @@ describe('Common modules', function() {
 
   describe('<Badge />', function() {
     it('renders', function() {
-      shallow(<common.Badge src="/badge/foo-bar-blue.svg" />)
+      shallow(<common.Badge src="/badge/foo-bar-blue" />)
     })
 
     it('contains a link to the image', function() {
-      const wrapper = render(<common.Badge src="/badge/foo-bar-blue.svg" />)
-      expect(wrapper.html()).to.contain(
-        '<img alt src="/badge/foo-bar-blue.svg">'
-      )
+      const wrapper = render(<common.Badge src="/badge/foo-bar-blue" />)
+      expect(wrapper.html()).to.contain('<img alt src="/badge/foo-bar-blue">')
     })
   })
 
diff --git a/frontend/components/customizer/customizer.js b/frontend/components/customizer/customizer.js
index ff4db89a4c..0321652cb9 100644
--- a/frontend/components/customizer/customizer.js
+++ b/frontend/components/customizer/customizer.js
@@ -36,7 +36,7 @@ export default function Customizer({
 
   function generateBuiltBadgeUrl() {
     const suffix = queryString ? `?${queryString}` : ''
-    return `${baseUrl || getBaseUrlFromWindowLocation()}${path}.svg${suffix}`
+    return `${baseUrl || getBaseUrlFromWindowLocation()}${path}${suffix}`
   }
 
   function renderLivePreview() {
diff --git a/frontend/components/snippet.spec.js b/frontend/components/snippet.spec.js
index fa539614cf..09681e5f8a 100644
--- a/frontend/components/snippet.spec.js
+++ b/frontend/components/snippet.spec.js
@@ -6,16 +6,12 @@ import '../enzyme-conf.spec'
 
 describe('<Snippet />', function() {
   it('renders', function() {
-    render(<Snippet snippet="http://example.com/badge.svg" />)
+    render(<Snippet snippet="http://example.com/badge" />)
   })
 
   it('renders with truncate and fontSize', function() {
     render(
-      <Snippet
-        fontSize="14pt"
-        snippet="http://example.com/badge.svg"
-        truncate
-      />
+      <Snippet fontSize="14pt" snippet="http://example.com/badge" truncate />
     )
   })
 })
diff --git a/frontend/components/usage.js b/frontend/components/usage.js
index 244effaa3b..2af8fc0b36 100644
--- a/frontend/components/usage.js
+++ b/frontend/components/usage.js
@@ -183,13 +183,13 @@ export default function Usage({ baseUrl }) {
 
       <p>Using dash "-" separator</p>
       <p>
-        <Snippet snippet={`${baseUrl}/badge/<LABEL>-<MESSAGE>-<COLOR>.svg`} />
+        <Snippet snippet={`${baseUrl}/badge/<LABEL>-<MESSAGE>-<COLOR>`} />
       </p>
       <StaticBadgeEscapingRules />
       <p>Using query string parameters</p>
       <p>
         <Snippet
-          snippet={`${baseUrl}/static/v1.svg?label=<LABEL>&message=<MESSAGE>&color=<COLOR>`}
+          snippet={`${baseUrl}/static/v1?label=<LABEL>&message=<MESSAGE>&color=<COLOR>`}
         />
       </p>
 
@@ -229,7 +229,7 @@ export default function Usage({ baseUrl }) {
       <H3>Endpoint</H3>
 
       <p>
-        <Snippet snippet={`${baseUrl}/endpoint.svg?url=<URL>&style<STYLE>`} />
+        <Snippet snippet={`${baseUrl}/endpoint?url=<URL>&style<STYLE>`} />
       </p>
 
       <p>
@@ -243,7 +243,7 @@ export default function Usage({ baseUrl }) {
       <p>
         <StyledCode>
           {baseUrl}
-          /badge/dynamic/json.svg?url=&lt;URL&gt;&amp;label=&lt;LABEL&gt;&amp;query=&lt;
+          /badge/dynamic/json?url=&lt;URL&gt;&amp;label=&lt;LABEL&gt;&amp;query=&lt;
           <a
             href="https://jsonpath.com"
             target="_BLANK"
@@ -257,7 +257,7 @@ export default function Usage({ baseUrl }) {
       <p>
         <StyledCode>
           {baseUrl}
-          /badge/dynamic/xml.svg?url=&lt;URL&gt;&amp;label=&lt;LABEL&gt;&amp;query=&lt;
+          /badge/dynamic/xml?url=&lt;URL&gt;&amp;label=&lt;LABEL&gt;&amp;query=&lt;
           <a href="http://xpather.com" target="_BLANK" title="XPath syntax">
             //data/subdata
           </a>
@@ -267,7 +267,7 @@ export default function Usage({ baseUrl }) {
       <p>
         <StyledCode>
           {baseUrl}
-          /badge/dynamic/yaml.svg?url=&lt;URL&gt;&amp;label=&lt;LABEL&gt;&amp;query=&lt;
+          /badge/dynamic/yaml?url=&lt;URL&gt;&amp;label=&lt;LABEL&gt;&amp;query=&lt;
           <a
             href="https://jsonpath.com"
             target="_BLANK"
@@ -394,8 +394,19 @@ export default function Usage({ baseUrl }) {
       </QueryParamTable>
 
       <p>
-        We support <code>.svg</code>, <code>.json</code>, <code>.png</code> and
-        a few others, but use them responsibly.
+        We support <code>.svg</code> and <code>.json</code>. The default is
+        <code>.svg</code>, which can be omitted from the URL.
+      </p>
+
+      <p>
+        While we highly recommend using SVG, we also support <code>.png</code>
+        for use cases where SVG will not work. These requests should be made to
+        our raster server <code>https://raster.shields.io</code>. For example,
+        the raster equivalent of
+        <code>https://img.shields.io/v/npm/express</code> is
+        <code>https://raster.shields.io/v/npm/express</code>. For backward
+        compatibility, the badge server will redirect <code>.png</code> badges
+        to the raster server.
       </p>
     </section>
   )
diff --git a/frontend/components/usage.spec.js b/frontend/components/usage.spec.js
index a49301af23..8e7496b036 100644
--- a/frontend/components/usage.spec.js
+++ b/frontend/components/usage.spec.js
@@ -12,7 +12,7 @@ describe('<Usage />', function() {
 
   it('contains some of the expected text', function() {
     const wrapper = shallow(<Usage baseUrl="https://example.shields.io" />)
-    expect(wrapper).to.contain.text('use them responsibly')
+    expect(wrapper).to.contain.text('For backward compatibility')
   })
 
   // This test requires Link to be mocked.
diff --git a/frontend/lib/generate-image-markup.spec.ts b/frontend/lib/generate-image-markup.spec.ts
index 36c595f70e..ce0e71374e 100644
--- a/frontend/lib/generate-image-markup.spec.ts
+++ b/frontend/lib/generate-image-markup.spec.ts
@@ -11,54 +11,54 @@ import {
 
 test(bareLink, () => {
   given(
-    'https://img.shields.io/badge.svg',
+    'https://img.shields.io/badge',
     'https://example.com/example',
     'Example'
-  ).expect('https://img.shields.io/badge.svg')
+  ).expect('https://img.shields.io/badge')
 })
 
 test(html, () => {
   given(
-    'https://img.shields.io/badge.svg',
+    'https://img.shields.io/badge',
     'https://example.com/example',
     'Example'
   ).expect(
-    '<a href="https://example.com/example"><img alt="Example" src="https://img.shields.io/badge.svg"></a>'
+    '<a href="https://example.com/example"><img alt="Example" src="https://img.shields.io/badge"></a>'
   )
-  given('https://img.shields.io/badge.svg', undefined, undefined).expect(
-    '<img src="https://img.shields.io/badge.svg">'
+  given('https://img.shields.io/badge', undefined, undefined).expect(
+    '<img src="https://img.shields.io/badge">'
   )
 })
 
 test(markdown, () => {
-  given('https://img.shields.io/badge.svg', undefined, 'Example').expect(
-    '![Example](https://img.shields.io/badge.svg)'
+  given('https://img.shields.io/badge', undefined, 'Example').expect(
+    '![Example](https://img.shields.io/badge)'
   )
   given(
-    'https://img.shields.io/badge.svg',
+    'https://img.shields.io/badge',
     'https://example.com/example',
     'Example'
   ).expect(
-    '[![Example](https://img.shields.io/badge.svg)](https://example.com/example)'
+    '[![Example](https://img.shields.io/badge)](https://example.com/example)'
   )
-  given('https://img.shields.io/badge.svg', undefined, undefined).expect(
-    '![](https://img.shields.io/badge.svg)'
+  given('https://img.shields.io/badge', undefined, undefined).expect(
+    '![](https://img.shields.io/badge)'
   )
 })
 
 test(reStructuredText, () => {
-  given('https://img.shields.io/badge.svg', undefined, undefined).expect(
-    '.. image:: https://img.shields.io/badge.svg'
+  given('https://img.shields.io/badge', undefined, undefined).expect(
+    '.. image:: https://img.shields.io/badge'
   )
-  given('https://img.shields.io/badge.svg', undefined, 'Example').expect(
-    '.. image:: https://img.shields.io/badge.svg   :alt: Example'
+  given('https://img.shields.io/badge', undefined, 'Example').expect(
+    '.. image:: https://img.shields.io/badge   :alt: Example'
   )
   given(
-    'https://img.shields.io/badge.svg',
+    'https://img.shields.io/badge',
     'https://example.com/example',
     'Example'
   ).expect(
-    '.. image:: https://img.shields.io/badge.svg   :alt: Example   :target: https://example.com/example'
+    '.. image:: https://img.shields.io/badge   :alt: Example   :target: https://example.com/example'
   )
 })
 
@@ -70,33 +70,33 @@ test(renderAsciiDocAttributes, () => {
 })
 
 test(asciiDoc, () => {
-  given('https://img.shields.io/badge.svg', undefined, undefined).expect(
-    'image:https://img.shields.io/badge.svg[]'
+  given('https://img.shields.io/badge', undefined, undefined).expect(
+    'image:https://img.shields.io/badge[]'
   )
-  given('https://img.shields.io/badge.svg', undefined, 'Example').expect(
-    'image:https://img.shields.io/badge.svg[Example]'
+  given('https://img.shields.io/badge', undefined, 'Example').expect(
+    'image:https://img.shields.io/badge[Example]'
   )
   given(
-    'https://img.shields.io/badge.svg',
+    'https://img.shields.io/badge',
     undefined,
     'Example, with comma'
-  ).expect('image:https://img.shields.io/badge.svg["Example, with comma"]')
+  ).expect('image:https://img.shields.io/badge["Example, with comma"]')
   given(
-    'https://img.shields.io/badge.svg',
+    'https://img.shields.io/badge',
     'https://example.com/example',
     'Example'
   ).expect(
-    'image:https://img.shields.io/badge.svg["Example",link="https://example.com/example"]'
+    'image:https://img.shields.io/badge["Example",link="https://example.com/example"]'
   )
 })
 
 test(generateMarkup, () => {
   given({
-    badgeUrl: 'https://img.shields.io/badge.svg',
+    badgeUrl: 'https://img.shields.io/badge',
     link: 'https://example.com/example',
     title: 'Example',
     markupFormat: 'markdown',
   }).expect(
-    '[![Example](https://img.shields.io/badge.svg)](https://example.com/example)'
+    '[![Example](https://img.shields.io/badge)](https://example.com/example)'
   )
 })
diff --git a/frontend/pages/endpoint.js b/frontend/pages/endpoint.js
index 6038214ac9..8874b50f96 100644
--- a/frontend/pages/endpoint.js
+++ b/frontend/pages/endpoint.js
@@ -88,7 +88,7 @@ const EndpointPage = () => (
     <Meta />
     <Header />
     <H3>Endpoint</H3>
-    <Snippet snippet={`${baseUrl}/endpoint.svg?url=...&style=...`} />
+    <Snippet snippet={`${baseUrl}/endpoint?url=...&style=...`} />
     <p>Endpoint response:</p>
     <JsonExample
       data={{
diff --git a/package-lock.json b/package-lock.json
index 68dd0ef708..c0efff7086 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8965,8 +8965,7 @@
     "escape-string-regexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
     },
     "escodegen": {
       "version": "1.9.0",
diff --git a/package.json b/package.json
index 36d5be89b6..e6a78cbbb1 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "decamelize": "^3.2.0",
     "dotenv": "^8.0.0",
     "emojic": "^1.1.15",
+    "escape-string-regexp": "^2.0.0",
     "fast-xml-parser": "^3.12.16",
     "fsos": "^1.1.6",
     "gh-badges": "file:gh-badges",
@@ -171,7 +172,6 @@
     "danger-plugin-no-test-shortcuts": "^2.0.0",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
-    "escape-string-regexp": "^2.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-config-standard": "^12.0.0",
diff --git a/services/issuestats/issuestats.service.js b/services/issuestats/issuestats.service.js
index 3edb9cc7b6..6b22c1d3f8 100644
--- a/services/issuestats/issuestats.service.js
+++ b/services/issuestats/issuestats.service.js
@@ -6,7 +6,7 @@ module.exports = deprecatedService({
   category: 'issue-tracking',
   route: {
     base: 'issuestats',
-    format: '(?:[^/]+)(?:/long)?/(?:[^/]+)/(?:.+)',
+    format: '(?:.*?)',
   },
   label: 'issue stats',
   dateAdded: new Date('2018-09-01'),
diff --git a/services/nexus/nexus.service.js b/services/nexus/nexus.service.js
index aa52499d54..f98ca9f937 100644
--- a/services/nexus/nexus.service.js
+++ b/services/nexus/nexus.service.js
@@ -46,7 +46,7 @@ module.exports = class Nexus extends BaseJsonService {
       pattern:
         // Do not base new services on this route pattern.
         // See https://github.com/badges/shields/issues/3714
-        ':repo(r|s|[^/]+)/:scheme(http|https)/:hostAndPath+/:groupId/:artifactId([^/:]+):queryOpt(:.+)?',
+        ':repo(r|s|[^/]+)/:scheme(http|https)/:hostAndPath+/:groupId/:artifactId([^/:]+?):queryOpt(:.+?)?',
     }
   }
 
diff --git a/services/nuget/nuget-v3-service-family.js b/services/nuget/nuget-v3-service-family.js
index a5b1d05dea..a28b209006 100644
--- a/services/nuget/nuget-v3-service-family.js
+++ b/services/nuget/nuget-v3-service-family.js
@@ -156,7 +156,7 @@ function createServiceFamily({
     static get route() {
       return buildRoute({ serviceBaseUrl, withTenant, withFeed })
         .push('(v|vpre)', 'which')
-        .push('(.*)', 'packageName')
+        .push('(.+?)', 'packageName')
         .toObject()
     }
 
@@ -207,7 +207,7 @@ function createServiceFamily({
     static get route() {
       return buildRoute({ serviceBaseUrl, withTenant, withFeed })
         .push('dt')
-        .push('(.*)', 'packageName')
+        .push('(.+?)', 'packageName')
         .toObject()
     }
 
diff --git a/services/snyk/snyk-vulnerability-npm.service.js b/services/snyk/snyk-vulnerability-npm.service.js
index e8ab9a1983..ae91d92d16 100644
--- a/services/snyk/snyk-vulnerability-npm.service.js
+++ b/services/snyk/snyk-vulnerability-npm.service.js
@@ -7,7 +7,7 @@ module.exports = class SnykVulnerabilityNpm extends SynkVulnerabilityBase {
   static get route() {
     return {
       base: 'snyk/vulnerabilities/npm',
-      pattern: ':packageName(.+)',
+      pattern: ':packageName(.+?)',
     }
   }
 
diff --git a/services/sourcegraph/sourcegraph.service.js b/services/sourcegraph/sourcegraph.service.js
index 6222eec086..0b2b5b82e8 100644
--- a/services/sourcegraph/sourcegraph.service.js
+++ b/services/sourcegraph/sourcegraph.service.js
@@ -18,7 +18,7 @@ module.exports = class Sourcegraph extends BaseJsonService {
   static get route() {
     return {
       base: 'sourcegraph/rrc',
-      pattern: ':repo(.*)',
+      pattern: ':repo(.*?)',
     }
   }
 
diff --git a/services/static-badge/static-badge.service.js b/services/static-badge/static-badge.service.js
index a8c2109d5c..44c013d1f8 100644
--- a/services/static-badge/static-badge.service.js
+++ b/services/static-badge/static-badge.service.js
@@ -11,7 +11,7 @@ module.exports = class StaticBadge extends BaseStaticService {
   static get route() {
     return {
       base: '',
-      format: '(?::|badge/)((?:[^-]|--)*?)-?((?:[^-]|--)*)-((?:[^-]|--)+)',
+      format: '(?::|badge/)((?:[^-]|--)*?)-?((?:[^-]|--)*)-((?:[^-.]|--)+)',
       capture: ['label', 'message', 'color'],
     }
   }
diff --git a/services/teamcity/teamcity-build.service.js b/services/teamcity/teamcity-build.service.js
index 759c94289a..9598b24c3c 100644
--- a/services/teamcity/teamcity-build.service.js
+++ b/services/teamcity/teamcity-build.service.js
@@ -24,7 +24,7 @@ module.exports = class TeamCityBuild extends TeamCityBase {
       base: 'teamcity',
       // Do not base new services on this route pattern.
       // See https://github.com/badges/shields/issues/3714
-      format: '(?:codebetter|(http|https)/(.+)/(s|e))/([^/]+)',
+      format: '(?:codebetter|(http|https)/(.+)/(s|e))/([^/]+?)',
       capture: ['protocol', 'hostAndPath', 'verbosity', 'buildId'],
     }
   }
diff --git a/services/teamcity/teamcity-coverage.service.js b/services/teamcity/teamcity-coverage.service.js
index b3da07be0b..a215ccdd83 100644
--- a/services/teamcity/teamcity-coverage.service.js
+++ b/services/teamcity/teamcity-coverage.service.js
@@ -26,7 +26,7 @@ module.exports = class TeamCityCoverage extends TeamCityBase {
       // Do not base new services on this route pattern.
       // See https://github.com/badges/shields/issues/3714
       base: 'teamcity/coverage',
-      format: '(?:(http|https)/(.+)/)?([^/]+)',
+      format: '(?:(http|https)/(.+)/)?([^/]+?)',
       capture: ['protocol', 'hostAndPath', 'buildId'],
     }
   }
diff --git a/services/travis/travis-build.service.js b/services/travis/travis-build.service.js
index a27eeee980..324f4cf813 100644
--- a/services/travis/travis-build.service.js
+++ b/services/travis/travis-build.service.js
@@ -18,7 +18,7 @@ module.exports = class TravisBuild extends BaseSvgScrapingService {
   static get route() {
     return {
       base: 'travis',
-      format: '(?:(com)/)?(?!php-v)([^/]+/[^/]+)(?:/(.+))?',
+      format: '(?:(com)/)?(?!php-v)([^/]+/[^/]+?)(?:/(.+?))?',
       capture: ['comDomain', 'userRepo', 'branch'],
     }
   }
diff --git a/services/travis/travis-build.tester.js b/services/travis/travis-build.tester.js
index 0809ec9f0f..6bb0d988e9 100644
--- a/services/travis/travis-build.tester.js
+++ b/services/travis/travis-build.tester.js
@@ -2,13 +2,7 @@
 
 const Joi = require('@hapi/joi')
 const { isBuildStatus } = require('../build-status')
-const { ServiceTester } = require('../tester')
-
-const t = (module.exports = new ServiceTester({
-  id: 'travis-build',
-  title: 'Travis CI',
-  pathPrefix: '/travis',
-}))
+const t = (module.exports = require('../tester').createServiceTester())
 
 // Travis (.org) CI
 
diff --git a/services/website/website-redirect.service.js b/services/website/website-redirect.service.js
index adaf5a7bf2..03be518ec7 100644
--- a/services/website/website-redirect.service.js
+++ b/services/website/website-redirect.service.js
@@ -56,7 +56,7 @@ module.exports = redirector({
   route: {
     base: '',
     format:
-      'website-(([^-/]|--|//)+)-(([^-/]|--|//)+)(-(([^-/]|--|//)+)-(([^-/]|--|//)+))?/([^/]+)/(.+)',
+      'website-(([^-/]|--|//)+)-(([^-/]|--|//)+)(-(([^-/]|--|//)+)-(([^-/]|--|//)+))?/([^/]+)/(.+?)',
     capture: [
       // Some of these could be made into non-capturing groups so these unused
       // params would not need to be declared.
diff --git a/services/wercker/wercker.service.js b/services/wercker/wercker.service.js
index 7a444c15f7..b72dbd3650 100644
--- a/services/wercker/wercker.service.js
+++ b/services/wercker/wercker.service.js
@@ -23,7 +23,7 @@ module.exports = class Wercker extends BaseJsonService {
     return {
       base: 'wercker',
       format:
-        '(?:(?:ci/)([a-fA-F0-9]{24})|(?:build|ci)/([^/]+/[^/]+))(?:/(.+))?',
+        '(?:(?:ci/)([a-fA-F0-9]{24})|(?:build|ci)/([^/]+/[^/]+?))(?:/(.+?))?',
       capture: ['projectId', 'applicationName', 'branch'],
     }
   }