No need to change the theme, it just works :) Fix #1, Fix #2