Updated to work out of the box and with color theme