diff --git a/app.py b/app.py
index 0ce9c304b1b015beb499248f6d578929cfcad3e7..226e027aec32db431c53b5ef5ec1c4bbc769bbb5 100644
--- a/app.py
+++ b/app.py
@@ -371,6 +371,7 @@ def build_sample_db():
 
     db.drop_all()
     db.create_all()
+    lic_unknown = License(name="Unbekannt")
     lic_bsd = License(name="BSD")
     lic_gpl2 = License(name="GPL", version="2.0")
     lic_gpl3 = License(name="GPL", version="3.0")
@@ -378,6 +379,8 @@ def build_sample_db():
     lic_lgpl = License(name="LGPL")
     lic_apache2 = License(name="Apache", version="2.0")
     lic_mit = License(name="MIT")
+    lic_byncnd3 = License(name="CC BY-NC-ND", version="3.0")
+    lic_ccdl = License(name="CCDL", version="1.0")
     lic_prop = License(name="Proprietär")
     db.session.add(lic_gpl3)
     db.session.add(lic_gpl3)
@@ -391,10 +394,16 @@ def build_sample_db():
     prol_cy = Programminglanguage(name="Cython")
     prol_java = Programminglanguage(name="Java")
     prol_objc = Programminglanguage(name="Objective-C")
+    prol_jupyternb = Programminglanguage(name="Jupyter Notebook")
+    prol_js = Programminglanguage(name="Javascript")
+    prol_c = Programminglanguage(name="C")
     db.session.add(prol_r)
     db.session.add(prol_py)
     db.session.add(prol_java)
     db.session.add(prol_objc)
+    db.session.add(prol_jupyternb)
+    db.session.add(prol_js)
+    db.session.add(prol_c)
 
     cat_tracking = SoftwareCategory(name="datenschutzkonformes Tracking", short_description="Sammlung von Sensordaten/Logdaten oder Nutzungsdaten mit expliziter Einverständnis mittels Software auf dem Gerät.")
     cat_scraping = SoftwareCategory(name="Scraping", short_description="Tools im Zusammenhang mit Web-Scraping.")
@@ -404,11 +413,16 @@ def build_sample_db():
 
     cat_senti = SoftwareCategory(name="Sentiment Analysis", short_description="")
     cat_topic = SoftwareCategory(name="Topic-Modellierung", short_description="")
-    cat_transkript = SoftwareCategory(name="Audio-Transkribtion", short_description="Transkriptionssoftware")
-    cat_transkript = SoftwareCategory(name="Audio-Transkribtion", short_description="Transkriptionssoftware")
-    cat_transkript = SoftwareCategory(name="Audio-Transkribtion", short_description="Transkriptionssoftware")
+    cat_visu = SoftwareCategory(name="Visualisierung", short_description="")
+    cat_kollab_anno = SoftwareCategory(name="Kollaboratives Annotieren", short_description="")
+    cat_kollab_write = SoftwareCategory(name="Kollaboratives Schreiben", short_description="")
+    cat_stat = SoftwareCategory(name="Statisik-Programme", short_description="Zur statistischen Modellierung einsetzbare Software.")
+    cat_repo = SoftwareCategory(name="Forschungsdatenspeicherung", short_description="")
+    cat_now = SoftwareCategory(name="Nowcasting", short_description="")
+    cat_net = SoftwareCategory(name="Netzwerkanalysen", short_description="social network analysis")
     cat_esmema = SoftwareCategory(name="ESM/EMA-Studien", short_description="Datenerhebung in 'natürlicher' Umgebung.")
     cat_transkript = SoftwareCategory(name="Audio-Transkribtion", short_description="Transkriptionssoftware")
+    cat_search = SoftwareCategory(name="Audio-Transkribtion", short_description="Transkriptionssoftware")
     cat_misc = SoftwareCategory(name="Weiteres", short_description="Zu speziell zum Einordnen..")
 
     db.session.add(cat_tracking)
@@ -719,6 +733,30 @@ def build_sample_db():
     db.session.add(Link(software=tool, type="website", url="http://nlesc.github.io/xtas/", comment=""))
     db.session.add(Link(software=tool, type="repository", url="https://github.com/NLeSC/xtas", comment=""))
 
