More modifications to the 'the-trekkie' theme