club theme improvements