Improve Less Basic Theme