Aki theme fixes and improvements