Replace with readable theme
Small mods
Added service for angular app. Added model mods for clarity