finishing off serve for theme dev