Theme nearly final