fixes on theme