diff --git a/profiles/templates/default/.calculate_directory b/profiles/templates/default/.calculate_directory
new file mode 100644
index 0000000..33a1224
--- /dev/null
+++ b/profiles/templates/default/.calculate_directory
@@ -0,0 +1 @@
+# Calculate cl_name==calculate-core append=skip
diff --git a/profiles/templates/default/world b/profiles/templates/default/world
new file mode 100644
index 0000000..9266dd2
--- /dev/null
+++ b/profiles/templates/default/world
@@ -0,0 +1,2 @@
+# Calculate env=update ac_update_sync==on path=/var/lib/portage cl_update_world==merge||cl_update_world==rebuild format=world
+app-text/tree
diff --git a/profiles/templates/steam/world b/profiles/templates/steam/world
index 2c7118c..a9b6b0f 100644
--- a/profiles/templates/steam/world
+++ b/profiles/templates/steam/world
@@ -5,7 +5,6 @@ app-arch/lbzip2
 app-arch/p7zip
 app-arch/pigz
 app-portage/gentoolkit
-app-text/tree
 app-vim/colorschemes
 games-util/steam-launcher
 media-fonts/droid
diff --git a/profiles/templates/taiga/postgresql/etc/pg_ident.conf b/profiles/templates/taiga/postgresql/etc/pg_ident.conf
deleted file mode 100644
index 4559188..0000000
--- a/profiles/templates/taiga/postgresql/etc/pg_ident.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=600 comment=# chown=postgres:postgres
diff --git a/profiles/templates/taiga/postgresql/etc/postgresql.conf b/profiles/templates/taiga/postgresql/etc/postgresql.conf
deleted file mode 100644
index dcf6016..0000000
--- a/profiles/templates/taiga/postgresql/etc/postgresql.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate chmod=600 comment=# chown=postgres:postgres
-
-max_connections = 100			# (change requires restart)
-shared_buffers = 128MB			# min 128kB
-dynamic_shared_memory_type = posix	# the default is the first option
-max_wal_size = 1GB
-min_wal_size = 80MB
-log_timezone = 'W-SU'
-datestyle = 'iso, dmy'
-timezone = 'W-SU'
-lc_messages = 'ru_RU.UTF-8'		# locale for system error message
-lc_monetary = 'ru_RU.UTF-8'		# locale for monetary formatting
-lc_numeric = 'C'			# locale for number formatting
-lc_time = 'ru_RU.UTF-8'			# locale for time formatting
-default_text_search_config = 'pg_catalog.russian'
-plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-
-listen_addresses = '127.0.0.1'
diff --git a/profiles/templates/taiga/world b/profiles/templates/taiga/world
index 5e6aca3..cb3de7a 100644
--- a/profiles/templates/taiga/world
+++ b/profiles/templates/taiga/world
@@ -1,5 +1,4 @@
 # Calculate env=update ac_update_sync==on path=/var/lib/portage cl_update_world==merge||cl_update_world==rebuild format=world
-app-text/tree
 dev-db/postgresql:12
 dev-python/nodeenv
 dev-python/setuptools
diff --git a/scripts/taiga/step/2-postgresql.sh b/scripts/taiga/step/2-postgresql.sh
index d5c685c..5ffe6ca 100755
--- a/scripts/taiga/step/2-postgresql.sh
+++ b/scripts/taiga/step/2-postgresql.sh
@@ -25,7 +25,7 @@ emerge --config =dev-db/postgresql-$(pgver)
 
 psql -U postgres -c "ALTER USER postgres WITH PASSWORD '${ini[postgresql.postgres_password]}'"
 psql -U postgres -c "CREATE ROLE ${ini[postgresql.taiga_user]} WITH login"
-psql -U postgres -c "CREATE DATABASE taiga OWNER taiga"
+psql -U postgres -c "CREATE DATABASE ${ini[postgresql.taiga_database]} OWNER ${ini[postgresql.taiga_user]}"
 psql -U postgres -c "ALTER USER ${ini[postgresql.taiga_user]} WITH PASSWORD '${ini[postgresql.taiga_password]}'"
 
 cl-core-setup -n postgresql -f