test

This reverts commit 6ad1b1ce52.

.clang-format

@@ -0,0 +1,82 @@
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: false
+AlignEscapedNewlines: Right
+AlignOperands: false
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+BreakStringLiterals: true
+ColumnLimit: 100
+CompactNamespaces: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+IndentCaseLabels: false
+IndentPPDirectives: AfterHash
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+PenaltyBreakAssignment:					  50
+PenaltyBreakBeforeFirstCallParameter:	   0
+PenaltyBreakComment:					 100
+PenaltyBreakFirstLessLess:				 200
+PenaltyBreakString:						 100
+PenaltyBreakTemplateDeclaration:		   0
+PenaltyExcessCharacter:					  10
+PenaltyReturnTypeOnItsOwnLine:			1000
+PointerAlignment: Left
+ReflowComments: true
+SortIncludes: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 4
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++17
+TabWidth: 4
+UseTab: Always
+---
+Language: Cpp
+---
+Language: Java
+#BasedOnStyle: Google
+#BreakAfterJavaFieldAnnotations: true

.git_pre_commit_hook.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-ABORT="\033[31mAbort:\033[00m"
-SUCCESS="\033[32mSuccess:\033[00m"
-INFO="\033[33mInfo:\033[00m"
-
-BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
-
-if [ -z $BRANCH_NAME ]
-then
-	echo -e $ABORT "You are not on any branch."
-	exit 1
-fi
-
-if [ $BRANCH_NAME == "master" ]
-then
-	echo -e $ABORT "Commiting to master is prohibited."
-	exit 1
-fi
-
-exit 0

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: sourcetrail
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -1,24 +1,75 @@
 /build/
+build-*
 /distr/
+/deps/
 
