completed tweaking theme