Adding terminal theme, removing some redundant stuff.