merge in master, fix illegal characters, activate outkids theme