Fixes bug on themes