[neo theme] Add
[cypher mode] Add
[cypher mode] Fix coding style, remove unused code

Issue #2501