Little changes, Readable theme needs cleanup