Fix Code return and test theme