fix: theme simplification

Rodgers Gitau requested to merge form-elements into master

Merge request reports