-/bin/app/Debug/
-/bin/app/Release/
-/bin/app/data/log/
-/bin/app/data/projects/
-/bin/app/data/ApplicationSettings.xml
-/bin/app/data/window_settings.ini
-/bin/app/data/*.sqlite
+/bin/app/data/cxx
+/bin/app/data/java/lib/
+/bin/app/data/projects/ignored/
+/bin/app/data/python/
+/bin/app/user/log/
+/bin/app/user/ApplicationSettings.xml
+/bin/app/user/window_settings.ini
+/bin/app/*.log
 
-/bin/lib/
-
-/bin/test/Debug/
-/bin/test/Release/
 /bin/test/data/log/
-/bin/test/data/temp.xml
 /bin/test/data/TestSettings.xml
-/bin/test/data/*.sqlite
+/bin/test/data/CommandlineTestSuite/settings.xml
+/bin/test/data/ConfigManagerTestSuite/temp.xml
+/bin/test/data/UtilityMavenTestSuite/effective-pom.xml
+/bin/test/data/SourceGroupTestSuite/java_maven/input/sourcetrail_dependencies
 
-/setup/Linux/lib/*
+/java_indexer/target/
+
+/setup/Linux/lib/
 
 .DS_Store
 .idea
+.vscode
+__pycache__
+
+/ide_plugins/vs/vs2015/SourcetrailPlugin/SourcetrailExtension/bin
+/ide_plugins/vs/vs2015/SourcetrailPlugin/SourcetrailExtension/obj
+/ide_plugins/vs/vs2015/SourcetrailPlugin/SourcetrailExtensionTests/bin/Debug
+/ide_plugins/vs/vs2015/SourcetrailPlugin/SourcetrailExtensionTests/bin/Release
+/ide_plugins/vs/vs2015/SourcetrailPlugin/SourcetrailExtensionTests/obj
+/ide_plugins/vs/vs2015/SourcetrailPlugin/SourcetrailExtensionUtility/bin
+/ide_plugins/vs/vs2015/SourcetrailPlugin/SourcetrailExtensionUtility/obj
+/ide_plugins/vs/vs2015/SourcetrailPlugin/VCProjectEngineWrapperInterfaces/bin
+/ide_plugins/vs/vs2015/SourcetrailPlugin/VCProjectEngineWrapperInterfaces/obj
+/ide_plugins/vs/vs2015/SourcetrailPlugin/VCProjectEngineWrapper/bin
+/ide_plugins/vs/vs2015/SourcetrailPlugin/VCProjectEngineWrapper/obj
+/ide_plugins/vs/vs2015/SourcetrailPlugin/VCProjectEngineWrapperFactories/bin
+/ide_plugins/vs/vs2015/SourcetrailPlugin/VCProjectEngineWrapperFactories/obj
+
+/ide_plugins/vs/vs2015/SourcetrailPlugin/TestResults
+
+*.srctrldb
+*.srctrlbm
+*.suo
+*.vcxproj.user
+*.sqlite
+*.pch
+*.swp
+*.swo
+*.VC.db
+*.timing
+
+.clang_complete
+.ycm_extra_conf.py
+.ycm_extra_conf.pyc
+
+Sourcetrail.srctrlprj
+Sourcetrail_dev.srctrlprj
+
+Makefile
+CMakeLists.txt.user*
+/__pycache__/
+
+/deployment/windows/wixSetup/bin
+/deployment/windows/wixSetup/build
+/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/bin
+/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj
+/deployment/windows/wixSetup/CustomActions/.vs
+/deployment/windows/wixSetup/Setup/build/Setup/Release
+/deployment/windows/wixSetup/Setup/build/Setup/x64

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "submodules/SourcetrailPythonIndexer"]
+	path = submodules/SourcetrailPythonIndexer
+	url = https://github.com/CoatiSoftware/SourcetrailPythonIndexer.git

.travis.yml

@@ -0,0 +1,26 @@
+language: bash
+
+services: docker
+
+install:
+  - chmod 777 deployment/dockerfiles/linux/travis_ci/entrypoint.sh
+  - docker build -t coatisoftware/local deployment/dockerfiles/linux/travis_ci
+
+script:
+  - COMMIT_HASH=$(git rev-parse HEAD)
+  - docker run --name builder coatisoftware/local ${COMMIT_HASH}
+  - docker cp builder:/home/builder/Sourcetrail/release $TRAVIS_BUILD_DIR/release
+
+deploy:
+  provider: releases
+  api_key:
+    secure: b+fTcE73+5nkYufBNzGdxnwbx4a2BQr7iy28wdcr+8NrCxgq4mhmuZd+R3JzE7mt3ehEfUbUkXPLwefEcTFkqxXN6WdBjJYTa2JxAHkBuYiSG9X7voNCOU3SWaucY77FTdt5MlWKVOEzoKNT+tbBuLlWKNyPnFLE0JArc9w4DfvCbHos9ikTtiT1suE+OiIgt28SjD6MD4mIDmEHcKkZs1SfNxz8zhkJBp7y0iJOFPaZHZ9wE2DMox5h26ks13NMYP9mkYgZDTMppabuR8KtjGTJB7NSY3Uoj+6AYdGr5hfpzMIzLjfstagfBzLWpnuz29XwUhYR02MTRiJS6h8wXoO5twxWEKIeUT7xEjSZzdirynrErMDThz90vli0gaoZyIhU01sS9lOUozkdQJEg9Wosxs/586bShHOqhvhrfeCv2Z/7u9ftnpm7U+GaFxk3j1ZPHnSt6XcLz2wDcYIjKgsc8dvmMxYTJYLkXENU5XTkKXKfMHfweiZPWBUBjjMpcZWEyw8NQ/IsegMhXlptLsxr5N5A54KipnJK36b52vryIUzzQd4uM/pcWn5j2Il/KagM5U/kRhQDCxAozQ1Ub0HWqM+4WdCxzAg1FEUly7Y68FIVeeD19P7TAPRBGeljmr3vEdJHnr2z20dubWyhOlZ7NfTcd1drWthpN9ZvvT4=
+  file_glob: true
+  file:
+    - "$TRAVIS_BUILD_DIR/release/Sourcetrail*.tar.gz"
+    - "$TRAVIS_BUILD_DIR/release/Sourcetrail*.AppImage"
+  overwrite: true
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: CoatiSoftware/Sourcetrail

AUTHORS.txt

@@ -0,0 +1,11 @@
+Authors
+=======
+
+Andreas Stallinger
+Eberhard Gräther (@egraether) <egraether@coati.io>
+Malte Langkabel (@mlangkabel) <mlangkabel@coati.io>
+Manuel Dobusch
+Viktoria Pfausler
+Louis St-Amour (@LouisStAmour) <LouisStAmour@gmail.com>
+
+Note: (@user) means a github user name.

CONTRIBUTING.md

@@ -0,0 +1,14 @@
+# Contributing
+If you like this project and want to get involved, there are lots of ways you can help:
+
+* __Spread the word.__ The more people want this project to grow, the greater the motivation for the developers to get things done.
+* __Fund the development.__ Further development and maintainance of this project is crowd funded via [Patreon](https://www.patreon.com/sourcetrail). If you would like Sourcetrail to grow and improve but cannot spare the time to contribute your self, please consider making a pledge.
+* __Test Sourcetrail.__ Run it on your own source code. If you find any issues, just report it here. Best, include some detailed step-by-step instructions that illustrate how to reproduce the issue, so that we can use it as a basis to craft a test case for our continuous integration and no one will ever break that case again.
+* __Write some code.__ Don't be shy here. You can implement whole new features or fix some bugs, but you can also do some refactoring if you think that it benefits the readability or the maintainability of the code. Still, no matter if you just want to work on cosmetics or implement new features, it would be best if you create an issue here on the issue tracker before you actually start handing in pull requests, so that we can discuss those changes first and thus raise the probability that those changes will get pulled quickly.
+
+To create a pull request, follow these steps:
+* Fork the Repo on GitHub.
+* Make your commits.
+* If you added functionality or fixed a bug, please add a test.
+* Add your name to the AUTHORS.txt file.
+* Push to your fork and submit a pull request.

LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,72 +1,254 @@
-### Masterproject
+# Sourcetrail
 
-#### Setup
+[Sourcetrail](https://www.sourcetrail.com/) is a free and open-source cross-platform source explorer that helps you get productive on unfamiliar source code.
 
-##### External Software
+Windows: [![Build status](https://ci.appveyor.com/api/projects/status/0c258a2opn3loyc2/branch/master?svg=true)](https://ci.appveyor.com/project/mlangkabel/sourcetrail/branch/master)
 
-* QT 5.5
-* CxxTest 4.3
-* Valgrind 3.9.0 (linux)
-* Clang & LLVM (installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
-* Boost 1.59
-* Eigen 3.2.6
+Linux: [![Build Status](https://travis-ci.org/CoatiSoftware/Sourcetrail.svg?branch=master)](https://travis-ci.org/CoatiSoftware/Sourcetrail)
 
-##### Environment Variables
 
-* QT_DIR - ...\Qt\Qt5.2.1\5.2.1\<IDE>\
-* CXX_TEST_DIR - .../cxxtest-4.3/
-* CLANG_DIR - .../clang-llvm/
-* BOOST_159_DIR - .../boost_1_59_0
-* EIGEN_DIR - .../eigen
+__Links__
+* [Website](https://www.sourcetrail.com/)
+* [Download](https://www.sourcetrail.com/downloads)
+* [Quick Start Guide](https://www.sourcetrail.com/documentation/#QUICKSTARTGUIDE)
+* [Documentation](https://www.sourcetrail.com/documentation)
+* [Changelog](CHANGELOG.md)
+* [Slack Channel](https://join.slack.com/t/sourcetrail/shared_invite/enQtNDc3MjcyOTk5MTc0LTNhOWZhZjAxZmU1NTM0YjhhMzRhZWE1NTQ2NjQyYjc1ODE2MzViOTliMWUwODBjN2NlMjkwMDc0MjAxMzJkY2E)
+* [Mailing List](https://coati.us12.list-manage.com/subscribe/post?u=3dabab4e475b5ed577d1dcd0f&id=cf7301fc53)
+* [Patreon](https://www.patreon.com/sourcetrail)
 
-For Win32:
-* VLD_DIR - .../Visual Leak Detector
-* path - apped path to git.exe
+!["Sourcetrail User Interface"](docs/readme/user_interface.png "Sourcetrail User Interface")
 
-##### Settings
+Sourcetrail is:
+* free
+* working offline
+* operating on Windows, macOS and Linux
+* supporting C, C++, Java and Python
+* offering an SDK ([SourcetrailDB](https://github.com/CoatiSoftware/SourcetrailDB)) to write custom language extensions
 
-Run setup script:
-$ ./script/setup.sh
+## Support Sourcetrail via Patreon
 
-#### Release
+The ongoing development and regular software releases are made possible entirely by the support of [these awesome patrons](SPONSORS.md)! If you'd like to join them, please consider [becoming a patron](https://www.patreon.com/sourcetrail) of Sourcetrail.
 
-##### App
-* create release build
-* make sure it uses the Coati icon
-* obfuscate the executable using upx
+## Using Sourcetrail
 
-##### Data folder
-* put data folder in working directory
-* add empty log folder
-* add working tictactoe.xml project to /projects/tictactoe with sources in /projects/tictactoe/src
-* add empty app settings with one recent project tictactoe.xml
-* leave window_settings.ini with correct Coati start layout
+To setup Sourcetrail on your machine, you can either download the respective build for your operating system from our list of [Releases](https://www.sourcetrail.com/downloads) and install it on your machine, or use one of the following package managers:
 
-##### Package
-* add app
-* add web/coati_manual.pdf to package
+* Use the [Chocolatey package](https://chocolatey.org/packages/sourcetrail) with `choco install sourcetrail`
 
-##### Updating Clang on UNIX
+After your installation is complete, follow our [Quick Start Guide](https://www.sourcetrail.com/documentation/#QUICKSTARTGUIDE) to get to know Sourcetrail.
 
-$ cd .../clang_llvm
+## How to Report Issues
 
-$ cd llvm
-$ git pull origin master
+You can post all your feature requests and bug reports on our [issue tracker](https://github.com/CoatiSoftware/Sourcetrail/issues).
 
-$ cd tools/clang
-$ git pull origin master
+### Reporting
 
-$ cd tools/extra/
-$ git pull origin master
+Use the following template:
 
-$ cd ../../../../../build_debug
-$ cmake -G Ninja ../llvm
-$ ninja -j4 check-all
+* platform version:
+* Sourcetrail version:
+* description of the problem:
+* steps to reproduce the problem:
 
-$ cd ../release_build
-$ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ../llvm
-$ ninja -j4 check-all
 
-##### Remarks
+### Supporting
 
-* Boost lib dir: rename library directory for your system (e.g.: 'lib32-msvc-12.0') to 'lib'
+If you want to support a certain feature request or you have the same bug that another user already reported, please let us know:
+* post a comment with "+1" to the issue
+* or send an email to support@sourcetrail.com with the issue ID
+
+## How to Contribute
+
+* Please read and follow the steps in [CONTRIBUTING.md](CONTRIBUTING.md) file.
+* You may want to look out for issues labeled [good first issue](https://github.com/CoatiSoftware/Sourcetrail/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) to find some initial tasks to tackle.
+* If you are looking for more information about Sourcetrail software development, please refer to our [wiki](https://github.com/CoatiSoftware/Sourcetrail/wiki).
+
+# How to Build
+
+Building Sourcetrail requires several dependencies to be in place on your machine. However, our CMake based setup allows to disable indexing support for specific languages which reduces the number of dependencies to a minimum.
+
+## Building the Base Application
+
+### Required Tools
+
+* __CMake v3.12 (required for Windows, Linux and MacOS)__
+    * __Reason__: Used to generate a build configuration for your build system
+    * __Download__: https://cmake.org/download
+
+* __Git (required for Windows, Linux and MacOS)__
+    * __Reason__: Used for version control and to automatically generate the Sourcetrail version number from commits and tags
+    * __Download__: https://git-scm.com/download
+    * __Remarks__: Make sure `git` is added to your `PATH` environment variable before running CMake
+
+* __Visual Studio (required for Windows)__
+    * __Reason__: Used for building Sourcetrail
+    * __Download__: https://visualstudio.microsoft.com/downloads/
+
+* __ccache (optional for Linux and MacOS)__
+    * __Reason__: Used to speed up rebuilds if found in `PATH`
+    * __Download__: https://ccache.dev/download.html
+
+### Required dependencies
+
+* __Boost 1.67__
+    * __Reason__: Used for file system access and interprocess communication
+    * __Prebuilt Download for Windows__: https://sourceforge.net/projects/boost/files/boost-binaries/
+    * __Building for Unix__:
+        ```
+        $ ./bootstrap.sh --with-libraries=filesystem,program_options,system,date_time
+        $ ./b2 --link=static --variant=release --threading=multi --runtime-link=static --cxxflags=-fPIC
+        ```
+
+* __Qt 5.12.3__
+    * __Reason__: Used for rendering the GUI and for starting additional (indexer) processes.
+    * __Prebuilt Download__: http://download.qt.io/official_releases/qt/
+
+### Building
+
+#### On Windows
+* To set up your build environment run:
+    ```
+    $ git clone https://github.com/CoatiSoftware/Sourcetrail.git
+    $ cd Sourcetrail
+    $ mkdir -p build/win64
+    $ cd build/win64
+    $ cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT=<path/to/boost_1_68_0> -DQt5_DIR=<path/to/Qt/version/platform/compiler/lib/cmake/Qt5> ../..
+    ```
+    _Hint: If you are using the CMake GUI, we recommend that you activate advanced mode. Also you may be required to add some of the defines via the "Add Entry" button._
+
+* After generating the build configuration, just open the Sourcetrail.sln file that was generated by CMake and build the Sourcetrail project.
+
+#### On Unix
+
+* To set up your build environment run:
+    ```
+    $ cd Sourcetrail
+    $ mkdir -p build/Release
+    $ cd build/Release
+    $ cmake -DCMAKE_BUILD_TYPE="Release" -DBOOST_ROOT=<path/to/boost_1_68_0> -DQt5_DIR=<path/to/Qt/version/platform/compiler/lib/cmake/Qt5> ../..
+    ```
+* Now start the build with:
+    ```
+    $ make Sourcetrail
+    ```
+
+### Running
+
+* Run Sourcetrail from within the build directory. During execution Sourcetrail needs resources from `bin/app/data` and `bin/app/user`. CMake creates symlinks within the build directory that make these directories accessible.
+
+
+## Enable C/C++ Language Support
+
+### Required dependencies
+
+* __LLVM/Clang 11.0.0__
+    * __Reason__: Used for running the preprocessor on the indexedes source code, building and traversing an Abstract Syntax Tree and generating error messages.
+    * __Building__: Make sure to check out the correct tag: `git checkout llvmorg-11.0.0`
+    * __Building for Windows__: Follow [these steps](https://clang.llvm.org/get_started.html) to build the project. Run the cmake command exactly as described.
+    * __Building for Unix__: Follow this [installation guide](http://clang.llvm.org/docs/LibASTMatchersTutorial.html) to build the project. Make sure to build with `-DLLVM_ENABLE_RTTI=ON`.
+
+### Building
+
+* Run CMake with these additional options:
+    ```
+    -DClang_DIR=<path/to/llvm_build>/lib/cmake/clang
+    -DBUILD_CXX_LANGUAGE_PACKAGE=ON
+    ```
+* Build Sourcetrail as described [above](#building).
+
+## Enable Java Language Support
+
+### Required dependencies
+
+* __JDK 1.8__
+    * __Reason__: Used to build the Java indexer and make it callable from the C++ code via JNI.
+    * __Remarks__: Make sure that `<jdk_root>/bin` is available in your `PATH` environmen variable and that the `JAVA_HOME` environment variable is set:
+        ```
+        JAVA_HOME=<path/to/Java>/jdk1.x.x_xxx
+        ```
+
+* __Maven__
+    * __REASON__: Used within Sourcetrail's automated tests.
+    * __Remarks__:  Make sure `.../apache-maven-x.x.x/bin` is available in your `PATH` environmen variable and that both `M2_HOME` and `MAVEN_HOME` environment variables are set:
+        ```
+        M2_HOME=.../apache-maven-x.x.x
+        MAVEN_HOME=.../apache-maven-x.x.x
+        ```
+
+### Building
+
+* Run CMake with these additional options:
+    ```
+    -DBUILD_JAVA_LANGUAGE_PACKAGE=ON
+    ```
+* Build Sourcetrail as described [above](#building).
+
+## Enable Python Language Support
+
+### Required Tools
+
+* __7z (required for Windows)__
+    * __REASON__: Used to extract the prebuilt SourcetrailPythonIndexer which is downloaded automatically during build execution.
+
+### Building
+
+* Run CMake with these additional options:
+    ```
+    -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON
+    ```
+* Build Sourcetrail as described [above](#building).
+
+
+## Creating the deployment Package
+
+### Windows
+
+#### Required Tools
+
+* __Visual Studio (required for Windows)__
+    * __Reason__: Used for building the Sourcetrail Windows installer.
+    * __Remarks__: Make sure to install the `.Net desktop development` workload.
+    * __Download__: https://visualstudio.microsoft.com/downloads/
+
+* __Wix 3.11__
+    * __Reason__: Used to build the `sourcetrail.msi` Windows installer.
+    * __Remarks__: Make sure to add `<path/to>/WiX Toolset v3.11/bin` to your `PATH` environment variable.
+    * __Download__: https://wixtoolset.org/releases/
+
+* __Wix extension for Visual Studio__
+    * __Reason__: Used to run Wix from the Visual Studio build environment.
+    * __Download__: https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2017Extension
+
+* __JRE__
+    * __Reason__: Used for indexing the java sample project that ships with the package.
+
+* __WinRAR__
+    * __Reason__: Used for creating the final zip files for the installer and the portable package.
+    * __Remarks__: Make sure to add `<path/to>/WinRAR` to your `PATH` environment variable.
+
+#### Building
+
+* Run `./script/deploy_windows.sh` from your Developer Command Prompt for Visual Studio. The script which will generate a 64bit build and packages it into a portable `.zip` file and a Wix-based Windows installer, each.
+
+### macOS
+
+After building, run the `bundle_install.sh` script within the build directory which will create a `Sourcetrail.app` bundle and generate a `Sourcetrail_<version>.dmg` container.
+
+### Linux
+
+Run `./setup/Linux/createPackages.sh` from the main directory, which creates both a `.tar.gz` and a `.AppImage` package in the main directory. Packaging depends on [linuxdeployqt](https://github.com/probonopd/linuxdeployqt).
+
+
+# How to Run the Tests
+
+The automated test suite of Sourcetrail is powered by [Catch2](https://github.com/catchorg/Catch2). To run the tests, simply execute the `Sourcetrail_test` binary. Before executing, please make sure to set the working directory to `./bin/test`.
+
+
+# License
+
+Sourcetrail is licensed under the [GNU General Public License Version 3](LICENSE.txt).
+
+# Trademark
+
+The "Sourcetrail" name is a trademark owned by Coati Software and is not included within the assets licensed under the GNU GPLv3.

SPONSORS.md

@@ -0,0 +1,59 @@
+# Sponsors
+
+Sponsors [via Patreon](https://www.patreon.com/sourcetrail).
+
+## Legendary Coatis
+
+* Akinobu Fujii
+* Mario van Beek
+* Timothee Besset
+
+## Super Coatis
+
+* Alexis Jeandet
+* Anshu Mathur
+* Chris Morley
+* Konstantin Kirenko
+* Louis St-Amour
+* William Wold
+
+## Regular Coatis
+
+* Alex B
+* Andreas
+* Anton
+* Bicakci, Inc.
+* BJ
+* Dio Lee
+* Ferenc Fejes
+* Frederic Simonis
+* Friedrich Hunstock
+* Graydon Hoare
+* IndustrialRobot
+* Jason Stevens
+* John Borland
+* Kikuchi Takanori
+* MangerDesPates
+* Matěj Týč
+* Max Bruckner
+* Michael F. Schönitzer
+* Nakul Dhotre
+* Neil Horlock
+* Nick Moore
+* Nils Moehrle
+* Pierre Fransson
+* Rémi Cohen-Scali
+* Rui Pires
+* Ryo Koyama
+* Simon
+* Sneakyferret
+* Stephan Roslen
+* Thorsten Dahlheimer
+* Tomi Joki-Korpela
+* Werner de Groot
+* X. Xu
+* Yacob Cohen-Arazi
+* Yang, Wenbo
+* 郝晨煜
+
+_Note: This file will be updated at the beginning of each month._

appveyor.yml

@@ -0,0 +1,44 @@
+version: 0.0.0.{build}
+image: Visual Studio 2017
+
+install:
+    ############################################################################
+    # Install Ninja
+    ############################################################################
+    - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip"
+    - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
+    - 7z x ninja.zip -oC:\projects\deps\ninja > nul
+    - set PATH=C:\projects\deps\ninja;%PATH%
+    - ninja --version
+    # Install SWIG by Choco
+    - ps: choco install -y --no-progress swig --version 4.0.1
+
+before_build:
+    - git submodule init
+    - git submodule update
+    - cd submodules/SourcetrailPythonIndexer
+    - git submodule init
+    - git submodule update
+    - cd ../..
+    - mkdir build
+    - cd build
+    - mkdir temp
+    - mkdir win64
+    - cd win64
+    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+    - cmake -G "Ninja" -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DQt5_DIR=C:/Qt/5.12.6/msvc2017_64/lib/cmake/Qt5 -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON -DCMAKE_BUILD_TYPE=Release ../../
+    - cd ../../
+
+build_script:
+    - cd build/win64
+    - ninja
+    - cd ../../
+
+artifacts:
+  - path: bin
+    name: bin
+    type: zip
+  - path: build
+    name: build
+    type: zip
+  

bin/app/data/ApplicationSettings_template.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- BOOL: 0, 1 -->
-<!-- INTEGER: int e.g 123 -->
-<!-- DECIMAL: float e.g 123.456 -->
-<!-- STRING: string e.g hello -->
-<!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
-
-<config>
-	<startup_project><!-- STRING: path to project settings xml file --></startup_project>
-
-	<source>
-		<compiler_flags>
-			<compiler_flag><!-- STRING: compiler flag, including the dash e.g. -v --></compiler_flag>
-		</compiler_flags>
-
-		<header_search_paths>
-			<header_search_path><!-- STRING: header search path for each path a header_search_path element --></header_search_path>
-		</header_search_paths>
-
-		<!-- MAC ONLY -->
-		<framework_search_paths>
-			<framework_search_path><!-- STRING: framework search path --></framework_search_path>
-		</framework_search_paths>
-	</source>
-
-	<application>
-		<font_name><!-- STRING: font name --></font_name>
-		<font_size><!-- INTEGER: font size in pt --></font_size>
-		<color_scheme><!-- STRING: color scheme path --></color_scheme>
-	</application>
-
-	<code>
-		<tab_width><!-- INTEGER: number of spaces to represent a tab in code files --></tab_width>
-
-		<snippet>
-			<snap_range><!-- INTEGER: max amount of lines that the current snippet will be extended to snap to scope start/end --></snap_range>
-			<expand_range><!-- INTEGER: amount of lines that the snippet range (not snapped) will be extended --></expand_range>
-		</snippet>
-	</code>
-
-	<user>
-		<has_seen_settings><!-- BOOL: if the user was already asked to enter app settings --></has_seen_settings>
-
-		<recent_projects>
-			<recent_project><!-- STRING: recent project path --></recent_project>
-		</recent_projects>
-	</user>
-</config>

bin/app/data/ProjectSettings_template.xml

@@ -7,28 +7,48 @@
 <!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
 
 <config>
-	<source>
-		<source_paths>
-			<source_path><!-- STRING: path to source file or directory, also used as header search path --></source_path>
-		</source_paths>
+	<version><!-- INTEGER: Version number --></version>
 
-		<compiler_flags>
-			<compiler_flag><!-- STRING: compiler flag, including the dash e.g. -v --></compiler_flag>
-		</compiler_flags>
+	<description><!-- STRING: optional description shown in overview. Symbols can be linked with syntax [main] --></description>
 
-		<header_search_paths>
-			<header_search_path><!-- STRING: header search path for each path a header_search_path element --></header_search_path>
-		</header_search_paths>
-
-		<!-- MAC ONLY -->
-		<framework_search_paths>
-			<framework_search_path><!-- STRING: framework search path --></framework_search_path>
-		</framework_search_paths>
-
-		<extensions>
-			<header_extensions><!-- STRING: extension for header/include e.g. .h --></header_extensions>
-			<source_extensions><!-- STRING: extension for source e.g. .cpp --></source_extensions>
-		</extensions>
-
-	</source>
+	<source_groups>
+		<source_group_xyz>
+			<type><!-- STRING: describes what kind of project this is, e.g. "C Source Group", "Java Source Group from Maven" --></type>
+			<standard><!-- STRING: language version, e.g. c++ '11' --></standard>
+			
+			<source_paths>
+				<source_path><!-- STRING: path to source file or directory, also used as header search path --></source_path>
+			</source_paths>
+			
+			<exclude_paths>
+				<exclude_path><!-- STRING: path to file or directory to exclude from analysis --></exclude_path>
+			</exclude_paths>
+			
+			<source_extensions>
+				<source_extension><!-- STRING: extension for source e.g. .cpp --></source_extension>
+			</source_extensions>
+				
+			<header_search_paths>
+				<header_search_path><!-- STRING: header search path for each path a header_search_path element --></header_search_path>
+			</header_search_paths>
+			
+			<use_source_paths_for_header_search><!-- BOOL: If enabled all subfolder of the source paths will be used for header search --></use_source_paths_for_header_search>
+			
+			<!-- begin MAC ONLY -->
+			<framework_search_paths>
+				<framework_search_path><!-- STRING: framework search path --></framework_search_path>
+			</framework_search_paths>
+			<!-- end MAC ONLY -->
+			
+			<compiler_flags>
+				<compiler_flag><!-- STRING: compiler flag, including the dash e.g. -v --></compiler_flag>
+			</compiler_flags>
+				
+			<build_file_path>
+				<vs_solution_path><!-- STRING: path to Visual Studio solution *.sln --></vs_solution_path>
+				<compilation_db_path><!-- STRING: path to Compilation Database --></compilation_db_path>
+			</build_file_path>
+		
+		</source_group_xyz>
+	</source_groups>
 </config>

bin/app/data/color_scheme_template.xml

@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+	COLOR:
+		1. HEX RGB: #RRGGBB - e.g. #00FF00
+		2. HEX ARGB: #AARRGGBB - e.g. #5500FF00
+		3. Qt5 color name - e.g. white (http://doc.qt.io/qt-5/qcolor.html)
+-->
+
+<config>
+	<search>
+		<background></background>
+
+		<button>
+			<normal></normal>
+			<hover></hover>
+			<press></press>
+			<disabled></disabled>
+			<icon></icon>
+		</button>
+
+		<field>
+			<text></text>
+			<background></background>
+			<highlight></highlight>
+		</field>
+
+		<popup>
+			<text></text>
+			<by_text></by_text>
+			<background></background>
+			<highlight></highlight>
+		</popup>
+
+		<query>
+			<none>
+				<normal></normal>
+				<hover></hover>
+			</none>
+			<command>
+				<normal></normal>
+				<hover></hover>
+			</command>
+			<operator>
+				<normal></normal>
+				<hover></hover>
+			</operator>
+		</query>
+	</search>
+
+	<code>
+		<background></background>
+
+		<file>
+			<background></background>
+
+			<title>
+				<text></text>
+				<normal></normal>
+				<hover></hover>
+				<press></press>
+				<icon></icon>
+			</title>
+
+			<ref_count>
+				<text></text>
+				<background></background>
+			</ref_count>
+		</file>
+
+		<snippet>
+			<background></background>
+
+			<title>
+				<text></text>
+				<background></background>
+				<hover></hover>
+			</title>
+
+			<line_number>
+				<text></text>
+				<background></background>
+			</line_number>
+
+			<syntax>
+				<normal></normal>
+				<directive></directive>
+				<keyword></keyword>
+				<type></type>
+				<comment></comment>
+				<number></number>
+				<quotation></quotation>
+				<function></function>
+			</syntax>
+
+			<selection>
+				<location>
+					<normal>
+						<border></border>
+						<fill></fill>
+					</normal>
+					<focus>
+						<border></border>
+						<fill></fill>
+					</focus>
+					<active>
+						<border></border>
+						<fill></fill>
+					</active>
+				</location>
+				<scope>
+					<normal>
+						<border></border>
+						<fill></fill>
+					</normal>
+					<focus>
+						<border></border>
+						<fill></fill>
+					</focus>
+					<active>
+						<border></border>
+						<fill></fill>
+					</active>
+				</scope>
+				<error>
+					<normal>
+						<border></border>
+						<fill></fill>
+					</normal>
+					<focus>
+						<border></border>
+						<fill></fill>
+					</focus>
+					<active>
+						<border></border>
+						<fill></fill>
+					</active>
+				</error>
+			</selection>
+		</snippet>
+	</code>
+
+	<graph>
+		<background></background>
+
+		<node>
+			<!-- REQUIRED -->
+			<default>
+				<!-- NODE TEMPLATE-->
+				<like><!-- NODE TYPE NAME: Imitates the look of that node type. If defined all colors will be ignored --></like>
+
+				<fill>
+					<normal></normal>
+					<focus></focus> <!-- If not defined, the normal tag is used  -->
+				</fill>
+				<border>
+					<normal></normal>
+					<focus></focus> <!-- If not defined, the normal tag is used  -->
+				</border>
+				<text>
+					<normal></normal>
+					<focus></focus> <!-- If not defined, the normal tag is used  -->
+				</text>
+				<icon>
+					<normal></normal>
+					<focus></focus> <!-- If not defined, the normal tag is used  -->
+				</icon>
+				<hatching>
+					<normal></normal>
+					<focus></focus> <!-- If not defined, the normal tag is used  -->
+				</hatching>
+			</default>
+
+			<!-- OPTIONAL: type specific node colors can be overriden by using the TEMPLATE within a type tag below -->
+			<type></type>
+			<builtin_type></builtin_type>
+			<class></class>
+			<interface></interface>
+			<struct></struct>
+			<enum></enum>
+			<typedef></typedef>
+			<template_parameter></template_parameter>
+			<type_parameter></type_parameter>
+
+			<function></function>
+			<method></method>
+
+			<field></field>
+			<global_variable></global_variable>
+			<enum_constant></enum_constant>
+
+			<undefined></undefined>
+			<namespace></namespace>
+			<package></package>
+
+			<file></file>
+			<macro></macro>
+
+			<access></access>
+			<bundle></bundle>
+			<count_number></count_number> <!-- The small circles with numbers in the graph -->
+		</node>
+		<edge>
+			<!-- REQUIRED -->
+			<default>
+				<!-- EDGE TEMPLATE-->
+
+				<like><!-- EDGE TYPE NAME: Imitates the look of that edge type. If defined all colors will be ignored --></like>
+
+				<normal></normal>
+				<focus></focus> <!-- If not defined, the normal tag is used  -->
+			</default>
+
+			<!-- OPTIONAL: type specific edge colors can be overriden by using the TEMPLATE within a type tag below -->
+			<type_of></type_of>
+			<return_type></return_type>
+			<parameter_type></parameter_type>
+
+			<type_use></type_use>
+			<inheritance></inheritance>
+			<typedef></typedef>
+
+			<override></override>
+
+			<call></call>
+
+			<use></use>
+
+			<template_parameter></template_parameter>
+			<template_argument></template_argument>
+			<template_default_argument></template_default_argument>
+			<template_specialization></template_specialization>
+
+			<include></include>
+			<macro_use></macro_use>
+
+			<bundled_edges></bundled_edges>
+		</edge>
+	</graph>
+
+	<tool_tip>
+		<text></text>
+		<background></background>
+	</tool_tip>
+</config>

bin/app/data/color_schemes/bad_rainbow.xml

@@ -0,0 +1,588 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<config>
+	<window>
+		<background>#494949</background>
+		<separator>#CCCCCC</separator>
+		<focus>#9BF51D</focus>
+		<scrollbar>
+			<background>transparent</background>
+			<handle>#80999999</handle>
+			<line>#80999999</line>
+		</scrollbar>
+		<dock>
+			<text>white</text>
+			<background>#808080</background>
+			<line>#A0A0A0</line>
+			<icon_type>white</icon_type> <!-- white, grey, black -->
+		</dock>
+		<button>
+			<text>white</text>
+			<background>#CC494949</background>
+			<border>#D4D4D4</border>
+			<border_hover>white</border_hover>
+			<icon>white</icon>
+		</button>
+	</window>
+
+	<search>
+		<background>#494949</background>
+
+		<button>
+			<normal>#808080</normal>
+			<hover>#B1B1B1</hover>
+			<press>#CCCCCC</press>
+			<disabled>#606060</disabled>
+			<icon>white</icon>
+			<icon_disabled>#808080</icon_disabled>
+		</button>
+
+		<field>
+			<text>#FFFFFF</text>
+			<background>#494949</background>
+			<border>#808080</border>
+			<highlight>#B1B1B1</highlight>
+		</field>
+
+		<popup>
+			<text>#3D3D3D</text>
+			<by_text>#808080</by_text>
+			<background>#CCCCCC</background>
+			<highlight>#FFFFFF</highlight>
+			<line>#B1B1B1</line>
+		</popup>
+
+		<query>
+			<none>
+				<normal>
+					<fill>#B1B1B1</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#CCCCCC</fill>
+					<text>#3D3D3D</text>
+				</hover>
+			</none>
+			<command>
+				<normal>
+					<fill>#86BD40</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#9EC769</fill>
+					<text>#3D3D3D</text>
+				</hover>
+			</command>
+			<operator>
+				<normal>
+					<fill>#7D2724</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#8C2B29</fill>
+					<text>#3D3D3D</text>
+				</hover>
+			</operator>
+			<fulltext>
+				<normal>
+					<fill>#C2AFEF</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#AB96EA</fill>
+					<text>#3D3D3D</text>
+				</hover>
+			</fulltext>
+		</query>
+	</search>
+
+	<code>
+		<background>#595959</background>
+
+		<navigation>
+			<background>#494949</background>
+			<text>#CCCCCC</text>
+			<line>#FFF</line>
+		</navigation>
+
+		<file>
+			<background>#AAAAAA</background>
+
+			<title>
+				<text>black</text>
+				<normal>#CCCCCC</normal>
+				<hover>#CCCCCC</hover>
+				<press>#CCCCCC</press>
+				<icon>black</icon>
+				<border>#B1B1B1</border>
+				<hatching>grey</hatching>
+			</title>
+
+			<ref_count>
+				<text>#D4D4D4</text>
+				<background>#494949</background>
+			</ref_count>
+		</file>
+
+		<snippet>
+			<background>#494949</background>
+
+			<title>
+				<text>#A0A0A0</text>
+				<background>transparent</background>
+			</title>
+
+			<line_number>
+				<text>#D4D4D4</text>
+				<inactive_text>#A0A0A0</inactive_text>
+				<background>#494949</background>
+				<marker>
+					<active>#807F80</active>
+					<focus>#D4D4D4</focus>
+				</marker>
+			</line_number>
+
+			<syntax>
+				<text>#D4D4D4</text>
+				<directive>#00A0B6</directive>
+				<keyword>#00BCD6</keyword>
+				<type>#FF5961</type>
+				<comment>#78946B</comment>
+				<number>#FC7F30</number>
+				<quotation>#DB77DB</quotation>
+				<function>#FFCC3B</function>
+			</syntax>
+
+			<selection>
+				<text>black</text>
+				<background>#CCCCCC</background>
+			</selection>
+
+			<annotation>
+				<token>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#EDEDED</border>
+						<fill>transparent</fill>
+					</focus>
+					<active>
+						<border>#EDEDED</border>
+						<fill>#EDEDED</fill>
+						<text>#262626</text>
+					</active>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#9BDAFF</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</focus>
+					<active>
+						<border>white</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</active>
+				</local_symbol>
+				<scope>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+				</scope>
+				<error>
+					<normal>
+						<border>transparent</border>
+						<fill>#A0FF0000</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#FFFF0000</fill>
+					</focus>
+				</error>
+				<fulltext_search>
+					<normal>
+						<fill>#C2AFEF</fill>
+						<text>#3D3D3D</text>
+					</normal>
+					<focus>
+						<fill>#987CEA</fill>
+					</focus>
+				</fulltext_search>
+				<screen_search>
+					<normal>
+						<border>transparent</border>
+						<fill>#D2FA6E</fill>
+						<text>#262626</text>
+					</normal>
+					<focus>
+						<fill>#FA6EF3</fill>
+					</focus>
+				</screen_search>
+			</annotation>
+		</snippet>
+	</code>
+
+	<graph>
+		<background>#494949</background>
+
+		<node>
+			<default>
+				<fill>
+					<normal>#807F80</normal>
+				</fill>
+				<border>
+					<normal>#FFFFFF</normal>
+				</border>
+				<text>
+					<normal>#3D3D3D</normal>
+				</text>
+				<icon>
+					<normal>#3D3D3D</normal>
+				</icon>
+				<hatching>
+					<normal>#616061</normal>
+				</hatching>
+			</default>
+
+			<type>
+				<border>
+					<normal>#20FFFFFF</normal>
+					<highlight>#FFFFFF</highlight>
+				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
+			</type>
+			<built_in_type>
+				<like>type</like>
+			</built_in_type>
+			<class>
+				<like>type</like>
+			</class>
+			<interface>
+				<like>type</like>
+			</interface>
+			<struct>
+				<like>type</like>
+			</struct>
+			<enum>
+				<like>type</like>
+			</enum>
+			<union>
+				<like>type</like>
+			</union>
+			<typedef>
+				<like>type</like>
+			</typedef>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>
+
+			<function>
+				<fill>
+					<normal>#FFCC3B</normal>
+					<highlight>#FFD05A</highlight>
+				</fill>
+				<border>
+					<normal>transparent</normal>
+					<highlight>#FFFFFF</highlight>
+				</border>
+				<hatching>
+					<normal>#FFE8A6</normal>
+				</hatching>
+			</function>
+			<method>
+				<like>function</like>
+			</method>
+
+			<global_variable>
+				<fill>
+					<normal>#2FC2D6</normal>
+					<highlight>#38D3E8</highlight>
+				</fill>
+				<border>
+					<normal>transparent</normal>
+					<highlight>#FFFFFF</highlight>
+				</border>
+				<hatching>
+					<normal>#96DAE3</normal>
+				</hatching>
+			</global_variable>
+			<field>
+				<like>global_variable</like>
+			</field>
+			<enum_constant>
+				<like>global_variable</like>
+			</enum_constant>
+
+			<symbol>
+				<like>type</like>
+			</symbol>
+			<namespace>
+				<fill>
+					<normal>#873E3E</normal>
+				</fill>
+				<border>
+					<normal>#80FFFFFF</normal>
+					<highlight>#FFFFFF</highlight>
+				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
+				<hatching>
+					<normal>#B05151</normal>
+				</hatching>
+			</namespace>
+			<module>
+				<like>namespace</like>
+			</module>
+			<package>
+				<like>namespace</like>
+			</package>
+
+			<file>
+				<fill>
+					<normal>#4E82F6</normal>
+					<highlight>#6793F6</highlight>
+				</fill>
+				<border>
+					<normal>#20FFFFFF</normal>
+					<highlight>#FFFFFF</highlight>
+				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
+				<hatching>
+					<normal>#416CCC</normal>
+				</hatching>
+			</file>
+			<macro>
+				<like>file</like>
+			</macro>
+			<annotation>
+				<like>file</like>
+			</annotation>
+
+			<access>
+				<fill>
+					<normal>#494949</normal>
+				</fill>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
+			</access>
+			<bundle>
+				<fill>
+					<normal>#494949</normal>
+				</fill>
+				<border>
+					<normal>#80FFFFFF</normal>
+					<highlight>#FFFFFF</highlight>
+				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
+			</bundle>
+			<count_number>
+				<fill>
+					<normal>#494949</normal>
+				</fill>
+				<border>
+					<normal>#CCCCCC</normal>
+				</border>
+				<text>
+					<normal>#CCCCCC</normal>
+				</text>
+			</count_number>
+			<qualifier>
+				<fill>
+					<normal>#873E3E</normal>
+				</fill>
+				<border>
+					<normal>#FFFFFF</normal>
+				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+			</qualifier>
+			<text>
+				<fill>
+					<normal>transparent</normal>
+				</fill>
+				<text>
+					<normal>#B1B1B1</normal>
+				</text>
+			</text>
+			<group>
+				<default>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#FFFFFF</normal>
+					</text>
+					<border>
+						<normal>#807F80</normal>
+					</border>
+				</default>
+				<file>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#D4D4D4</normal>
+					</text>
+					<border>
+						<normal>#4E82F6</normal>
+						<highlight>#6793F6</highlight>
+					</border>
+				</file>
+				<namespace>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#D4D4D4</normal>
+					</text>
+					<border>
+						<normal>#873E3E</normal>
+						<highlight>#944444</highlight>
+					</border>
+				</namespace>
+				<inheritance>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#797979</normal>
+					</border>
+				</inheritance>
+			</group>
+		</node>
+		<edge>
+			<default>#797979</default>
+			<type_use>#797979</type_use>
+			<inheritance>#797979</inheritance>
+
+			<use>#00A0B6</use>
+			<call>#DEA400</call>
+			<call_trail_focus>#FFFFFF</call_trail_focus>
+			<override>#BA5ECC</override>
+
+			<type_argument>#D93D5F</type_argument>
+			<template_specialization>#D93D5F</template_specialization>
+
+			<include>#4E82F6</include>
+			<import>#4E82F6</import>
+			<macro_use>#4E82F6</macro_use>
+			<annotation_use>#4E82F6</annotation_use>
+
+			<bundled_edges>#666666</bundled_edges>
+		</edge>
+	</graph>
+
+	<tab>
+		<background>#494949</background>
+		<bar>
+			<background>#808080</background>
+			<border>#BEBEBE</border>
+			<button>
+				<text>
+					<normal>#CCC</normal>
+					<hover>#CCC</hover>
+					<press>white</press>
+				</text>
+				<border>
+					<normal>#CCC</normal>
+					<press>#EEE</press>
+				</border>
+				<background>
+					<normal>#808080</normal>
+					<hover>#505050</hover>
+					<press>#494949</press>
+				</background>
+				<icon>#CCC</icon>
+			</button>
+		</bar>
+	</tab>
+
+	<table>
+		<background>#494949</background>
+		<table>#D4D4D4</table>
+		<text>
+			<normal>#D4D4D4</normal>
+			<active>black</active>
+			<disabled>#AAA</disabled>
+		</text>
+		<table_line_1>
+			<normal>#494949</normal>
+			<active>#7B7B7B</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#383838</normal>
+			<active>#7B7B7B</active>
+		</table_line_2>
+	</table>
+
+	<screen_search>
+		<background>#808080</background>
+		<border>#BEBEBE</border>
+		<box>
+			<background>#494949</background>
+			<text>#D4D4D4</text>
+			<match_label>#CCCCCC</match_label>
+		</box>
+		<filter>white</filter>
+		<button>
+			<normal>#494949</normal>
+			<hover>#606060</hover>
+			<press>#707070</press>
+			<disabled>#494949</disabled>
+			<icon>white</icon>
+			<icon_disabled>#666666</icon_disabled>
+		</button>
+	</screen_search>
+
+	<custom_trail>
+		<background>#494949</background>
+		<alt_background>#808080</alt_background>
+		<separator>#CCCCCC</separator>
+		<text>#FFFFFF</text>
+		<text_disabled>darkgrey</text_disabled>
+		<background_disabled>#696969</background_disabled>
+		<button>
+			<default>
+				<text>#FFFFFF</text>
+				<background>#494949</background>
+				<border>#FFFFFF</border>
+			</default>
+			<hover>
+				<text>#494949</text>
+				<background>#FFFFFF</background>
+				<border>#FFFFFF</border>
+			</hover>
+		</button>
+	</custom_trail>
+</config>

bin/app/data/color_schemes/bright.xml

@@ -1,58 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <config>
+	<window>
+		<background>white</background>
+		<separator>#A2A2A2</separator>
+		<focus>#FF5900</focus>
+		<scrollbar>
+			<background>transparent</background>
+			<handle>#80999999</handle>
+			<line>#80999999</line>
+		</scrollbar>
+		<dock>
+			<text>black</text>
+			<background>#E0E0E0</background>
+			<line>#BEBEBE</line>
+			<icon_type>grey</icon_type> <!-- white, grey, black -->
+		</dock>
+		<button>
+			<text>black</text>
+			<background>white</background>
+			<border>#AAA</border>
+			<border_hover>#878787</border_hover>
+			<icon>black</icon>
+		</button>
+	</window>
+
 	<search>
 		<background>white</background>
 
 		<button>
-			<normal>#E0E0E0</normal>
-			<hover>#B2B2B2</hover>
+			<normal>#B0B0B0</normal>
+			<hover>#828282</hover>
 			<press>#626262</press>
-			<disabled>#F4F4F4</disabled>
+			<disabled>#E2E2E2</disabled>
 			<icon>white</icon>
+			<icon_disabled>#9E9E9E</icon_disabled>
 		</button>
 
 		<field>
 			<text>black</text>
-			<background>#E0E0E0</background>
-			<highlight>#B2B2B2</highlight>
+			<background>white</background>
+			<border>#B0B0B0</border>
+			<highlight>#929292</highlight>
 		</field>
 
 		<popup>
 			<text>black</text>
-			<by_text>#A0A0A0</by_text>
+			<by_text>#525252</by_text>
 			<background>white</background>
-			<highlight>#B2B2B2</highlight>
+			<highlight>#C0C0C0</highlight>
+			<line>#C0C0C0</line>
 		</popup>
 
 		<query>
 			<none>
-				<normal>white</normal>
-				<hover>#F5F5F5</hover>
+				<normal>
+					<fill>white</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#F5F5F5</fill>
+					<text>black</text>
+				</hover>
 			</none>
 			<command>
-				<normal>#8FBC92</normal>
-				<hover>#5EA071</hover>
+				<normal>
+					<fill>#8FBC92</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#6DB080</fill>
+					<text>black</text>
+				</hover>
 			</command>
 			<operator>
-				<normal>#FCA47E</normal>
-				<hover>#F97A4E</hover>
+				<normal>
+					<fill>#FCA47E</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#F97A4E</fill>
+					<text>black</text>
+				</hover>
 			</operator>
+			<fulltext>
+				<normal>
+					<fill>#C7C7E2</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#ABABDD</fill>
+					<text>black</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>
 
 	<code>
-		<background>white</background>
+		<background>#F6F6F6</background>
+
+		<navigation>
+			<background>white</background>
+			<text>#727272</text>
+			<line>#A2A2A2</line>
+		</navigation>
 
 		<file>
-			<background>#E0E0E0</background>
+			<background>#D8D8D8</background>
 
 			<title>
 				<text>black</text>
-				<normal>#E0E0E0</normal>
-				<hover>#B2B2B2</hover>
-				<press>#626262</press>
+				<normal>#D0D0D0</normal>
+				<hover>#C0C0C0</hover>
+				<press>#B5B5B5</press>
 				<icon>black</icon>
+				<border>white</border>
+				<hatching>bright</hatching>
 			</title>
 
 			<ref_count>
@@ -62,197 +125,432 @@
 		</file>
 
 		<snippet>
-			<background>transparent</background>
+			<background>white</background>
 
 			<title>
-				<text>#A0A0A0</text>
+				<text>#909090</text>
 				<background>transparent</background>
-				<hover>#F5F5F5</hover>
 			</title>
 
 			<line_number>
 				<text>black</text>
-				<background>transparent</background>
+				<inactive_text>#909090</inactive_text>
+				<background>white</background>
+				<marker>
+					<active>#C0C0C0</active>
+					<focus>#727272</focus>
+				</marker>
 			</line_number>
 
 			<syntax>
-				<normal>black</normal>
+				<text>black</text>
 				<directive>#1B8856</directive>
 				<keyword>#1B8856</keyword>
 				<type>#C1492D</type>
-				<comment>#A0A0A4</comment>
+				<comment>#3D84A8</comment>
 				<number>#C1315E</number>
 				<quotation>#865F9E</quotation>
-				<function>#CC9533</function>
+				<function>#B0812C</function>
 			</syntax>
 
-			<highlight>
-				<location>
-					<normal>#90EBEBEB</normal>
-					<hover>#90B6D1DD</hover>
-				</location>
+			<selection>
+				<text>black</text>
+				<background>#D0D0D0</background>
+			</selection>
+
+			<annotation>
+				<token>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#8E8E8E</border>
+						<fill>transparent</fill>
+					</focus>
+					<active>
+						<border>#A0A0A0</border>
+						<fill>#A0A0A0</fill>
+						<text>#FFFFFF</text>
+					</active>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#AAE0FF</border>
+						<fill>#C6EAFF</fill>
+					</focus>
+					<active>
+						<border>#136391</border>
+						<fill>#C6EAFF</fill>
+					</active>
+				</local_symbol>
 				<scope>
-					<normal>#60E4EEF2</normal>
-					<hover>#90E4EEF2</hover>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
 				</scope>
 				<error>
-					<normal>#80FF0000</normal>
-					<hover>#FFFF0000</hover>
+					<normal>
+						<border>transparent</border>
+						<fill>#80FF0000</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#CCFF0000</fill>
+					</focus>
 				</error>
-			</highlight>
+				<fulltext_search>
+					<normal>
+						<fill>#C7C7E2</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#ABABDD</fill>
+					</focus>
+				</fulltext_search>
+				<screen_search>
+					<normal>
+						<border>transparent</border>
+						<fill>#8ADBBC</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#DB97C2</fill>
+					</focus>
+				</screen_search>
+			</annotation>
 		</snippet>
 	</code>
 
 	<graph>
-		<text>black</text>
 		<background>white</background>
-		<border>#3C3C3C</border>
-		<icon>black</icon>
-		<hatching>white</hatching>
 
 		<node>
+			<default>
+				<fill>
+					<normal>#D6D6D6</normal>
+				</fill>
+				<border>
+					<normal>#3C3C3C</normal>
+				</border>
+				<text>
+					<normal>black</normal>
+				</text>
+				<icon>
+					<normal>black</normal>
+				</icon>
+				<hatching>
+					<normal>#F0F0F0</normal>
+				</hatching>
+			</default>
+
 			<type>
-				<normal>#ededed</normal>
-				<hover>#ededed</hover>
+				<border>
+					<normal>#203C3C3C</normal>
+					<highlight>#3C3C3C</highlight>
+				</border>
 			</type>
+			<built_in_type>
+				<like>type</like>
+			</built_in_type>
 			<class>
-				<normal>#ededed</normal>
-				<hover>#ededed</hover>
+				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
-				<normal>#ededed</normal>
-				<hover>#ededed</hover>
+				<like>type</like>
 			</struct>
 			<enum>
-				<normal>#ededed</normal>
-				<hover>#ededed</hover>
+				<like>type</like>
 			</enum>
+			<union>
+				<like>type</like>
+			</union>
 			<typedef>
-				<normal>#ededed</normal>
-				<hover>#ededed</hover>
+				<like>type</like>
 			</typedef>
-			<template_parameter_type>
-				<normal>#ededed</normal>
-				<hover>#ededed</hover>
-			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>
 
 			<function>
-				<normal>#F4D07D</normal>
-				<hover>#F4BC3D</hover>
+				<fill>
+					<normal>#F4D07D</normal>
+					<highlight>#F4BC3D</highlight>
+				</fill>
+				<border>
+					<normal>transparent</normal>
+					<highlight>#3C3C3C</highlight>
+				</border>
+				<hatching>
+					<normal>#FFEDC4</normal>
+				</hatching>
 			</function>
 			<method>
-				<normal>#F4D07D</normal>
-				<hover>#F4BC3D</hover>
+				<like>function</like>
 			</method>
 
-			<field>
-				<normal>#7BB5D4</normal>
-				<hover>#42A1D4</hover>
-			</field>
 			<global_variable>
-				<normal>#7BB5D4</normal>
-				<hover>#42A1D4</hover>
+				<fill>
+					<normal>#81C1E3</normal>
+					<highlight>#72B3D6</highlight>
+				</fill>
+				<border>
+					<normal>transparent</normal>
+					<highlight>#3C3C3C</highlight>
+				</border>
+				<hatching>
+					<normal>#BBDDED</normal>
+				</hatching>
 			</global_variable>
+			<field>
+				<like>global_variable</like>
+			</field>
 			<enum_constant>
-				<normal>#7BB5D4</normal>
-				<hover>#42A1D4</hover>
+				<like>global_variable</like>
 			</enum_constant>
 
-			<undefined>
-				<normal>#CC8D91</normal>
-				<hover>#CC8D91</hover>
-			</undefined>
+			<symbol>
+				<like>type</like>
+			</symbol>
 			<namespace>
-				<normal>#CC8D91</normal>
-				<hover>#CC8D91</hover>
+				<fill>
+					<normal>#EFC5C5</normal>
+				</fill>
+				<border>
+					<normal>#3D3D3D</normal>
+					<highlight>black</highlight>
+				</border>
+				<icon>
+					<normal>#3D3D3D</normal>
+				</icon>
+				<hatching>
+					<normal>#FFDEDE</normal>
+				</hatching>
 			</namespace>
+			<module>
+				<like>namespace</like>
+			</module>
+			<package>
+				<like>namespace</like>
+			</package>
 
 			<file>
-				<normal>#DDD</normal>
-				<hover>#CCC</hover>
+				<fill>
+					<normal>#BEE0AF</normal>
+					<highlight>#A6D492</highlight>
+				</fill>
+				<border>
+					<normal>#203C3C3C</normal>
+					<highlight>#3C3C3C</highlight>
+				</border>
+				<hatching>
+					<normal>#D7F7C8</normal>
+				</hatching>
 			</file>
-
 			<macro>
-				<normal>#DDD</normal>
-				<hover>#CCC</hover>
+				<like>file</like>
 			</macro>
+			<annotation>
+				<like>file</like>
+			</annotation>
+
+			<access>
+				<fill>
+					<normal>white</normal>
+				</fill>
+			</access>
+			<bundle>
+				<fill>
+					<normal>white</normal>
+				</fill>
+				<border>
+					<normal>#803C3C3C</normal>
+					<highlight>#3C3C3C</highlight>
+				</border>
+			</bundle>
+			<count_number>
+				<fill>
+					<normal>white</normal>
+				</fill>
+				<border>
+					<normal>#7C7C7C</normal>
+				</border>
+				<text>
+					<normal>#5C5C5C</normal>
+				</text>
+			</count_number>
+			<qualifier>
+				<fill>
+					<normal>#EFC5C5</normal>
+				</fill>
+				<border>
+					<normal>#3D3D3D</normal>
+				</border>
+				<text>
+					<normal>black</normal>
+				</text>
+			</qualifier>
+			<text>
+				<fill>
+					<normal>transparent</normal>
+				</fill>
+				<text>
+					<normal>#A2A2A2</normal>
+				</text>
+			</text>
+			<group>
+				<default>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#D0D0D0</normal>
+					</border>
+				</default>
+				<file>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#5C5C5C</normal>
+					</text>
+					<border>
+						<normal>#BEE0AF</normal>
+						<highlight>#A6D492</highlight>
+					</border>
+				</file>
+				<namespace>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#5C5C5C</normal>
+					</text>
+					<border>
+						<normal>#EFC5C5</normal>
+						<highlight>#EFB3B3</highlight>
+					</border>
+				</namespace>
+				<inheritance>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#878787</normal>
+					</border>
+				</inheritance>
+			</group>
 		</node>
 		<edge>
-			<type_of>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</type_of>
-			<return_type>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</return_type>
-			<parameter_type>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</parameter_type>
-			<type_use>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</type_use>
-			<inheritance>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</inheritance>
-			<typedef>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</typedef>
+			<default>#878787</default>
+			<type_use>#878787</type_use>
+			<inheritance>#878787</inheritance>
 
-			<override>
-				<normal>#CC5E89</normal>
-				<hover>#CC5E89</hover>
-			</override>
+			<use>#4B9FC4</use>
+			<call>#F4BC3D</call>
+			<call_trail_focus>#F56B3D</call_trail_focus>
+			<override>#A37ACC</override>
 
-			<call>
-				<normal>#F4BC3D</normal>
-				<hover>#F4BC3D</hover>
-			</call>
+			<type_argument>#CF6B7C</type_argument>
+			<template_specialization>#CF6B7C</template_specialization>
 
-			<use>
-				<normal>#3190BA</normal>
-				<hover>#3190BA</hover>
-			</use>
+			<include>#719660</include>
+			<import>#719660</import>
+			<macro_use>#719660</macro_use>
+			<annotation_use>#719660</annotation_use>
 
-			<template_parameter>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_parameter>
-			<template_argument>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_argument>
-			<template_default_argument>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_default_argument>
-			<template_specialization>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_specialization>
-
-			<include>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</include>
-
-			<aggregation>
-				<normal>#EEE</normal>
-				<hover>#DDD</hover>
-			</aggregation>
-			<macro_use>
-				<normal>#878787</normal>
-				<hover>#878787</hover>
-			</macro_use>
+			<bundled_edges>#CCC</bundled_edges>
 		</edge>
 	</graph>
 
-	<tool_tip>
-		<text>black</text>
+	<tab>
+		<background>white</background>
+		<bar>
+			<background>#E0E0E0</background>
+			<border>#A2A2A2</border>
+			<button>
+				<text>
+					<normal>#555</normal>
+					<hover>#555</hover>
+					<press>black</press>
+				</text>
+				<border>
+					<normal>#888</normal>
+					<press>#777</press>
+				</border>
+				<background>
+					<normal>#E0E0E0</normal>
+					<hover>#F0F0F0</hover>
+					<press>#FFFFFF</press>
+				</background>
+				<icon>#555</icon>
+			</button>
+		</bar>
+	</tab>
+
+	<table>
+		<background>white</background>
+		<table>#aaa</table>
+		<text>
+			<normal>black</normal>
+			<active>white</active>
+			<disabled>#777</disabled>
+		</text>
+		<table_line_1>
+			<normal>white</normal>
+			<active>grey</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#F1F1F1</normal>
+			<active>grey</active>
+		</table_line_2>
+	</table>
+
+	<screen_search>
 		<background>#E0E0E0</background>
-	</tool_tip>
+		<border>#BEBEBE</border>
+		<box>
+			<background>white</background>
+			<text>black</text>
+			<match_label>#727272</match_label>
+		</box>
+		<filter>black</filter>
+		<button>
+			<normal>white</normal>
+			<hover>#F2F2F2</hover>
+			<press>#CECECE</press>
+			<disabled>white</disabled>
+			<icon>#727272</icon>
+			<icon_disabled>#CECECE</icon_disabled>
+		</button>
+	</screen_search>
+
+	<custom_trail>
+		<background>white</background>
+		<alt_background>#F5F5F5</alt_background>
+		<separator>#C0C0C0</separator>
+		<text>black</text>
+		<text_disabled>#A0A0A0</text_disabled>
+		<background_disabled>#F2F2F2</background_disabled>
+		<button>
+			<default>
+				<text>black</text>
+				<background>white</background>
+				<border>lightgray</border>
+			</default>
+			<hover>
+				<text>white</text>
+				<background>#2D3C86</background>
+				<border>lightgray</border>
+			</hover>
+		</button>
+	</custom_trail>
 </config>

bin/app/data/color_schemes/dark.xml

@@ -1,58 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <config>
+	<window>
+		<background>#272728</background>
+		<separator>#CCC</separator>
+		<focus>#FFFF4D</focus>
+		<scrollbar>
+			<background>transparent</background>
+			<handle>#80999999</handle>
+			<line>#80999999</line>
+		</scrollbar>
+		<dock>
+			<text>#F7F7F7</text>
+			<background>#555555</background>
+			<line>#808080</line>
+			<icon_type>white</icon_type> <!-- white, grey, black -->
+		</dock>
+		<button>
+			<text>white</text>
+			<background>#3A3A3A</background>
+			<border>#C5C5C5</border>
+			<border_hover>white</border_hover>
+			<icon>white</icon>
+		</button>
+	</window>
+
 	<search>
 		<background>#272728</background>
 
 		<button>
-			<normal>#777777</normal>
-			<hover>#555555</hover>
-			<press>#444444</press>
+			<normal>#555555</normal>
+			<hover>#404040</hover>
+			<press>#3A3A3A</press>
 			<disabled>#333333</disabled>
 			<icon>white</icon>
+			<icon_disabled>#777777</icon_disabled>
 		</button>
 
 		<field>
 			<text>#F7F7F7</text>
-			<background>#777777</background>
-			<highlight>#555555</highlight>
+			<background>#272728</background>
+			<border>#555555</border>
+			<highlight>#999999</highlight>
 		</field>
 
 		<popup>
 			<text>#F7F7F7</text>
 			<by_text>#A0A0A0</by_text>
 			<background>#272728</background>
-			<highlight>#555555</highlight>
+			<highlight>#333333</highlight>
+			<line>#4A4A4A</line>
 		</popup>
 
 		<query>
 			<none>
-				<normal>#2F2F2F</normal>
-				<hover>black</hover>
+				<normal>
+					<fill>#2F2F2F</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>black</fill>
+					<text>#F7F7F7</text>
+				</hover>
 			</none>
 			<command>
-				<normal>#406D4D</normal>
-				<hover>#4E855E</hover>
+				<normal>
+					<fill>#406D4D</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#4E855E</fill>
+					<text>#F7F7F7</text>
+				</hover>
 			</command>
 			<operator>
-				<normal>#7D2724</normal>
-				<hover>#8C2B29</hover>
+				<normal>
+					<fill>#7D2724</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#8C2B29</fill>
+					<text>#F7F7F7</text>
+				</hover>
 			</operator>
+			<fulltext>
+				<normal>
+					<fill>#207EA8</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#006D93</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>
 
 	<code>
-		<background>#272728</background>
+		<background>#313132</background>
+
+		<navigation>
+			<background>#272728</background>
+			<text>#C5C5C5</text>
+			<line>#999</line>
+		</navigation>
 
 		<file>
-			<background>#777777</background>
+			<background>#5C5C5C</background>
 
 			<title>
 				<text>#F7F7F7</text>
-				<normal>#777777</normal>
-				<hover>#555555</hover>
-				<press>#444444</press>
+				<normal>#5C5C5C</normal>
+				<hover>#4A4A4A</hover>
+				<press>#404040</press>
 				<icon>white</icon>
+				<border>#272728</border>
+				<hatching>dark</hatching>
 			</title>
 
 			<ref_count>
@@ -62,197 +125,435 @@
 		</file>
 
 		<snippet>
-			<background>transparent</background>
+			<background>#272728</background>
 
 			<title>
 				<text>#A0A0A0</text>
 				<background>transparent</background>
-				<hover>#2F2F2F</hover>
 			</title>
 
 			<line_number>
 				<text>#F7F7F7</text>
-				<background>transparent</background>
+				<inactive_text>#A0A0A0</inactive_text>
+				<background>#272728</background>
+				<marker>
+					<active>#797979</active>
+					<focus>#F7F7F7</focus>
+				</marker>
 			</line_number>
 
 			<syntax>
-				<normal>#F7F7F7</normal>
+				<text>#F7F7F7</text>
 				<directive>#1F9C62</directive>
 				<keyword>#1F9C62</keyword>
 				<type>#D95233</type>
-				<comment>#A0A0A4</comment>
+				<comment>#4E768A</comment>
 				<number>#CC3463</number>
 				<quotation>#9368AD</quotation>
 				<function>#D69C36</function>
 			</syntax>
 
-			<highlight>
-				<location>
-					<normal>#20EBEBEB</normal>
-					<hover>#40B6D1DD</hover>
-				</location>
+			<selection>
+				<text>white</text>
+				<background>#777777</background>
+			</selection>
+
+			<annotation>
+				<token>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#D5D5D5</border>
+						<fill>transparent</fill>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#D5D5D5</fill>
+						<text>#272728</text>
+					</active>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#A0A0A0</border>
+						<fill>#969696</fill>
+						<text>#191919</text>
+					</focus>
+					<active>
+						<border>white</border>
+						<fill>#969696</fill>
+						<text>#272728</text>
+					</active>
+				</local_symbol>
 				<scope>
-					<normal>#10E4EEF2</normal>
-					<hover>#18E4EEF2</hover>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
 				</scope>
 				<error>
-					<normal>#A0FF0000</normal>
-					<hover>#FFFF0000</hover>
+					<normal>
+						<border>transparent</border>
+						<fill>#BBFF0000</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#FFFF0000</fill>
+					</focus>
 				</error>
-			</highlight>
+				<fulltext_search>
+					<normal>
+						<fill>#207EA8</fill>
+						<text>#F7F7F7</text>
+					</normal>
+					<focus>
+						<border>#006D93</border>
+						<fill>#134B63</fill>
+					</focus>
+				</fulltext_search>
+				<screen_search>
+					<normal>
+						<border>transparent</border>
+						<fill>#6EDB42</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#FF52E8</fill>
+					</focus>
+				</screen_search>
+			</annotation>
 		</snippet>
 	</code>
 
 	<graph>
-		<text>#F7F7F7</text>
-		<border>#C3C3C3</border>
 		<background>#272728</background>
-		<icon>#F7F7F7</icon>
-		<hatching>#272728</hatching>
 
 		<node>
+			<default>
+				<fill>
+					<normal>#5A5A5A</normal>
+				</fill>
+				<border>
+					<normal>#C3C3C3</normal>
+				</border>
+				<text>
+					<normal>#F7F7F7</normal>
+				</text>
+				<icon>
+					<normal>#F7F7F7</normal>
+				</icon>
+				<hatching>
+					<normal>#3D3D3D</normal>
+				</hatching>
+			</default>
+
 			<type>
-				<normal>#4D4D4D</normal>
-				<hover>#4D4D4D</hover>
+				<border>
+					<normal>#20C3C3C3</normal>
+					<highlight>#C3C3C3</highlight>
+				</border>
 			</type>
+			<built_in_type>
+				<like>type</like>
+			</built_in_type>
 			<class>
-				<normal>#4D4D4D</normal>
-				<hover>#4D4D4D</hover>
+				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
-				<normal>#4D4D4D</normal>
-				<hover>#4D4D4D</hover>
+				<like>type</like>
 			</struct>
 			<enum>
-				<normal>#4D4D4D</normal>
-				<hover>#4D4D4D</hover>
+				<like>type</like>
 			</enum>
+			<union>
+				<like>type</like>
+			</union>
 			<typedef>
-				<normal>#4D4D4D</normal>
-				<hover>#4D4D4D</hover>
+				<like>type</like>
 			</typedef>
-			<template_parameter_type>
-				<normal>#4D4D4D</normal>
-				<hover>#4D4D4D</hover>
-			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>
 
 			<function>
-				<normal>#7A681F</normal>
-				<hover>#9C8528</hover>
+				<fill>
+					<normal>#7A681F</normal>
+					<highlight>#9C8528</highlight>
+				</fill>
+				<border>
+					<normal>transparent</normal>
+					<highlight>#C3C3C3</highlight>
+				</border>
+				<hatching>
+					<normal>#544815</normal>
+				</hatching>
 			</function>
 			<method>
-				<normal>#7A681F</normal>
-				<hover>#9C8528</hover>
+				<like>function</like>
 			</method>
 
-			<field>
-				<normal>#21516B</normal>
-				<hover>#2A6484</hover>
-			</field>
 			<global_variable>
-				<normal>#21516B</normal>
-				<hover>#2A6484</hover>
+				<fill>
+					<normal>#21516B</normal>
+					<highlight>#2A6484</highlight>
+				</fill>
+				<border>
+					<normal>transparent</normal>
+					<highlight>#C3C3C3</highlight>
+				</border>
+				<hatching>
+					<normal>#17384A</normal>
+				</hatching>
 			</global_variable>
+			<field>
+				<like>global_variable</like>
+			</field>
 			<enum_constant>
-				<normal>#21516B</normal>
-				<hover>#2A6484</hover>
+				<like>global_variable</like>>
 			</enum_constant>
 
-			<undefined>
-				<normal>#78282D</normal>
-				<hover>#78282D</hover>
-			</undefined>
+			<symbol>
+				<like>type</like>
+			</symbol>
 			<namespace>
-				<normal>#78282D</normal>
-				<hover>#78282D</hover>
+				<fill>
+					<normal>#78282D</normal>
+				</fill>
+				<border>
+					<normal>#80C3C3C3</normal>
+					<highlight>#C3C3C3</highlight>
+				</border>
+				<icon>
+					<normal>#C3C3C3</normal>
+				</icon>
+				<hatching>
+					<normal>#521B1F</normal>
+				</hatching>
 			</namespace>
+			<module>
+				<like>namespace</like>
+			</module>
+			<package>
+				<like>namespace</like>
+			</package>
 
 			<file>
-				<normal>#1B564E</normal>
-				<hover>#247368</hover>
+				<fill>
+					<normal>#1B564E</normal>
+					<highlight>#21695F</highlight>
+				</fill>
+				<border>
+					<normal>#20C3C3C3</normal>
+					<highlight>#C3C3C3</highlight>
+				</border>
+				<hatching>
+					<normal>#123B35</normal>
+				</hatching>
 			</file>
-
 			<macro>
-				<normal>#1B564E</normal>
-				<hover>#247368</hover>
+				<like>file</like>
 			</macro>
+			<annotation>
+				<like>file</like>
+			</annotation>
+
+			<access>
+				<fill>
+					<normal>#272728</normal>
+				</fill>
+			</access>
+			<bundle>
+				<fill>
+					<normal>#272728</normal>
+				</fill>
+				<border>
+					<normal>#80C3C3C3</normal>
+					<highlight>#C3C3C3</highlight>
+				</border>
+			</bundle>
+			<count_number>
+				<fill>
+					<normal>#272728</normal>
+				</fill>
+				<border>
+					<normal>#C3C3C3</normal>
+				</border>
+				<text>
+					<normal>#F7F7F7</normal>
+				</text>
+			</count_number>
+			<qualifier>
+				<fill>
+					<normal>#78282D</normal>
+				</fill>
+				<border>
+					<normal>#C3C3C3</normal>
+				</border>
+				<text>
+					<normal>#F7F7F7</normal>
+				</text>
+			</qualifier>
+			<text>
+				<fill>
+					<normal>transparent</normal>
+				</fill>
+				<text>
+					<normal>#777777</normal>
+				</text>
+			</text>
+			<group>
+				<default>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#5A5A5A</normal>
+					</border>
+				</default>
+				<file>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#C3C3C3</normal>
+					</text>
+					<border>
+						<normal>#1B564E</normal>
+						<highlight>#1E6158</highlight>
+					</border>
+				</file>
+				<namespace>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#C3C3C3</normal>
+					</text>
+					<border>
+						<normal>#78282D</normal>
+						<highlight>#872D33</highlight>
+					</border>
+				</namespace>
+				<inheritance>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#797979</normal>
+					</border>
+				</inheritance>
+			</group>
 		</node>
 		<edge>
-			<type_of>
-				<normal>#797979</normal>
-				<hover>#797979</hover>
-			</type_of>
-			<return_type>
-				<normal>#797979</normal>
-				<hover>#797979</hover>
-			</return_type>
-			<parameter_type>
-				<normal>#797979</normal>
-				<hover>#797979</hover>
-			</parameter_type>
-			<type_use>
-				<normal>#797979</normal>
-				<hover>#797979</hover>
-			</type_use>
-			<inheritance>
-				<normal>#797979</normal>
-				<hover>#797979</hover>
-			</inheritance>
-			<typedef>
-				<normal>#797979</normal>
-				<hover>#797979</hover>
-			</typedef>
+			<default>#797979</default>
+			<type_use>#797979</type_use>
+			<inheritance>#797979</inheritance>
 
-			<override>
-				<normal>#CC5E89</normal>
-				<hover>#CC5E89</hover>
-			</override>
+			<use>#2D6A8C</use>
+			<call>#9C8528</call>
+			<call_trail_focus>#F7F7F7</call_trail_focus>
+			<override>#8A5A94</override>
 
-			<call>
-				<normal>#9C8528</normal>
-				<hover>#9C8528</hover>
-			</call>
+			<type_argument>#C14057</type_argument>
+			<template_specialization>#C14057</template_specialization>
 
-			<use>
-				<normal>#2A6484</normal>
-				<hover>#2A6484</hover>
-			</use>
+			<include>#247368</include>
+			<import>#247368</import>
+			<macro_use>#247368</macro_use>
+			<annotation_use>#247368</annotation_use>
 
-			<template_parameter>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_parameter>
-			<template_argument>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_argument>
-			<template_default_argument>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_default_argument>
-			<template_specialization>
-				<normal>#C1305D</normal>
-				<hover>#C1305D</hover>
-			</template_specialization>
-
-			<include>
-				<normal>#247368</normal>
-				<hover>#247368</hover>
-			</include>
-
-			<aggregation>
-				<normal>#5D5D5D</normal>
-				<hover>#6D6D6D</hover>
-			</aggregation>
-			<macro_use>
-				<normal>#247368</normal>
-				<hover>#247368</hover>
-			</macro_use>
+			<bundled_edges>#4D4D4D</bundled_edges>
 		</edge>
 	</graph>
 
-	<tool_tip>
+	<tab>
+		<background>#272728</background>
+		<bar>
+			<background>#555555</background>
+			<border>#BEBEBE</border>
+			<button>
+				<text>
+					<normal>#AAA</normal>
+					<hover>#AAA</hover>
+					<press>white</press>
+				</text>
+				<border>
+					<normal>#777</normal>
+					<press>#999</press>
+				</border>
+				<background>
+					<normal>#555555</normal>
+					<hover>#2F2F2F</hover>
+					<press>#272728</press>
+				</background>
+				<icon>#AAA</icon>
+			</button>
+		</bar>
+	</tab>
+
+	<table>
+		<background>#272728</background>
+		<table>#C5C5C5</table>
+		<text>
+			<normal>white</normal>
+			<active>black</active>
+			<disabled>#AAA</disabled>
+		</text>
+		<table_line_1>
+			<normal>#272728</normal>
+			<active>#969696</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#343434</normal>
+			<active>#969696</active>
+		</table_line_2>
+	</table>
+
+	<screen_search>
+		<background>#555555</background>
+		<border>#BEBEBE</border>
+		<box>
+			<background>#272728</background>
+			<text>#F7F7F7</text>
+			<match_label>#C5C5C5</match_label>
+		</box>
+		<filter>#F7F7F7</filter>
+		<button>
+			<normal>#272728</normal>
+			<hover>#333333</hover>
+			<press>#555555</press>
+			<disabled>#272728</disabled>
+			<icon>white</icon>
+			<icon_disabled>#555555</icon_disabled>
+		</button>
+	</screen_search>
+
+	<custom_trail>
+		<background>#272728</background>
+		<alt_background>#555555</alt_background>
+		<separator>#CCC</separator>
 		<text>#F7F7F7</text>
-		<background>#777777</background>
-	</tool_tip>
+		<text_disabled>darkgrey</text_disabled>
+		<background_disabled>#474748</background_disabled>
+		<button>
+			<default>
+				<text>#F7F7F7</text>
+				<background>#272728</background>
+				<border>#F7F7F7</border>
+			</default>
+			<hover>
+				<text>#272728</text>
+				<background>#F7F7F7</background>
+				<border>#F7F7F7</border>
+			</hover>
+		</button>
+	</custom_trail>
 </config>

bin/app/data/fallback/ApplicationSettings.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<config>
+	<application>
+		<window_base_width>500</window_base_width>
+		<window_base_height>500</window_base_height>
+	</application>
+	<indexing>
+		<indexer_thread_count>0</indexer_thread_count>
+	</indexing>
+	<user>
+		<recent_projects>
+			<recent_project>./projects/tutorial/tutorial.srctrlprj</recent_project>
+			<recent_project>./projects/tictactoe_cpp/tictactoe_cpp.srctrlprj</recent_project>
+			<recent_project>./projects/tictactoe_py/tictactoe_py.srctrlprj</recent_project>
+			<recent_project>./projects/javaparser/javaparser.srctrlprj</recent_project>
+		</recent_projects>
+	</user>
+    <version>8</version>
+</config>

bin/app/data/fallback/window_settings.ini

@@ -0,0 +1,8 @@
+[General]
+DOCK_LOCATIONS=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x2\0\0\x4~\0\0\x2\xa1\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x4\x90\0\0\0\0\0\xff\xff\xff\xfc\x2\0\0\0\x1\xfb\0\0\0\xe\0\x44\0o\0\x63\0k\0L\0o\0g\0\0\0\x2\xc6\0\0\0\xc1\0\0\0\0\0\0\0\0\xfc\0\0\0\0\0\0\x4~\0\0\x2[\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfc\0\0\0\0\0\0\x2\xa1\0\0\0\x8c\0\xff\xff\xfe\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x2\x84\0\0\x1z\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0\x65\0\x61\0r\0\x63\0h\x1\0\0\0\0\0\0\0-\0\0\0-\0\xff\xff\xfe\xfb\0\0\0\x12\0\x44\0o\0\x63\0k\0G\0r\0\x61\0p\0h\x1\0\0\0.\0\0\x2s\0\0\0G\0\xff\xff\xfe\xfb\0\0\0\x10\0\x44\0o\0\x63\0k\0\x43\0o\0\x64\0\x65\x1\0\0\x2\x85\0\0\x1\xf9\0\0\0\xe0\0\xff\xff\xff\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0t\0\x61\0t\0u\0s\0\0\0\x2I\0\0\0\xcb\0\0\0\xa8\0\xff\xff\xfe\0\0\x4~\0\0\0\0\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+
+[MainWindow]
+maximized=false
+position=@Point(80 50)
+showTitleBars=false
+size=@Size(1150 700)

bin/app/data/fonts/FiraSans_License.txt

@@ -0,0 +1,45 @@
+Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ with Reserved Font Name Fira Sans.
+
+Copyright (c) 2014, Telefonica S.A.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

bin/app/data/fonts/Roboto_License.txt

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

bin/app/data/fonts/SourceCodePro_License.txt

@@ -0,0 +1,93 @@
+Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

bin/app/data/gui/about/about.css

@@ -0,0 +1,13 @@
+* {
+	color: white;
+	font-size: 14px;
+	font-weight: 100;
+}
+
+#small {
+	font-size: 12px;
+}
+
+#window {
+	background: qlineargradient( x1:0 y1:0.4, x2:0 y2:1, stop:0 #2F3F86, stop:1 #1C7BBC );
+}

bin/app/data/gui/bookmark_view/bookmark_view.css

@@ -0,0 +1,166 @@
+/* Bookmark browser header */
+
+#header_background {
+	background-color: #2E3C86;
+}
+
+#title {
+	color: white;
+	font-size: 18px;
+	font-weight: bold;
+}
+
+#filter_label, #order_label {
+	color: white;
+	font-size: 16px;
+	font-weight: bold;
+	margin-bottom: 5px;
+}
+
+#filter_box, #order_box {
+	/*margin-left: 20px;*/
+}
+
+/* Bookmark browser body */
+
+#bookmark_tree {
+	border: none;
+	border-top: 1px solid #DFDFDF;
+	border-bottom: 1px solid #DFDFDF;
+	margin: 0px;
+	min-width: 500px;
+	min-height: 200px;
+	background-color: white;
+}
+
+/* Bookmark category */
+
+#bookmark_category {
+	background: #DADADA;
+	border-bottom: 1px solid white;
+	padding: 4px 10px 3px 5px;
+}
+
+#bookmark_category:hover {
+	background: #DEDEDE;
+}
+
+#category_name {
+	color: black;
+	font-size: 12px;
+	margin-left: 1px;
+}
+
+#category_expand_button, #category_delete_button, #comment_button, #edit_button, #delete_button {
+	border: none;
+	background: transparent;
+	width: 20px;
+	height: 20px;
+}
+
+#edit_button {
+	margin-right: 3px;
+}
+
+/* Bookmark */
+
+#bookmark {
+	padding: 3px 10px 3px 3px;
+	margin: 0;
+	background: white;
+	border-bottom: 1px solid #DFDFDF;
+}
+
+#bookmark_comment {
+	font-size: 12px;
+	padding: 3px 6px 3px 7px;
+	margin: 0;
+	color: #707070;
+}
+
+#activate_button {
+	background: white;
+	border: 2px solid white;
+	border-radius: 8px;
+	color: black;
+	font-size: 12px;
+	padding: 4px 8px 3px;
+	text-align: right;
+}
+
+#activate_button:hover {
+	border-color: #2D3C86;
+}
+
+#activate_button:pressed {
+	background: #CDD4F7;
+}
+
+#date_label {
+	margin: 1px 5px 0px;
+	font-size: 12px;
+	color: #707070;
+}
+
+/* Search bar buttons */
+
+#bookmark_button, #show_bookmark_button {
+	background: <color:search/button/normal>;
+	border: none;
+	height: 30px;
+	width: 30px;
+}
+
+#bookmark_button:disabled, #show_bookmark_button:disabled {
+	background: <color:search/button/disabled>;
+}
+
+#bookmark_button:hover, #show_bookmark_button:hover {
+	background: <color:search/button/hover>;
+}
+
+#bookmark_button:pressed, #show_bookmark_button:pressed {
+	background: <color:search/button/press>;
+}
+
+#bookmark_button {
+	border-bottom-left-radius: 12px;
+	border-top-left-radius: 12px;
+	margin: 0px;
+	margin-right: 2px;
+}
+
+#show_bookmark_button {
+	border-bottom-right-radius: 12px;
+	border-top-right-radius: 12px;
+	margin: 0px;
+}
+
+/* Bookmark creator */
+#creator_title_label {
+	font-size: 18px;
+	font-weight: bold;
+	color: white;
+	background-color: #2E3C86;
+	padding: 23px 20px 20px 20px;
+}
+
+#creator_label {
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#creator_name_edit, #creator_comment_box {
+	border: 1px;
+	border-style: solid;
+	border-color: #dadada;
+	background: white;
+	border-radius: 12px;
+	min-height: 30px;
+	padding: 3px;
+	padding-left: 5px;
+}
+
+#creator_comment_box {
+	min-height: 160px;
+}

