Continued theme implementation