framed out client app, added theme resources
merge