Added theme and started on EVIL support