+    tool = Software(name="MALLET",
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_topic,
+                    architecture="package",
+                    license=lic_apache2,
+                    programminglanguages=[prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://mallet.cs.umass.edu/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/mimno/Mallet", comment=""))
+
+    tool = Software(name="TOME",
+                    short_description="TOME is a tool to support the interactive exploration and visualization of text-based archives, supported by a Digital Humanities Startup Grant from the National Endowment for the Humanities (Lauren Klein and Jacob Eisenstein, co-PIs). Drawing upon the technique of topic modeling—a machine learning method for identifying the set of topics, or themes, in a document set—our tool allows humanities scholars to trace the evolution and circulation of these themes across networks and over time.",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_topic,
+                    architecture="package",
+                    license=lic_unknown,
+                    programminglanguages=[prol_py, prol_jupyternb])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://dhlab.lmc.gatech.edu/tome/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/GeorgiaTechDHLab/TOME/", comment=""))
+
     tool = Software(name="Stm",
                     short_description="The Structural Topic Model (STM) allows researchers to estimate topic models with document-level covariates. The package also includes tools for model selection, visualization, and estimation of topic-covariate regressions. Methods developed in Roberts et al (2014) <doi:10.1111/ajps.12103> and Roberts et al (2016) <doi:10.1080/01621459.2016.1141684>.",
                     developer="",
@@ -731,115 +769,223 @@ def build_sample_db():
     db.session.add(Link(software=tool, type="website", url="http://structuraltopicmodel.com", comment=""))
     db.session.add(Link(software=tool, type="repository", url="https://github.com/bstewart/stm", comment=""))
 
-    tool = Software(name="",
-                    short_description="",
+    tool = Software(name="lexicoder",
+                    short_description="Lexicoder performs simple deductive content analyses of any kind of text, in almost any language. All that is required is the text itself, and a dictionary. Our own work initially focused on the analysis of newspaper stories during election campaigns, and both television and newspaper stories about public policy issues. The software can deal with almost any text, however, and lots of it. Our own databases typically include up to 100,000 news stories. Lexicoder processes these data, even with a relatively complicated coding dictionary, in about fifteen minutes. The software has, we hope, a wide range of applications in the social sciences. It is not the only software that conducts content analysis, of course - there are many packages out there, some of which are much more sophisticated than this one. The advantage to Lexicoder, however, is that it can run on any computer with a recent version of Java (PC or Mac), it is very simple to use, it can deal with huge bodies of data, it can be called from R as well as from the Command Line, and its free.",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_senti,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_prop,
+                    programminglanguages=[prol_java])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="", comment=""))
+    db.session.add(Link(software=tool, type="website", url="http://www.lexicoder.com/index.html", comment=""))
+
+    tool = Software(name="OpinionFinder",
+                    short_description="OpinionFinder is a system that processes documents and automatically identifies subjective sentences as well as various aspects of subjectivity within sentences, including agents who are sources of opinion, direct subjective expressions and speech events, and sentiment expressions. OpinionFinder was developed by researchers at the University of Pittsburgh, Cornell University, and the University of Utah. In addition to OpinionFinder, we are also releasing the automatic annotations produced by running OpinionFinder on a subset of the Penn Treebank.",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_senti,
+                    architecture="package",
+                    license=lic_unknown,
+                    programminglanguages=[prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://mpqa.cs.pitt.edu/opinionfinder/", comment=""))
     db.session.add(Link(software=tool, type="repository", url="", comment=""))
 
-    tool = Software(name="",
-                    short_description="",
+    tool = Software(name="Readme",
+                    short_description="The ReadMe software package for R takes as input a set of text documents (such as speeches, blog posts, newspaper articles, judicial opinions, movie reviews, etc.), a categorization scheme chosen by the user (e.g., ordered positive to negative sentiment ratings, unordered policy topics, or any other mutually exclusive and exhaustive set of categories), and a small subset of text documents hand classified into the given categories. ",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_senti,
+                    architecture="package",
+                    license=lic_byncnd3,
+                    programminglanguages=[prol_r])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://gking.harvard.edu/readme", comment=""))
+
+    tool = Software(name="Gephi",
+                    short_description="Gephi is an award-winning open-source platform for visualizing and manipulating large graphs.",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_visu,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_gpl3,
+                    programminglanguages=[prol_java])
     db.session.add(tool)
     db.session.add(Link(software=tool, type="website", url="", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/gephi/gephi/", comment=""))
+
+    tool = Software(name="WebAnno",
+                    short_description="WebAnno is a multi-user tool supporting different roles such as annotator, curator, and project manager. The progress and quality of annotation projects can be monitored and measuered in terms of inter-annotator agreement. Multiple annotation projects can be conducted in parallel.",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_kollab_anno,
+                    architecture="package",
+                    license=lic_apache2,
+                    programminglanguages=[prol_py])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://webanno.github.io/webanno/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/webanno/webanno", comment=""))
 
-    tool = Software(name="",
+    tool = Software(name="FidusWriter",
                     short_description="",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_kollab_write,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_agpl3,
+                    programminglanguages=[prol_py,prol_js])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="", comment=""))
+    db.session.add(Link(software=tool, type="website", url="https://fiduswriter.org", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/fiduswriter/fiduswriter", comment=""))
 
-    tool = Software(name="",
+    tool = Software(name="dataverse",
                     short_description="",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_repo,
+                    architecture="framework",
+                    license=lic_apache2,
+                    programminglanguages=[prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://dataverse.org/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/IQSS/dataverse", comment=""))
+
+    tool = Software(name="gretl",
+                    short_description="Is a cross-platform software package for econometric analysis",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_stat,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_gpl3,
+                    programminglanguages=[prol_c])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="", comment=""))
+    db.session.add(Link(software=tool, type="website", url="http://gretl.sourceforge.net/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://sourceforge.net/p/gretl/git/ci/master/tree/", comment=""))
 
-    tool = Software(name="",
+    tool = Software(name="MLwiN",
                     short_description="",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_stat,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_prop,
+                    programminglanguages=[])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="", comment=""))
+    db.session.add(Link(software=tool, type="website", url="http://www.bristol.ac.uk/cmm/software/mlwin/", comment=""))
     db.session.add(Link(software=tool, type="repository", url="", comment=""))
 
-    tool = Software(name="",
+    tool = Software(name="SPSS",
                     short_description="",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_stat,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_prop,
+                    programminglanguages=[])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="", comment=""))
 
-    tool = Software(name="",
+    tool = Software(name="STATA",
                     short_description="",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_stat,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_prop,
+                    programminglanguages=[])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="", comment=""))
 
-    tool = Software(name="",
+    tool = Software(name="Nowcasting",
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_now,
+                    architecture="package",
+                    license=lic_gpl3,
+                    programminglanguages=[prol_r])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://cran.r-project.org/package=nowcasting", comment="cran"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/nmecsys/nowcasting", comment=""))
+
+    tool = Software(name="AutoMap",
+                    short_description="AutoMap enables the extraction of information from texts using Network Text Analysis methods. AutoMap supports the extraction of several types of data from unstructured documents. The type of information that can be extracted includes: content analytic data (words and frequencies), semantic network data (the network of concepts), meta-network data (the cross classification of concepts into their ontological category such as people, places and things and the connections among these classified concepts), and sentiment data (attitudes, beliefs). Extraction of each type of data assumes the previously listed type of data has been extracted.",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_net,
+                    architecture="package",
+                    license=lic_prop,
+                    programminglanguages=[prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://www.casos.cs.cmu.edu/projects/automap/software.php", comment=""))
+
+    tool = Software(name="NodeXL",
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_net,
+                    architecture="package",
+                    license=lic_prop,
+                    programminglanguages=[])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://www.smrfoundation.org/nodexl/", comment=""))
+
+    tool = Software(name="ORA Pro",
                     short_description="",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_net,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_prop,
+                    programminglanguages=[])
     db.session.add(tool)
     db.session.add(Link(software=tool, type="website", url="", comment=""))
     db.session.add(Link(software=tool, type="repository", url="", comment=""))
-    '''
-    tool = Software(name="",
+
+    tool = Software(name="Pajek",
                     short_description="",
                     developer="",
                     maintainer="",
-                    softwarecategory=cat_,
+                    softwarecategory=cat_net,
+                    architecture="package",
+                    license=lic_prop,
+                    programminglanguages=[])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://mrvar.fdv.uni-lj.si/pajek/", comment=""))
+
+    tool = Software(name="NetworkX",
+                    short_description="Data structures for graphs, digraphs, and multigraphs Many standard graph algorithms Network structure and analysis measures Generators for classic graphs, random graphs, and synthetic networks Nodes can be 'anything' (e.g., text, images, XML records) Edges can hold arbitrary data (e.g., weights, time-series) Open source 3-clause BSD license Well tested with over 90% code coverage Additional benefits from Python include fast prototyping, easy to teach, and multi-platform",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_net,
                     architecture="package",
-                    license=lic_,
-                    programminglanguages=[prol_])
+                    license=lic_bsd,
+                    programminglanguages=[prol_py])
     db.session.add(tool)
     db.session.add(Link(software=tool, type="website", url="", comment=""))
     db.session.add(Link(software=tool, type="repository", url="", comment=""))
-    '''
 
+    tool = Software(name="UCINET",
+                    short_description="UCINET 6 for Windows is a software package for the analysis of social network data. It was developed by Lin Freeman, Martin Everett and Steve Borgatti. It comes with the NetDraw network visualization tool.",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_net,
+                    architecture="package",
+                    license=lic_prop,
+                    programminglanguages=[])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://sites.google.com/site/ucinetsoftware/home", comment=""))
+
+    tool = Software(name="LuceneSolr",
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_search,
+                    architecture="package",
+                    license=lic_apache2,
+                    programminglanguages=[])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://lucene.apache.org/solr/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="", comment=""))
 
     paco = Software(name="paco",
                      short_description="",
@@ -863,6 +1009,20 @@ def build_sample_db():
     db.session.add(f4analyse)
     db.session.add(Link(software=f4analyse, type="website", url="https://www.audiotranskription.de/f4-analyse", comment=""))
 
+    '''
+     tool = Software(name="",
+                     short_description="",
+                     developer="",
+                     maintainer="",
+                     softwarecategory=cat_,
+                     architecture="package",
+                     license=lic_,
+                     programminglanguages=[prol_])
+     db.session.add(tool)
+     db.session.add(Link(software=tool, type="website", url="", comment=""))
+     db.session.add(Link(software=tool, type="repository", url="", comment=""))
+     '''
+
     db.session.commit()
     return
 
diff --git a/sample_db.sqlite b/sample_db.sqlite
index 81c755dbc5d1178004e2e2b7319413fd5bbc7d35..3cc47e76cddaaa783b797d81b5c6d5c4e731913c 100644
Binary files a/sample_db.sqlite and b/sample_db.sqlite differ