simplifying our theme dramatically