bin/app/data/gui/code_view/code_view.css

@@ -1,138 +1,279 @@
-#code_file_list_base, #code_file_list {
+#code_container, #code_file_list {
 	background-color: <color:code/background>;
 }
 
-* {
-	font-size: <setting:font_size>pt;
+#code_file_single {
+	background-color: <color:code/snippet/background>;
+}
+
+#code_navigation {
+	background-color: <color:code/navigation/background>;
+}
+
+#code_container, #code_file_list {
+	border: none;
+}
+
+#separator_gap {
+	background-color: <color:code/navigation/background>;
+	border: none;
+}
+
+#separator_line {
+	background-color: <color:code/navigation/line>;
+	border: none;
+}
+
+#focus_indicator {
+	background: <color:code/navigation/background>;
+}
+
+#focus_indicator[focused=true] {
+	background: <color:window/focus>;
+}
+
+#code_navigation QLabel {
+	color: <color:code/file/title/text>;
+	font-size: <setting:font_size>px;
+}
+
+#code_navigation QPushButton {
+	background: <color:search/button/normal>;
+	border: none;
+	color: <color:search/button/icon>;
+	height: 24px;
+	width: 24px;
+}
+
+#code_navigation QPushButton:hover, #code_navigation QPushButton:checked {
+	background: <color:search/button/hover>;
+}
+
+#code_navigation QPushButton:disabled {
+	background: <color:search/button/disabled>;
+}
+
+#code_navigation QPushButton:pressed {
+	background: <color:search/button/press>;
+}
+
+#code_navigation #reference_button_previous {
+	/*width: 20px;*/
+	padding-bottom: 2px;
+
+	border-bottom-left-radius: 11px;
+	border-top-left-radius: 11px;
+}
+
+#code_navigation #reference_button_next {
+	/*width: 20px;*/
+	padding-top: 3px;
+
+	border-bottom-right-radius: 11px;
+	border-top-right-radius: 11px;
+}
+
+#code_navigation #file_button_previous, #code_navigation #file_button_next {
+	width: 22px;
+}
+
+#code_navigation #file_button_previous, #code_navigation #local_reference_button_previous {
+	border-bottom-left-radius: 11px;
+	border-top-left-radius: 11px;
+}
+
+#code_navigation #local_reference_button_previous {
+	padding-bottom: 2px;
+}
+
+#code_navigation #local_reference_button_next {
+	padding-top: 3px;
+}
+
+#code_navigation #file_button_next, #code_navigation #local_reference_button_next {
+	border-bottom-right-radius: 11px;
+	border-top-right-radius: 11px;
+}
+
+#code_navigation #references_label {
+	border: none;
+	border-radius: 10px;
+	color: <color:code/navigation/text>;
+	font-size: <setting:font_size>px;
+	padding: 0px 3px;
+	margin: 4px 6px 4px 6px;
+}
+
+#code_navigation #mode_button_list {
+	padding-left: 2px;
+}
+
+#code_navigation #mode_button_single {
+	padding-right: 2px;
+}
+
+#code_navigation #mode_button_list {
+	border-bottom-left-radius: 11px;
+	border-top-left-radius: 11px;
+}
+
+#code_navigation #mode_button_single {
+	border-bottom-right-radius: 11px;
+	border-top-right-radius: 11px;
 }
 
 #code_file {
 	background-color: <color:code/snippet/background>;
