diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -1,23 +1,30 @@
 ################################################################################
 ################################################################################
-# RhodeCode - Pylons environment configuration                                 #
+# Kallithea - Development config:                                              #
+# listening on *:5000                                                          #
+# sqlite and kallithea.db                                                      #
+# initial_repo_scan = true                                                     #
+# set debug = true                                                             #
+# verbose and colorful logging                                                 #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
+################################################################################
 
 [DEFAULT]
 debug = true
 pdebug = false
+
 ################################################################################
 ## Uncomment and replace with the address which should receive                ##
 ## any error reports after application crash                                  ##
-## Additionally those settings will be used by RhodeCode mailing system       ##
+## Additionally those settings will be used by Kallithea mailing system       ##
 ################################################################################
 #email_to = admin@localhost
 #error_email_from = paste_error@localhost
-#app_email_from = rhodecode-noreply@localhost
+#app_email_from = kallithea-noreply@localhost
 #error_message =
-#email_prefix = [RhodeCode]
+#email_prefix = [Kallithea]
 
 #smtp_server = mail.server.com
 #smtp_username =
@@ -54,11 +61,11 @@ max_request_body_size = 107374182400
 ## is set to more than one worker
 #workers = 1
 ## process name
-#proc_name = rhodecode
+#proc_name = kallithea
 ## type of worker class, one of sync, eventlet, gevent, tornado
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
-#max_requests = 5
+#max_requests = 1000
 ## ammount of time a worker can handle request before it gets killed and
 ## restarted
 #timeout = 3600
@@ -68,13 +75,13 @@ max_request_body_size = 107374182400
 #[uwsgi]
 #socket = /tmp/uwsgi.sock
 #master = true
-#http = 0.0.0.0:5000
+#http = 127.0.0.1:5000
 
 ## set as deamon and redirect all output to file
-#daemonize = ./uwsgi_rhodecode.log
+#daemonize = ./uwsgi_kallithea.log
 
 ## master process PID
-#pidfile = ./uwsgi_rhodecode.pid
+#pidfile = ./uwsgi_kallithea.pid
 
 ## stats server with workers statistics, use uwsgitop
 ## for monitoring, `uwsgitop 127.0.0.1:1717`
@@ -133,27 +140,28 @@ port = 5000
 #prefix = /<your-prefix>
 
 [app:main]
-use = egg:rhodecode
+use = egg:kallithea
 ## enable proxy prefix middleware
 #filter-with = proxy-prefix
 
 full_stack = true
 static_files = true
-## Optional Languages
-## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
+## Available Languages:
+## de en fr ja pl pt_BR ru zh_CN zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 
 ## perform a full repository scan on each server start, this should be
 ## set to false after first startup, to allow faster server restarts.
+#initial_repo_scan = false
 initial_repo_scan = true
 
 ## uncomment and set this path to use archive download cache
-#archive_cache_dir = /tmp/tarballcache
+archive_cache_dir = %(here)s/tarballcache
 
 ## change this to unique ID for security
-app_instance_uuid = rc-production
+app_instance_uuid = development-not-secret
 
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
@@ -161,7 +169,7 @@ cut_off_limit = 256000
 ## use cache version of scm repo everywhere
 vcs_full_cache = true
 
-## force https in RhodeCode, fixes https redirects, assumes it's always https
+## force https in Kallithea, fixes https redirects, assumes it's always https
 force_https = false
 
 ## use Strict-Transport-Security headers
@@ -178,7 +186,7 @@ git_path = git
 
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
-git_rev_filter=--all
+#git_rev_filter = --branches --tags
 
 ## RSS feed options
 rss_cut_off_limit = 256000
@@ -191,8 +199,8 @@ show_revision_number = true
 
 ## gist URL alias, used to create nicer urls for gist. This should be an
 ## url that does rewrites to _admin/gists/<gistid>.
-## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
-## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid>
+## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
+## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
 gist_alias_url =
 
 ## white list of API enabled controllers. This allows to add list of
@@ -200,7 +208,7 @@ gist_alias_url =
 ## api access to raw_files put `FilesController:raw`, to enable access to patches
 ## add `ChangesetController:changeset_patch`. This list should be "," separated
 ## Syntax is <ControllerClass>:<function>. Check debug logs for generated names
-## Recommended settings bellow are commented out:
+## Recommended settings below are commented out:
 api_access_controllers_whitelist =
 #    ChangesetController:changeset_patch,
 #    ChangesetController:changeset_raw,
@@ -212,8 +220,8 @@ api_access_controllers_whitelist =
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
-## {scheme}       http/https from RhodeCode server
-## {netloc}       network location from RhodeCode server
+## {scheme}       http/https from Kallithea server
+## {netloc}       network location from Kallithea server
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 
@@ -236,8 +244,8 @@ default_encoding = utf8
 
 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
 
