Adding stuff from Rush25's theme