-	border: 2px solid <color:code/file/background>;
-	border-radius: 14px;
+	margin-bottom: 0px;
+	border: none;
+	font-size: <setting:font_size>px;
 }
 
-#code_file #title_widget {
+#code_file[last=true] {
+	border-bottom: 1px solid <color:code/file/background>;
+}
+
+#title_bar, #title_bar_single {
+	background-color: <color:code/file/background>;
+	font-size: <setting:font_size>px;
+	border: none;
+}
+
+#title_bar[hovering=false] {
+	border-top: 1px solid <color:code/navigation/line>;
+}
+
+#title_bar[focused=true] {
+	border-left: 4px solid <color:window/focus>;
+}
+
+#title_bar_single {
 	background-color: <color:code/file/background>;
-	border-top-left-radius: 10px;
-	border-top-right-radius: 10px;
 	padding-right: 5px;
 }
 
-#code_file #title_label {
-	background-color: <color:code/file/title/normal>;
+#title_bar #screen_button, #title_bar_single #screen_button {
+	margin-right: 7px;
+}
+
+#title_button {
+	background-color: transparent;
 	border: none;
 	border-radius: 3px;
 	color: <color:code/file/title/text>;
+	font-size: <setting:font_size>px;
 	padding: 2px 4px;
-	margin: 1px 8px 3px;
+	margin: 1px 8px 1px 2px;
 }
 
