Added HSTORE, also added correct all comon_colours
Added correct rus colour
Apply some refactoring