Added extra LAFs and some fixes to themes