-#code_file #title_label:hover {
+#title_bar_single #title_button {
+	margin: 3px 8px;
+}
+
+#title_button:hover {
 	background-color: <color:code/file/title/hover>;
 }
 
-#code_file #title_label:pressed {
+#title_button:pressed {
 	background-color: <color:code/file/title/press>;
 }
 
-#code_file #references_label {
+#title_button[nonindexed=true] {
+	border: 1px solid <color:code/file/title/border>;
+}
+
+#references_label {
 	background-color: <color:code/file/ref_count/background>;
 	border: none;
 	border-radius: 10px;
 	color: <color:code/file/ref_count/text>;
-	font-size: <setting:font_size-2>pt;
+	font-size: <setting:font_size-2>px;
 	padding: 0px 3px;
-	margin: 4px 0px 4px;
+	margin: 4px 6px 4px 0px;
 }
 
 #code_file #code_snippet {
 	background-color: <color:code/snippet/background>;
-	border-top: 2px solid <color:code/file/background>;
+	border-top: 1px solid <color:code/file/background>;
+	font-size: <setting:font_size>px;
 }
 
-#code_file #code_snippet * {
-	font-family: "<setting:font_name>";
-}
-
-#code_file #code_snippet[isFirst=true] {
+#code_file #code_snippet[first=true] {
 	border: none;
