Features/wiki style modify