diff --git a/apps.json b/apps.json
index 69367a4f9..d42035ec8 100644
--- a/apps.json
+++ b/apps.json
@@ -3046,7 +3046,7 @@
   "name": "Kitchen Combo",
   "icon": "kitchen.png",
   "version":"0.01",
-  "description": "Combination of the stepo, walkersclock, arrow and waypointer apps into a multiclock format.",
+  "description": "Combination of the stepo, walkersclock, arrow and waypointer apps into a multiclock format. 'Everything but the kitchen'. Requires firmware v2.08.167 or later",
   "tags": "tool,outdoors,gps",
   "readme": "README.md",
   "interface":"waypoints.html",
diff --git a/apps/kitchen/README.md b/apps/kitchen/README.md
new file mode 100644
index 000000000..3312f4381
--- /dev/null
+++ b/apps/kitchen/README.md
@@ -0,0 +1,199 @@
+# Kitchen Combo - a multiclock format of the waypointer, walksersclock, stopo and arrow apps.
+
+![](screenshot_kitchen.jpg)
+
+*...everything but the kitchen sink..*
+
+NOTE: This app require Bangle firmware 2.08.187 or later.  
+
+The app is aimed at navigation whilst walking. Please note that it
+would be foolish in the extreme to rely on this as your only
+navigation aid!
+
+Please refer to the section on calibration of the compass.  This
+should be done each time the app is going to be used.
+
+The app has 4 faces that can quickly be switched from one to another.
+* Stepo - a large font clock that dosplays the current steps in a doughnut guauge
+* GPS - when the GPS is on displays current grid ref, lat, lon, speed, altitude and course
+* Digi - a digital clock with day and date, displays battery and memory status (click BTN1)
+* Waypointer - a compass arrow that points to a selected waypoint when the GPS is on.
+  - enables you to mark waypoints and cycle through a list of waypoints
+  - shows distance and bearing to currently selected waypoint
+
+
+## Common buttons used to navigate through the app
+
+* BTN3 - short press, next app/clock face
+* BTN3 - long press, reset the watch
+* BTN2 - long press, start the app launcher
+
+The following buttons depend on which face is currently in use
+
+* BTN1 - Short press
+  - Digi : Cycle the battery, memory display on the mode line
+  - GPS : Cycle through the GPS data displays (grid ref, lat lon, speed, alt, course)
+  - Waypointer : Select previous waypoint
+* BTN1 - long press
+  - GPS : switch GPS on or off
+  - Waypointer : set or unset the current waypoint
+* BTN2 - short press
+  - Waypointer : select next waypoint
+
+
+## Stepo
+![](screenshot_stepo.jpg)
+
+- Displays the time in large font
+- Display current step count in a doughnut guage
+- Show step count in the middle of the doughnut guage
+- The guage show percentage of steps out of a goal of 10000 steps
+- When the battery is less than 25% the doughnut turns red
+- Use BTN3 to switch to the next app
+
+## GPS
+![](screenshot_gps.jpg)
+- Use BTN1 long press to switch the GPS on or off
+- Use BTN1 short press to switch between the display of the Os grid refernce, lat lon, speed, alt, course.
+- Use BTN3 to switch to the next app
+
+## Digi
+![](screenshot_digi.jpg)
+- Displays the time in large font
+- Display day and date
+- Use BTN1 to switch between display of battery and memory %.
+- Use BTN3 to switch to the next app.
+
+## Waypointer
+- Use BTN1 to select previous waypoint (when GPS is on)
+- Use BTN2 to select the next waypoint (when GPS is on)
+- Use BTN3 to switch to the next app
+- Use BTN1 long press to clear a waypoint or to record the current position
+
+When the GPS is off this screen acts as a compass and points
+North. The white digits below the arrow show your current heading
+with reference to North.
+
+When the GPS in on the screen points to the selected waypoint which
+are loaded from the waypoints.json file. The compass arrow now points
+in the direction you need to walk in. Once you have selected a
+waypoint a bearing from your current position (received from a GPS
+fix) is calculated and the compass is set to point in that direction.
+If the arrow is pointing to the left, turning left should straighten
+the arrow up so that it is pointing straight ahead.
+
+The large digits are the bearing from the current position. On the
+left is the distance to the waypoint in local units. When the
+selected waypoint has a lat/lon recorded the text of the distance and
+waypoint name will be shown in blue.  If the waypoint name is shown
+in white it means it is available to record a waypoint.
+
+Use BTN1 and BTN2 to select the previous or next waypoint
+respectively. In the screen shot below a waypoint giving the location
+of Stone Henge has been selected.
+
+![](screenshot_stone.jpg)
+
+The screenshot above shows that Stone Henge is 259.9 miles from the
+current location. To travel towards Stone Henge I need to turn
+slightly right until the arrow is pointing straight ahead. As you
+continue to walk in the pointed direction you should see the distance
+to the waypoint reduce.  The frequency of updates will depend on
+which settings you have used in the GPS.
+
+At the top of the screen you can see two widgets.  These are the [GPS
+Power
+Widget](https://github.com/espruino/BangleApps/tree/master/apps/widgps)
+and the [Compass Power Indicator Widget]. These can be installed
+seperately and provide you a indication of when the GPS and Compass
+are switched on and drawing power.
+
+
+### Marking Waypoints
+
+The app lets you mark your current location as follows. There are
+vacant slots in the waypoint file which can be allocated a
+location. In the distributed waypoint file these are labelled WP0 to
+WP4. Select one of these - WP2 is shown below.
+
+![](screenshot_wp2_cleared.jpg)
+
+Bearing and distance are both zero as WP2 has currently no GPS
+location associated with it. To mark the location, long press BTN1.
+
+![](screenshot_wp2_set.jpg)
+
+The app indicates that WP2 is now marked by changing the color to
+blue. The distance should be small as shown in the screen shot as you
+have just marked your current location.
+
+You can free the waypoint by long pressing BTN1 again.
+
+
+### Waypoint JSON file
+
+When the app is loaded from the app loader, a file named
+`waypoints.json` is loaded along with the javascript etc. The file
+has the following contents:
+
+
+```
+[
+  {
+  "name":"NONE"
+  },
+  {
+  "name":"No10",
+  "lat":51.5032,
+  "lon":-0.1269
+  },
+  {
+  "name":"Stone",
+  "lat":51.1788,
+  "lon":-1.8260
+  },
+  { "name":"WP0" },
+  { "name":"WP1" },
+  { "name":"WP2" },
+  { "name":"WP3" },
+  { "name":"WP4" }
+]
+```
+
+The file contains the initial NONE waypoint which is useful if you
+just want to display course and speed. The next two entries are
+waypoints to No 10 Downing Street and to Stone Henge - obtained from
+Google Maps. The last five entries are entries which can be *marked*.
+
+You add and delete entries using the Web IDE to load and then save
+the file from and to watch storage. The app itself does not limit the
+number of entries although it does load the entire file into RAM
+which will obviously limit this.
+
+
+### Waypoint Editor
+
+Clicking on the download icon of gpsnav in the app loader invokes the
+waypoint editor.  The editor downloads and displays the current
+`waypoints.json` file. Clicking the `Edit` button beside an entry
+causes the entry to be deleted from the list and displayed in the
+edit boxes. It can be restored - by clicking the `Add waypoint`
+button. A new markable entry is created by using the `Add name`
+button. The edited `waypoints.json` file is uploaded to the Bangle by
+clicking the `Upload` button.
+
+
+### Calibration of the Compass
+
+The Compass should be calibrated before using the App to navigate to
+a waypoint (or a series of waypoints).  To do this use either the
+Arrow Compass or the [Navigation
+Compass](https://github.com/espruino/BangleApps/tree/master/apps/magnav).
+Open the compass app and clicking on BTN3.  The calibration process
+takes 30 seconds during which you should move the watch slowly
+through figures of 8. It is important that during calibration the
+watch is fully rotated around each of it axes. If the app does give
+the correct direction heading or is not stable with respect to tilt
+and roll - redo the calibration by pressing *BTN3*. Calibration data
+is recorded in a storage file named `magnav.json`.
+
diff --git a/apps/kitchen/screenshot_digi.jpg b/apps/kitchen/screenshot_digi.jpg
new file mode 100644
index 000000000..b900d9d04
Binary files /dev/null and b/apps/kitchen/screenshot_digi.jpg differ
diff --git a/apps/kitchen/screenshot_gps.jpg b/apps/kitchen/screenshot_gps.jpg
new file mode 100644
index 000000000..8d3f9796c
Binary files /dev/null and b/apps/kitchen/screenshot_gps.jpg differ
diff --git a/apps/kitchen/screenshot_kitchen.jpg b/apps/kitchen/screenshot_kitchen.jpg
new file mode 100644
index 000000000..d4abdadde
Binary files /dev/null and b/apps/kitchen/screenshot_kitchen.jpg differ
diff --git a/apps/kitchen/screenshot_stepo.jpg b/apps/kitchen/screenshot_stepo.jpg
new file mode 100644
index 000000000..4e5c88a62
Binary files /dev/null and b/apps/kitchen/screenshot_stepo.jpg differ
diff --git a/apps/kitchen/screenshot_stone.jpg b/apps/kitchen/screenshot_stone.jpg
new file mode 100644
index 000000000..831e34dc9
Binary files /dev/null and b/apps/kitchen/screenshot_stone.jpg differ
diff --git a/apps/kitchen/screenshot_wp2.jpg b/apps/kitchen/screenshot_wp2.jpg
new file mode 100644
index 000000000..1c27af927
Binary files /dev/null and b/apps/kitchen/screenshot_wp2.jpg differ
diff --git a/apps/kitchen/screenshot_wp2_cleared.jpg b/apps/kitchen/screenshot_wp2_cleared.jpg
new file mode 100644
index 000000000..1ee523f87
Binary files /dev/null and b/apps/kitchen/screenshot_wp2_cleared.jpg differ
diff --git a/apps/kitchen/screenshot_wp2_set.jpg b/apps/kitchen/screenshot_wp2_set.jpg
new file mode 100644
index 000000000..48ef3d6ad
Binary files /dev/null and b/apps/kitchen/screenshot_wp2_set.jpg differ