tiny changes
- rearranged code
- avtivate terminal color theme