Read theme design clean up.

Signed-off-by: Sonia <sonia@nudge.ca>