-## issue tracker for RhodeCode (leave blank to disable, absent for default)
-#bugtracker = http://bitbucket.org/marcinkuzminski/rhodecode/issues
+## issue tracker for Kallithea (leave blank to disable, absent for default)
+#bugtracker = https://bitbucket.org/conservancy/kallithea/issues
 
 ## issue tracking mapping for commits messages
 ## comment out issue_pat, issue_server, issue_prefix to enable
@@ -262,7 +270,7 @@ issue_prefix = #
 ## issue_pat, issue_server_link, issue_prefix can have suffixes to specify
 ## multiple patterns, to other issues server, wiki or others
 ## below an example how to create a wiki pattern
-#  #wiki-some-id -> https://mywiki.com/some-id
+# wiki-some-id -> https://mywiki.com/some-id
 
 #issue_pat_wiki = (?:wiki-)(.+)
 #issue_server_link_wiki = https://mywiki.com/{id}
@@ -271,8 +279,8 @@ issue_prefix = #
 
 ## instance-id prefix
 ## a prefix key for this instance used for cache invalidation when running
-## multiple instances of rhodecode, make sure it's globally unique for
-## all running rhodecode instances. Leave empty if you don't use it
+## multiple instances of kallithea, make sure it's globally unique for
+## all running kallithea instances. Leave empty if you don't use it
 instance_id =
 
 ## alternative return HTTP header for failed authentication. Default HTTP
@@ -294,6 +302,7 @@ allow_custom_hooks_settings = True
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
+
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
@@ -301,7 +310,7 @@ broker.port = 5672
 broker.user = rabbitmq
 broker.password = qweqwe
 
-celery.imports = rhodecode.lib.celerylib.tasks
+celery.imports = kallithea.lib.celerylib.tasks
 
 celery.result.backend = amqp
 celery.result.dburi = amqp://
@@ -321,6 +330,7 @@ celery.always.eager = false
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
+
 beaker.cache.data_dir=%(here)s/data/cache/data
 beaker.cache.lock_dir=%(here)s/data/cache/lock
 
@@ -360,7 +370,7 @@ beaker.cache.sql_cache_long.key_length =
 
 ## db session ##
 #beaker.session.type = ext:database
-#beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
+#beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
 #beaker.session.table_name = db_session
 
 ## encrypted cookie client side session, good for many instances ##
@@ -369,8 +379,8 @@ beaker.cache.sql_cache_long.key_length =
 ## file based cookies (default) ##
 #beaker.session.type = file
 
-beaker.session.key = rhodecode
-beaker.session.secret = develop-rc-uytcxaz
+beaker.session.key = kallithea
+beaker.session.secret = development-not-secret
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
@@ -400,7 +410,7 @@ beaker.session.auto = False
 ### [errormator] ###
 ####################
 
-## Errormator is tailored to work with RhodeCode, see
+## Errormator is tailored to work with Kallithea, see
 ## http://errormator.com for details how to obtain an account
 ## you must install python package `errormator_client` to make it work
 
@@ -479,10 +489,12 @@ sentry.exclude_paths =
 ## execute malicious code after an exception is raised.                       ##
 ################################################################################
 #set debug = false
+set debug = true
 
 ##################################
 ###       LOGVIEW CONFIG       ###
 ##################################
+
 logview.sqlalchemy = #faa
 logview.pylons.templating = #bfb
 logview.pylons.util = #eee
@@ -490,9 +502,18 @@ logview.pylons.util = #eee
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
-#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
-sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
-#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+
+# SQLITE [default]
+sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=60
+
+# POSTGRESQL
+# sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
+
+# MySQL
+# sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
+
+# see sqlalchemy docs for others
+
 sqlalchemy.db1.echo = false
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.db1.convert_unicode = true
@@ -500,8 +521,9 @@ sqlalchemy.db1.convert_unicode = true
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
+
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer
+keys = root, routes, kallithea, sqlalchemy, beaker, templates, whoosh_indexer
 
 [handlers]
 keys = console, console_sql
@@ -512,6 +534,7 @@ keys = generic, color_formatter, color_f
 #############
 ## LOGGERS ##
 #############
+
 [logger_root]
 level = NOTSET
 handlers = console
@@ -535,10 +558,10 @@ handlers =
 qualname = pylons.templating
 propagate = 1
 
-[logger_rhodecode]
+[logger_kallithea]
 level = DEBUG
 handlers =
-qualname = rhodecode
+qualname = kallithea
 propagate = 1
 
 [logger_sqlalchemy]
@@ -560,12 +583,16 @@ propagate = 1
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
+#level = INFO
+#formatter = generic
 level = DEBUG
 formatter = color_formatter
 
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
+#level = WARN
+#formatter = generic
 level = DEBUG
 formatter = color_formatter_sql
 
@@ -578,11 +605,11 @@ format = %(asctime)s.%(msecs)03d %(level
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter]
-class=rhodecode.lib.colored_formatter.ColorFormatter
+class=kallithea.lib.colored_formatter.ColorFormatter
 format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter_sql]
-class=rhodecode.lib.colored_formatter.ColorFormatterSql
+class=kallithea.lib.colored_formatter.ColorFormatterSql
 format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S