-	padding-top: 0px;
-}
-
-#code_file #code_snippet[isLast=true] {
-	border-bottom-left-radius: 12px;
-	border-bottom-right-radius: 12px;
 }
 
 #code_file #code_snippet #scope_name, #code_file #code_snippet #dots {
 	background-color: <color:code/snippet/title/background>;
-	color: <color:code/snippet/title/text>;
 	border: none;
+	color: <color:code/snippet/title/text>;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>px;
+	padding-bottom: 2px;
 }
 
-#code_file #code_snippet #scope_name:hover {
-	background-color: <color:code/snippet/title/hover>;
+#code_file #code_snippet #scope_name[focused=true] {
+	color: <color:code/snippet/syntax/text>;
 }
 
 #code_file #code_snippet #dots {
 	background-color: <color:code/snippet/line_number/background>;
-	padding-right: 13px;
+	border-right: 3px solid transparent;
+	margin-right: 5px;
+	padding-right: 8px;
 	text-align: right;
 }
 
+#code_file #code_snippet #dots[focused=true] {
+	border-right: 3px solid <color:window/focus>;
+}
+
 #code_file #code_snippet #scope_name {
 	padding-left: 4px;
 	text-align: left;
 }
 
-#code_file #code_snippet #line_number_area {
+#code_file #code_snippet #scope_name[focused=true] {
+	padding-left: 4px;
+	text-align: left;
+}
+
+#line_number_area {
 	background-color: <color:code/snippet/line_number/background>;
 	border: none;
 	color: <color:code/snippet/line_number/text>;
