Change some code regarding logging and themes