diff --git a/exercises/03_css/01_formatting/express.js b/exercises/03_css/01_formatting/express.js
deleted file mode 100644
index 58a53db..0000000
--- a/exercises/03_css/01_formatting/express.js
+++ /dev/null
@@ -1,38 +0,0 @@
-
-'use strict'
-
-const express = require('express')
-const bodyParser = require('body-parser')
-const app = express()
-app.use(express.static('public'))
-app.use(bodyParser.urlencoded({ extended: true }))
-
-const port = 8080
-
-app.get('/', (req, res) => {
-	res.sendFile(`${__dirname}/html/hello.html`)
-})
-
-app.get('/test', (req, res) => {
-	res.sendFile(`${__dirname}/html/csstest.html`)
-})
-
-app.get('/comparison', (req, res) => {
-	res.sendFile(`${__dirname}/html/comparison.html`)
-})
-
-app.get('/hello', (req, res) => {
-	res.sendFile(`${__dirname}/html/hello-world.html`)
-})
-
-app.get('/selectors', (req, res) => {
-	res.sendFile(`${__dirname}/html/selectors.html`)
-})
-
-app.get('/targets', (req, res) => {
-	res.sendFile(`${__dirname}/html/targets.html`)
-})
-
-app.listen(port, () => {
-	console.log(`app listening on port ${port}`)
-})
diff --git a/exercises/03_css/01_formatting/index.js b/exercises/03_css/01_formatting/index.js
new file mode 100644
index 0000000..3784d93
--- /dev/null
+++ b/exercises/03_css/01_formatting/index.js
@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+
+const Koa = require('koa')
+const Router = require('koa-router')
+const app = new Koa()
+const router = new Router()
+const views = require('koa-views')
+app.use(require('koa-static')('public'))
+const port = 8080
+
+app.use(views(`${__dirname}/views`, { extension: 'html' }, {map: { handlebars: 'handlebars' }}))
+
+router.get('/', async ctx => await ctx.render('hello'))
+router.get('/test', async ctx => await ctx.render('csstest'))
+router.get('/comparison', async ctx => await ctx.render('comparison'))
+router.get('/hello', async ctx => await ctx.render('hello-world'))
+router.get('/selectors', async ctx => await ctx.render('selectors'))
+router.get('/targets', async ctx => await ctx.render('targets'))
+
+app.use(router.routes())
+module.exports = app.listen(port, () => console.log(`listening on port ${port}`))
diff --git a/exercises/03_css/01_formatting/package.json b/exercises/03_css/01_formatting/package.json
index 31e17ad..ac7ecb5 100644
--- a/exercises/03_css/01_formatting/package.json
+++ b/exercises/03_css/01_formatting/package.json
@@ -1,7 +1,6 @@
 {
   "name": "01_formatting",
   "version": "1.0.0",
-  "description": "",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -9,6 +8,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "express": "^4.16.2"
-  }
+    "express": "^4.16.2",
+    "koa": "^2.6.2",
+    "koa-router": "^7.4.0",
+    "koa-static": "^5.0.0",
+    "koa-views": "^6.1.5"
+  },
+  "description": ""
 }
diff --git a/exercises/03_css/02_layout/express.js b/exercises/03_css/02_layout/express.js
deleted file mode 100644
index cacedf0..0000000
--- a/exercises/03_css/02_layout/express.js
+++ /dev/null
@@ -1,34 +0,0 @@
-
-'use strict'
-
-const express = require('express')
-const bodyParser = require('body-parser')
-const app = express()
-app.use(express.static('public'))
-app.use(bodyParser.urlencoded({ extended: true }))
-
-const port = 8080
-
-app.get('/', (req, res) => {
-	res.sendFile(`${__dirname}/html/boxmodel.html`)
-})
-
-app.get('/boxmodel', (req, res) => {
-	res.sendFile(`${__dirname}/html/boxmodel.html`)
-})
-
-app.get('/columns', (req, res) => {
-	res.sendFile(`${__dirname}/html/columns.html`)
-})
-
-app.get('/floating', (req, res) => {
-	res.sendFile(`${__dirname}/html/floating.html`)
-})
-
-app.get('/menu', (req, res) => {
-	res.sendFile(`${__dirname}/html/menu.html`)
-})
-
-app.listen(port, () => {
-	console.log(`app listening on port ${port}`)
-})
diff --git a/exercises/03_css/02_layout/index.js b/exercises/03_css/02_layout/index.js
new file mode 100644
index 0000000..edaffdb
--- /dev/null
+++ b/exercises/03_css/02_layout/index.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const Koa = require('koa')
+const Router = require('koa-router')
+const app = new Koa()
+const router = new Router()
+const views = require('koa-views')
+app.use(require('koa-static')('public'))
+const port = 8080
+
+app.use(views(`${__dirname}/views`, { extension: 'html' }, {map: { handlebars: 'handlebars' }}))
+
+router.get('/', async ctx => await ctx.render('boxmodel'))
+router.get('/boxmodel', async ctx => await ctx.render('boxmodel'))
+router.get('/columns', async ctx => await ctx.render('columns'))
+router.get('/floating', async ctx => await ctx.render('floating'))
+router.get('/menu', async ctx => await ctx.render('menu'))
+
+app.use(router.routes())
+module.exports = app.listen(port, () => console.log(`listening on port ${port}`))
diff --git a/exercises/03_css/02_layout/package.json b/exercises/03_css/02_layout/package.json
index ecb24e5..23ad549 100644
--- a/exercises/03_css/02_layout/package.json
+++ b/exercises/03_css/02_layout/package.json
@@ -1,7 +1,6 @@
 {
   "name": "02_layout",
   "version": "1.0.0",
-  "description": "",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -9,6 +8,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "express": "^4.16.2"
-  }
+    "express": "^4.16.2",
+    "koa": "^2.6.2",
+    "koa-router": "^7.4.0",
+    "koa-static": "^5.0.0",
+    "koa-views": "^6.1.5"
+  },
+  "description": ""
 }