updated themes / minor codeenhancement