Added more controllers and switch to bootswatch