Temporaly remove Theme switching for issue #29