-}
-
-#code_file #code_snippet[isLast=true] #line_number_area {
-	border-bottom-left-radius: 12px;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>px;
 }
 
 #code_area {
-	background-color: transparent;
-	color: <color:code/snippet/syntax/normal>;
+	background-color: <color:code/snippet/background>;
+	color: <color:code/snippet/syntax/text>;
+	selection-color: <color:code/snippet/selection/text>;
+	selection-background-color: <color:code/snippet/selection/background>;
 }
 
-#code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button {
+#title_bar #expand_button, #title_bar_single #expand_button {
+	background: transparent;
+	border: none;
+	margin: 3px;
+	max-height: 16px;
+	max-width: 16px;
+	margin-left: 8px;
+	margin-right: 0px;
+}
+
+#title_bar #file_button, #title_bar_single #file_button {
+	background: transparent;
+	border: none;
 	margin: 3px;
 	max-height: 16px;
 	max-width: 16px;
 }
 
-#code_file #maximize_button {
-	border-image: url(data/gui/code_view/images/maximize_inactive.png);
+#title_bar #file_button:enabled, #title_bar_single #file_button:enabled {
+	border-image: url(<setting:gui_path>code_view/images/button_background.png);
 }
 
-#code_file #maximize_button:enabled {
-	border-image: url(data/gui/code_view/images/maximize_active.png);
-}
-
-#code_file #snippet_button {
-	border-image: url(data/gui/code_view/images/snippet_inactive.png);
-}
-
-#code_file #snippet_button:enabled {
-	border-image: url(data/gui/code_view/images/snippet_active.png);
-}
-
-#code_file #minimize_button {
-	border-image: url(data/gui/code_view/images/minimize_inactive.png);
-}
-
-#code_file #minimize_button:enabled {
-	border-image: url(data/gui/code_view/images/minimize_active.png);
-}
-
-QToolTip {
-	background-color: <color:tool_tip/background>;
-	color: <color:tool_tip/text>;
-	font-size: <setting:font_size>pt;
+#last_scroll_bar {
+	background-color: <color:code/snippet/background>;
 }

