Added theme modifications and lain
Now uses lain
Modified