diff --git a/config.yml b/config.yml
index dd89378..13c5ef2 100644
--- a/config.yml
+++ b/config.yml
@@ -1,10 +1,11 @@
-# This is a YAML file, more abouts its syntax: https://en.wikipedia.org/wiki/YAML
+# Documentation:
+# https://github.com/trovu/trovu.github.io/wiki/Advanced-settings-&-personal-shortcuts#custom-configuration
 namespaces:
 - o
-- en
-- .us
+- de
+- .de
+- sthuebner
 - github: .
-  name: my
-# defaultKeyword: g 
-language: en
-country: us
+defaultKeyword: k
+language: de
+country: de
diff --git a/shortcuts.yml b/shortcuts.yml
index 1c171e6..f273fb9 100644
--- a/shortcuts.yml
+++ b/shortcuts.yml
@@ -1,27 +1,108 @@
-# This is a YAML file, more abouts its syntax: https://en.wikipedia.org/wiki/YAML
-
-# First example shortcut: Short notation.
-# Use 
-#
-#   KEYWORDNAME ARGCOUNT
-#
-# as the key, and the target URL as the value.
-# This shortcut will match for "examplekeyword" with no arguments.
-examplekeyword 0: http://www.example.com/
-
-# This shortcut will match for "examplekeyword foo", 
-# so for the same keyword but with one argument.
-examplekeyword 1: http://www.example.com/?q={%query} 
-
-# Another example: extended notation
-# This shortcut will match for "examplekeyword foo, bar", 
-# Here you can define optional title, description and tags.
-examplekeyword 2:
-  url: http://www.example.com/?q={%query}&p={%puery}
-  title: Custom shortcut
-  description: My custom shortcut with the keyword examplekeyword and 2 arguments.
+gem 1:
+  url: https://rubygems.org/search?utf8=✓&query=<query>
+  title: Rubygems Search
   tags:
-  - example
-
-# Make sure that the keys are unique, 
-# e.g. that the every "KEYWORDNAME ARGCOUNT" is only used once in this file.
+  - ruby gem
+  examples:
+    query: Search for a gem called 'query' on rubygems.org
+db 4:
+  url: http://reiseauskunft.bahn.de/bin/query.exe/d?S=<Start>&Z=<Ziel>&T=<Zeit>&D=<Datum>&start=1&REQ0Tariff_TravellerAge.1=30&REQ0Tariff_TravellerReductionClass.1=4&REQ0Tariff_Class=2&existOptimizePrice=0
+  title: DB-Auskunft
+wfw 1:
+  url: http://warframe.wikia.com/wiki/<query>
+  title: Warframe Wiki
+a 1:
+  url: http://smile.amazon.de/gp/search?keywords=<Suche>
+  title: Amazon
+a 0:
+  url: http://smile.amazon.de/
+  title: Amazon
+void 1:
+  url: https://github.com/void-linux/void-packages/issues?utf8=%E2%9C%93&q=is%3Aopen+<query>
+  title: Voidlinux Packages Issues and PRs
+  tags:
+  - linux
+  - voidlinux
+  - packages
+  - github
+te 1:
+  url: http://www.tineye.com/search?url=<url>
+  title: TinEye
+java 1:
+  url: http://www.google.com/search?hl=<$language>&q=inurl%3Ajavase%2F11%2Fdocs%2Fapi%2F+Class+<query>+intitle%3A<query>&ie=utf-8&btnI=1
+  title: Java Platform SE 11 API
+  tags:
+  - java
+  - programming
+  - api
+  examples:
+    void: Search for docs about "void"
+ors 1:
+  url: https://maps.openrouteservice.org/#/search/<location>/@0,0/z/10
+  title: OpenRouteService
+  description: Search for a place on OpenRouteService
+  tags:
+  - maps
+  - openstreetmap
+scala3 1:
+  url: http://www.scala-lang.org/api/3.3.0/?search=<query>
+  title: Scala Standard Library
+  tags:
+  - scala
+  - programming
+  - jvm
+  - programming language
+  - api
+  - apidoc
+  - documentation
+  examples:
+    AnyVal: Search for "AnyVal"
+scaladex 1:
+  url: https://index.scala-lang.org/search?q=<query>
+  title: Scaladex Library index
+  description: Search for Scala libraries on Scaladex
+  tags:
+  - scala
+  - programming
+  - jvm
+  - library
+  examples:
+    cats: Search Scaladex Library index for cats and related libraries
+    http: Search for HTTP libraries
+k 1:
+  url: https://kagi.com/search?q=<searchTerms>
+  title: Kagi Search
+  tags:
+  - search engine
+  - web search
+ki 1:
+  url: https://kagi.com/images?q=<searchTerms>
+  title: Kagi Image Search
+  tags:
+  - search engine
+  - web search
+y 1:
+  url: https://www.youtube.com/results?search_query=<query>
+  title: Youtube
+  tags:
+  - video
+  - youtube
+  examples:
+  - arguments: cartoon
+    description: Youtube search for "cartoon"
+  showOnHome: 400
+mvn 1:
+  url: https://mvnrepository.com/search?q=<query>
+  title: MVNRepository index
+  tags:
+    - java
+    - scala
+    - jvm
+    - maven
+  examples:
+    org.apache: search for apache libraries
+thangs 1:
+  url: https://thangs.com/search/<query>?searchScope=all
+  title: Thangs global search
+  tags:
+  - 3d printing