bin/app/data/gui/custom_trail_view/custom_trail_view.css

@@ -0,0 +1,58 @@
+* {
+	color: <color:custom_trail/text>;
+}
+
+#panelA {
+	background: <color:custom_trail/background>;
+}
+
+#panelB, #panelB2 {
+	background: <color:custom_trail/alt_background>;
+	border-top: 1px solid <color:custom_trail/separator>;
+	border-bottom: 1px solid <color:custom_trail/separator>;
+}
+
+#panelB2 {
+	border-bottom: none
+}
+
+#search_box_container {
+	border-color: <color:custom_trail/separator>;
+	border-radius: 8px;
+	border-width: 1px;
+}
+
+#search_box_container:disabled {
+	background: <color:custom_trail/background_disabled>;
+	border-color: <color:custom_trail/background_disabled>;
+}
+
+#search_box:disabled {
+	color: <color:custom_trail/text_disabled>;
+}
+
+#button, #button_small {
+	background: <color:custom_trail/button/default/background>;
+	border: 1px solid <color:custom_trail/button/default/border>;
+	border-radius: 8px;
+	color: <color:custom_trail/button/default/text>;
+	padding: 3px 8px 2px;
+	font-size: <setting:font_size+1>px;
+	min-width: 5em;
+}
+
+#button_small {
+	border-radius: 6px;
+	font-size: <setting:font_size-1>px;
+	min-width: 4em;
+}
+
+#button:hover, #button_small:hover {
+	background: <color:custom_trail/button/hover/background>;
+	border-color: <color:custom_trail/button/hover/border>;
+	color: <color:custom_trail/button/hover/text>;
+}
+
+#error {
+	color: red;
+}

bin/app/data/gui/graph_view/graph_view.css

@@ -1,9 +1,112 @@
 QGraphicsView, QGraphicsScene {
 	background-color: <color:graph/background>;
+	border: none;
 }
 
-QToolTip {
-	background-color: <color:tool_tip/background>;
-	color: <color:tool_tip/text>;
-	font-size: <setting:font_size>pt;
+QPushButton {
+	background: <color:search/button/normal>;
+	border: none;
+	color: <color:search/button/icon>;
+	border-radius: 5px;
+}
+
+QPushButton:disabled {
+	background: <color:search/button/disabled>;
+}
+
+QPushButton:hover, QPushButton:checked {
+	background: <color:search/button/hover>;
+}
+
+QPushButton:pressed {
+	background: <color:search/button/press>;
+}
+
+#focus_indicator {
+	background: <color:window/focus>;
+}
+
+#expand_button {
+	max-width: 26px;
+	max-height: 26px;
+	border-radius: 9px;
+}
+
+#collapse_button {
+	border-radius: 0;
+	border-top-left-radius: 7px;
+	border-top-right-radius: 7px;
+}
+
+#trail_button {
+	border-radius: 0;
+}
+
+#depth_label {
+	background: <color:search/button/normal>;
+	color: <color:search/button/icon>;
+}
+
+#depth_label:disabled {
+	background: <color:search/button/disabled>;
+	color: <color:search/button/icon_disabled>;
+}
+
+#depth_slider {
+	background: <color:search/button/normal>;
+	padding-bottom: 5px;
+	border-bottom-left-radius: 7px;
+	border-bottom-right-radius: 7px;
+}
+
+#depth_slider:disabled {
+	background: <color:search/button/disabled>;
+}
+
+#depth_slider::groove {
+	margin: 5px;
+	width: 2px;
+}
+
+#depth_slider::handle {
+	height: 10px;
+	margin: 0px -4px;
+	border-radius: 5px;
+}
+
+#depth_slider::handle:hover {
+	height: 12px;
+	margin: 0px -5px;
+	border-radius: 6px;
+}
+
+#depth_slider::groove, #depth_slider::handle {
+	background: <color:search/button/icon>;
+}
+
+#depth_slider::groove:disabled, #depth_slider::handle:disabled {
+	background: <color:search/button/icon_disabled>;
+}
+
+#group_left_button {
+	border-radius: 0;
+	border-top-left-radius: 10px;
+	border-bottom-left-radius: 10px;
+	max-width: 26px;
+	max-height: 26px;
+	padding-left: 2px;
+}
+
+#group_right_button {
+	border-radius: 0;
+	border-top-right-radius: 10px;
+	border-bottom-right-radius: 10px;
+	max-width: 26px;
+	max-height: 26px;
+	padding-right: 2px;
+}
+
+#legend_button
+{
+	border-radius: 9px;
 }