Update maki markers and minor theme fix