Modified Base Template to match Xawaash