diff --git a/conf/client.conf b/conf/client.conf
index 5e8a7212c..9b268f98a 100644
--- a/conf/client.conf
+++ b/conf/client.conf
@@ -4,51 +4,51 @@
 # 0: No protection
 # 1: Removal protection (recommended)
 # 2: Installation/Removal protection
-collision-protect|1
+collision-protect = 1
 
 # Configuration files protection
 # This works in the same way of Portage CONFIG_PROTECT but it's Entropy related
 #
 #  syntax for CONFIG_PROTECT:
-#  config-protect|/path/to/dir1 /path/to/dir2 /path/to/dir3
+#  config-protect = /path/to/dir1 /path/to/dir2 /path/to/dir3
 #
 #  default: unset, internal variable will be used (this is stored into
 #           the repository database)
 #
 # 2: Installation/Removal protection
-config-protect|/etc/conf.d /etc/hosts /etc/X11/xorg.conf /etc/X11 /etc/entropy
+config-protect = /etc/conf.d /etc/hosts /etc/X11/xorg.conf /etc/X11 /etc/entropy
 
 # Configuration files protection
 # This works in the same way of Portage CONFIG_PROTECT_MASK but it's
 # Entropy related
 #
 #  syntax for CONFIG_PROTECT_MASK:
-#  config-protect-mask|/path/to/dir1 /path/to/dir2 /path/to/dir3
+#  config-protect-mask = /path/to/dir1 /path/to/dir2 /path/to/dir3
 #
 #  default: unset, internal variable will be used (this is stored into the
 #           repository database)
 #
 # 2: Installation/Removal protection mask
-config-protect-mask|/etc/pam.d
+config-protect-mask = /etc/pam.d
 
 # Configuration files protection
 # List of files that should be kept as they are: whose updated config files
 # will be rejected
 #
 #  syntax for CONFIG_PROTECT_SKIP:
-#  config-protect-skip|/path/to/dir1 /path/to/dir2 /path/to/dir3
+#  config-protect-skip = /path/to/dir1 /path/to/dir2 /path/to/dir3
 #
 #  default: unset, internal variable will be used (this is stored into the
 #           repository database)
 #
 # 2: Installation/Removal protection skip
-config-protect-skip|/etc/conf.d/hostname /etc/sudoers /etc/exports
+config-protect-skip = /etc/conf.d/hostname /etc/sudoers /etc/exports
 
 # Configuration files backup
 # Option to enable/disable automatic backup of files merged by "equo conf update"
 # Valid parameters: disable, enable, true, false, disabled, enabled
 # Default parameter if unset: enable
-files-backup|false
+files-backup = false
 
 # Extra package hash check modules
 # Option to selectively choose what extra package hash checks to execute
@@ -56,19 +56,19 @@ files-backup|false
 # Default parameter if unset: sha1 sha256 sha512 gpg
 # PLEASE NOTE: to fully disable GPG feature, please have a look at the
 # "gpg" option below.
-package-hashes|sha1 gpg
+package-hashes = sha1 gpg
 
 # GnuPG repository and packages verification feature.
 # Valid parameters: disable, enable, true, false, disabled, enabled
 # Default parameter if unsed: enable
 # It is strongly suggested to keep gpg feature enabled.
-# gpg|enable
+# gpg = enable
 
 # Force critical updates first
 # Option to enable/disable forced critical updates installation.
 # Valid parameters: disable, enable, true, false, disabled, enabled
 # Default parameter if unset: enable
-# forced-updates|enable
+# forced-updates = enable
 
 # Number of days that should pass before package files
 # get removed from cache automatically.
@@ -80,7 +80,7 @@ package-hashes|sha1 gpg
 # Valid parameters: <integer, representing number of days>
 # Default parameter if unset: <feature disabled>
 # NOTE: values <0 or >365 are not tolerated.
-# packages-autoprune-days|60
+# packages-autoprune-days = 60
 
 # Enable/disable simultaneous download of packages by Entropy Client
 # Valid parameters: disable, enable, true, false, disabled, enabled
@@ -88,7 +88,7 @@ package-hashes|sha1 gpg
 # are allocated. To change this, just set multifetch to a value between
 # 1 and 10.
 # Default parameter if unset: disable
-# multifetch|disable
+# multifetch = disable
 
 # Ignore SPM (Portage) pseudo-downgrades
 # USE AT YOUR OWN RISK, IF YOU DON'T KNOW WHAT'S THIS OPTION
@@ -101,13 +101,13 @@ package-hashes|sha1 gpg
 # migrating from Portage to Entropy
 # Valid parameters: disable, enable, true, false, disabled, enabled
 # Default parameter if unset: disable
-ignore-spm-downgrades|disable
+ignore-spm-downgrades = disable
 
 # Enable the installation of debug files
 # Also known as "splitdebug" support
 # Valid parameters: disable, enable, true, false, disabled, enabled
 # Default parameter if unset: disable
-# splitdebug|disable
+# splitdebug = disable
 # HOW SPLITDEBUG WORKS with Entropy
 # Once you enable the "splitdebug" feature
 # you just need to (re)install packages in order to
diff --git a/conf/entropy.conf b/conf/entropy.conf
index bfd85c73c..723985aa9 100644
--- a/conf/entropy.conf
+++ b/conf/entropy.conf
@@ -4,31 +4,31 @@
 # 0: No Logging
 # 1: Normal Logging
 # 2: Verbose Logging
-loglevel|1
+loglevel = 1
 
 #
 #  syntax for ftp-proxy:
 #
 #    ftp-proxy: If you connect to the Internet through a proxy, add the URL for FTP connections here
-#    ftp-proxy|<URL string>
+#    ftp-proxy = <URL string>
 #
 #    example:
-#    ftp-proxy|http://127.0.0.1:3128
+#    ftp-proxy = http://127.0.0.1:3128
 #
 # FTP Proxy default setting
-ftp-proxy|
+ftp-proxy = 
 
 #
 #  syntax for http-proxy:
 #
 #    http-proxy: If you connect to the Internet through a proxy, add the URL for HTTP connections here
-#    http-proxy|<URL string>
+#    http-proxy = <URL string>
 #
 #    example:
-#    http-proxy|http://127.0.0.1:3128
+#    http-proxy = http://127.0.0.1:3128
 #
 # HTTP Proxy default setting
-http-proxy|
+http-proxy = 
 
 #
 #  syntax for rsync-proxy:
@@ -36,58 +36,58 @@ http-proxy|
 #    rsync-proxy: If you connect to the Internet through a proxy, add the URL for RSYNC connections here
 #
 #    example:
-#    http-proxy|hostname:port
+#    http-proxy = hostname:port
 #
 # RSYNC Proxy default setting
-rsync-proxy|
+rsync-proxy = 
 
 #
 #  syntax for proxy-username:
 #
 #    proxy-username: If your proxy needs authentication here is the place to put your username
-#    proxy-username|<username>
+#    proxy-username = <username>
 #
 #    example:
-#    proxy-username|myfirstemployee
+#    proxy-username = myfirstemployee
 #
 # Proxy username default setting
-# proxy-username|
+# proxy-username = 
 
 #
 #  syntax for proxy-password:
 #
 #    proxy-password: If your proxy needs authentication here is the place to put your password
-#    proxy-password|<username>
+#    proxy-password = <username>
 #
 #    example:
-#    proxy-password|myfirstemployeepassword
+#    proxy-password = myfirstemployeepassword
 #
 # Proxy password default setting
-# proxy-password|
+# proxy-password = 
 
 #
 #  syntax for system-name:
 #
 #    system-name: Name of the running Operating System
-#    system-name|<string with spaces>
+#    system-name = <string with spaces>
 #
 #    example:
-#    system-name|Sabayon Linux
+#    system-name = Sabayon Linux
 #
 # Default Operating System name
-system-name|Sabayon Linux
+system-name = Sabayon Linux
 
 #
 #  syntax for nice-level:
 #
 #    nice-level: Set Entropy processes nice level (when running as root)
-#    nice-level|<integer from -19 to +19>
+#    nice-level = <integer from -19 to +19>
 #
 #    example:
-#    nice-level|5
+#    nice-level = 5
 #
 # Entropy processes nice level
-# nice-level|0
+# nice-level = 0
 
 #
 #  syntax for spm-backend:
@@ -96,10 +96,10 @@ system-name|Sabayon Linux
 #        Currently supported is "portage". Pay attention to edit this
 #        parameter, it could cause your Entropy to fail loading!
 #
-#    spm-backend|[supported backend identifier]
+#    spm-backend = [supported backend identifier]
 #
 #    example:
-#    spm-backend|portage
+#    spm-backend = portage
 #
 # Default SPM backend value:
-# spm-backend|portage
+# spm-backend = portage
diff --git a/conf/repositories.conf.example b/conf/repositories.conf.example
index 35bbd3b3d..8260ebc0d 100644
--- a/conf/repositories.conf.example
+++ b/conf/repositories.conf.example
@@ -4,58 +4,58 @@
 #  syntax for repositories (content in square brackets not mandatory):
 #
 #    repository: where the available packages and its database are stored
-#|   repository|repository_id|repository description|<packages mirror 1> <packages mirror 2> <...>|<database uri>[,<UGC service URI>][#compression_method][#<service port,ssl service port>]
+#    repository = repository_id|repository description|<packages mirror 1> <packages mirror 2> <...>|<database uri>[,<UGC service URI>][#compression_method][#<service port,ssl service port>]
 #
 #    example (content in square brackets not mandatory):
-#|       repository|sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org/packages|http://pkg.sabayon.org/db[,sabayon.org][#bz2][#1026,1027]
+#       repository = sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org/packages|http://pkg.sabayon.org/db[,sabayon.org][#bz2][#1026,1027]
 #
 # NOTE: supported protocols are: file, http, https, ftp, ftps, rsync
-#
+
 # Sabayon Linux Official Repository
-repository|sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org|http://pkg.sabayon.org,sabayon.org
-repository|sabayonlinux.org||http://mirror.agooga.ru/Linux/sabayonlinux/entropy|
-repository|sabayonlinux.org||http://bali.idrepo.or.id/sabayon/entropy|
-repository|sabayonlinux.org||http://madura.idrepo.or.id/sabayon/entropy|
-repository|sabayonlinux.org||http://sumbawa.idrepo.or.id/sabayon/entropy|
-repository|sabayonlinux.org||http://riksun.riken.go.jp/pub/pub/Linux/sabayon/entropy|
-repository|sabayonlinux.org||http://ftp.sh.cvut.cz/MIRRORS/sabayon/entropy|
-repository|sabayonlinux.org||http://ftp2.cz.freebsd.org/pub/sabayon/entropy|
-repository|sabayonlinux.org||http://debian.mirror.dkm.cz/sabayon/entropy|
-repository|sabayonlinux.org||http://mirror.umoss.org/sabayonlinux/entropy|
-repository|sabayonlinux.org||ftp://ftp.klid.dk/sabayonlinux/entropy|
-repository|sabayonlinux.org||http://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy|
-repository|sabayonlinux.org||ftp://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy|
-repository|sabayonlinux.org||http://mirrors.cs.wmich.edu/sabayon/entropy|
-repository|sabayonlinux.org||http://ftp.surfnet.nl/pub/os/Linux/distr/sabayonlinux/entropy|
-repository|sabayonlinux.org||ftp://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/entropy|
-repository|sabayonlinux.org||http://ftp.cc.uoc.gr/mirrors/linux/SabayonLinux/entropy|
-repository|sabayonlinux.org||http://mirror.dun.nu/sabayonlinux/entropy|
-repository|sabayonlinux.org||http://ftp.rnl.ist.utl.pt/pub/sabayon ftp://ftp.rnl.ist.utl.pt/pub/sabayon|
-repository|sabayonlinux.org||http://mirror.internode.on.net/pub/sabayonlinux/entropy|
-repository|sabayonlinux.org||ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy|
-repository|sabayonlinux.org||http://cross-lfs.sabayonlinux.org/entropy|
-repository|sabayonlinux.org||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
+repository = sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org|http://pkg.sabayon.org,sabayon.org
+repository = sabayonlinux.org||http://mirror.agooga.ru/Linux/sabayonlinux/entropy|
+repository = sabayonlinux.org||http://bali.idrepo.or.id/sabayon/entropy|
+repository = sabayonlinux.org||http://madura.idrepo.or.id/sabayon/entropy|
+repository = sabayonlinux.org||http://sumbawa.idrepo.or.id/sabayon/entropy|
+repository = sabayonlinux.org||http://riksun.riken.go.jp/pub/pub/Linux/sabayon/entropy|
+repository = sabayonlinux.org||http://ftp.sh.cvut.cz/MIRRORS/sabayon/entropy|
+repository = sabayonlinux.org||http://ftp2.cz.freebsd.org/pub/sabayon/entropy|
+repository = sabayonlinux.org||http://debian.mirror.dkm.cz/sabayon/entropy|
+repository = sabayonlinux.org||http://mirror.umoss.org/sabayonlinux/entropy|
+repository = sabayonlinux.org||ftp://ftp.klid.dk/sabayonlinux/entropy|
+repository = sabayonlinux.org||http://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy|
+repository = sabayonlinux.org||ftp://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy|
+repository = sabayonlinux.org||http://mirrors.cs.wmich.edu/sabayon/entropy|
+repository = sabayonlinux.org||http://ftp.surfnet.nl/pub/os/Linux/distr/sabayonlinux/entropy|
+repository = sabayonlinux.org||ftp://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/entropy|
+repository = sabayonlinux.org||http://ftp.cc.uoc.gr/mirrors/linux/SabayonLinux/entropy|
+repository = sabayonlinux.org||http://mirror.dun.nu/sabayonlinux/entropy|
+repository = sabayonlinux.org||http://ftp.rnl.ist.utl.pt/pub/sabayon ftp://ftp.rnl.ist.utl.pt/pub/sabayon|
+repository = sabayonlinux.org||http://mirror.internode.on.net/pub/sabayonlinux/entropy|
+repository = sabayonlinux.org||ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy|
+repository = sabayonlinux.org||http://cross-lfs.sabayonlinux.org/entropy|
+repository = sabayonlinux.org||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
 # NOTE: delta package download support works over rsync://, please find some rsync
 # sources below
-repository|sabayonlinux.org||rsync://mirror.aarnet.edu.au/sabayonlinux/entropy|
-repository|sabayonlinux.org||rsync://gd.tuwien.ac.at/linux/sabayonlinux/entropy|
-repository|sabayonlinux.org||rsync://ftp.nluug.nl/sabayonlinux/entropy|
-repository|sabayonlinux.org||rsync://ftp.SURFnet.nl/sabayonlinux/entropy|
-repository|sabayonlinux.org||rsync://ftp.fsn.hu/ftp/pub/linux/distributions/sabayon/entropy|
-repository|sabayonlinux.org||rsync://ftp.pwsz.elblag.pl/sabayon/entropy|
-repository|sabayonlinux.org||rsync://ftp.pwsz.elblag.pl/sabayon/entropy|
-repository|sabayonlinux.org||rsync://mirror.umoss.org/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://mirror.aarnet.edu.au/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://gd.tuwien.ac.at/linux/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://ftp.nluug.nl/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://ftp.SURFnet.nl/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://ftp.fsn.hu/ftp/pub/linux/distributions/sabayon/entropy|
+repository = sabayonlinux.org||rsync://ftp.pwsz.elblag.pl/sabayon/entropy|
+repository = sabayonlinux.org||rsync://ftp.pwsz.elblag.pl/sabayon/entropy|
+repository = sabayonlinux.org||rsync://mirror.umoss.org/sabayonlinux/entropy|
 
 # Experimental Sabayon repository "sabayon-limbo"
 # Here you can find in-testing packages that will be merged to
 # the mainline repository soon.
 # You can use any mirror listed for "sabayonlinux.org"
-# repository|sabayon-limbo|Sabayon Limbo Testing Repository|http://pkg.sabayon.org|http://pkg.sabayon.org,sabayon.org
-# repository|sabayon-limbo||http://ftp.rnl.ist.utl.pt/pub/sabayon ftp://ftp.rnl.ist.utl.pt/pub/sabayon|
-# repository|sabayon-limbo||http://mirror.internode.on.net/pub/sabayonlinux/entropy|
-# repository|sabayon-limbo||ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy|
-# repository|sabayon-limbo||http://cross-lfs.sabayonlinux.org/entropy|
-# repository|sabayon-limbo||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
+# repository = sabayon-limbo|Sabayon Limbo Testing Repository|http://pkg.sabayon.org|http://pkg.sabayon.org,sabayon.org
+# repository = sabayon-limbo||http://ftp.rnl.ist.utl.pt/pub/sabayon ftp://ftp.rnl.ist.utl.pt/pub/sabayon|
+# repository = sabayon-limbo||http://mirror.internode.on.net/pub/sabayonlinux/entropy|
+# repository = sabayon-limbo||ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy|
+# repository = sabayon-limbo||http://cross-lfs.sabayonlinux.org/entropy|
+# repository = sabayon-limbo||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
 
 
 # syntax for differential-update
@@ -67,7 +67,7 @@ repository|sabayonlinux.org||rsync://mirror.umoss.org/sabayonlinux/entropy|
 #                      are known to cause issues on some networks.
 # Valid parameters: disable, enable, true, false, disabled, enabled
 # Default is: enabled
-# differential-update: enabled
+# differential-update = enabled
 
 # syntax for developer-repo
 #
@@ -75,74 +75,74 @@ repository|sabayonlinux.org||rsync://mirror.umoss.org/sabayonlinux/entropy|
 #                  the whole metadata set (including package ChangeLogs and contents).
 #                  Disabled by default.
 # Valid parameters: disable, enable, true, false, disabled, enabled
-#  developer-repo|disable
+#  developer-repo = disable
 
 #
 #  syntax for product:
 #
 #    product: Sabayon Linux product type (eg. standard, professional, mini)
-#    product|product string (no spaces!)
+#    product = product string (no spaces!)
 #
 #    example:
-#    product|standard
+#    product = standard
 #    or:
-#    product|professional
+#    product = professional
 #
 # Product default setting
-product|standard
+product = standard
 
 #
 #  syntax for branch:
 #
 #    branch: in Sabayon Linux each release has its branch that is the version name (eg. 3.4, 3.5)
-#    branch|actual branch string (no spaces!)
+#    branch = actual branch string (no spaces!)
 #
 #    example:
-#    branch|4
+#    branch = 4
 #    or:
-#    branch|5
+#    branch = 5
 #
 # Branch default setting
-branch|5
+branch = 5
 
 #
 #  syntax for officialrepositoryid:
 #
 #    official-repository-id: Repository identifier for the official main distribution repository
-#    official-repository-id|<repository identifier>
+#    official-repository-id = <repository identifier>
 #
-official-repository-id|sabayonlinux.org
+official-repository-id = sabayonlinux.org
 
 #
 #  syntax for downloadspeedlimit:
 #
 #    download-speed-limit: If you need a way to limit download speed, this is the option you were looking for
-#    download-speed-limit|<maximum allowed speed in kb/sec>
+#    download-speed-limit = <maximum allowed speed in kb/sec>
 #
 #    example:
-#    download-speed-limit|30
+#    download-speed-limit = 30
 #
-# download-speed-limit|
+# download-speed-limit = 
 
 #
 #  syntax for downloadtimeout:
 #
 #    download-timeout: If you are on a slow network, you may want to raise the
 #                     download timeout value (by default, it's set to 10 secs)
-#    download-timeout|<maximum allowed speed in kb/sec>
+#    download-timeout = <maximum allowed speed in kb/sec>
 #
 #    example:
-#    download-timeout|20
+#    download-timeout = 20
 #
-# download-timeout|20
+# download-timeout = 20
 
 #
 #  syntax for security-url:
 #
 #    security-url: Entropy compatible Security Advisories (GLSAs) package URL
-#    security-url|<HTTP/FTP download URL>
+#    security-url = <HTTP/FTP download URL>
 #
 #    example:
 #    securityurl|http://community.sabayon.org/security/security-advisories.tar.bz2
 #
-# security-url|
+# security-url = 
diff --git a/conf/server.conf.example b/conf/server.conf.example
index 44b68d7c0..66161f8f1 100644
--- a/conf/server.conf.example
+++ b/conf/server.conf.example
@@ -2,16 +2,16 @@
 
 #
 # Packages expiration days:
-# expiration-days|<number>
+# expiration-days = <number>
 #
 #
 # Number of days after a binary package will be removed from its belonging
 # repository if not available anymore (old files)
 #
 #   example:
-#   expiration-days|15
+#   expiration-days = 15
 #
-# expiration-days|<internal value>
+# expiration-days = <internal value>
 
 
 #
@@ -20,16 +20,16 @@
 #    default-repository: Currently working repository identifier (if you have
 #        more than one server-side repository, this indicates the one which
 #        Entropy Server is authorized to work on)
-#    default-repository|<repository identifier>
+#    default-repository = <repository identifier>
 #
-default-repository|sabayonlinux.org
+default-repository = sabayonlinux.org
 
 #
 #  syntax for repository:
 #
 #    repository: server-side repositories configuration
 #    Currently supported upload URI protocols are ftp:// and ssh://
-#      => repository|<repository_id>|<repository description>|<upload URI 1> <2>[|<EAPI3 remote server hostname>#<service port>,<ssl service port>]
+#      => repository = <repository_id>|<repository description>|<upload URI 1> <2>[|<EAPI3 remote server hostname>#<service port>,<ssl service port>]
 #    (EAPI3 part is optional)
 #
 #    PLEASE NOTE: the first repository listed is going to be considered the
@@ -39,25 +39,25 @@ default-repository|sabayonlinux.org
 #    (for repository only)
 #
 #    example:
-#      => repository|myserverrepo|My Server Repository|ftp://user:pass@111.111.111.111/ ssh://username@host:~user/path:port|hostname.tld#1026,1027
+#      => repository = myserverrepo|My Server Repository|ftp://user:pass@111.111.111.111/ ssh://username@host:~user/path:port|hostname.tld#1026,1027
 #
-# repository|
+# repository = 
 
 # Database format used by EAPI1 packages:
 # bz2 or gz
-database-format|bz2
+database-format = bz2
 
 #
 #  syntax for syncspeedlimit:
 #
 #    sync-speed-limit: If you need a way to limit sync speed (upload/download),
 #                    this is the option you were looking for
-#    sync-speed-limit|<maximum allowed speed in kb/sec>
+#    sync-speed-limit = <maximum allowed speed in kb/sec>
 #
 #    example:
-#    sync-speed-limit|30
+#    sync-speed-limit = 30
 #
-# sync-speed-limit|
+# sync-speed-limit = 
 
 # Server side LC_*, LANG, LANGUAGE default settings.
 # This setting is used by entropy.qa to validate packages and avoid weird
@@ -66,7 +66,7 @@ database-format|bz2
 # for extra stuff like @UTF-8. If you fail to do so and your L* value differs
 # from the one here, Entropy will bitch you at QA checks and uploading packages
 # will be impossible. You can concatenate (space separated) more than one value.
-# server-basic-languages|en_US C
+# server-basic-languages = en_US C
 
 # Disabled EAPIs (comma separated).
 # By default, all current EAPI implementations are supported (1, 2, 3).
@@ -81,7 +81,7 @@ database-format|bz2
 # to keep EAPI1, make sure to remove "unmaintained" files from your remote mirror.
 # A fast way to achieve this is removing the whole remote database dir and re-upload
 # everything (backup first!).
-# disabled-eapis|1,2
+# disabled-eapis = 1,2
 
 # WARNING: E X P E R I M E N T A L
 # Automatic multiple packages support through expiration.
@@ -95,7 +95,7 @@ database-format|bz2
 # ATTENTION !!!: still, there is one unsolved "bad behaviour" for now.
 # Due to the nature of OSS libraries (breaking API/ABI every odd day),
 # YOU are responsible of potential older packages inconsistencies due to this.
-# expiration-based-scope|disable
+# expiration-based-scope = disable
 
 # WARNING: P L E A S E   R E A D   T H I S   F I R S T
 # Enable support for packages -nonfree directory split. It uses the Entropy
@@ -105,47 +105,47 @@ database-format|bz2
 # It is actually disabled by default because older Entropy client versions
 # have troubles determining the correct storage directory and it's been fixed
 # since Entropy 0.99.30.
-# nonfree-packages-directory-support|disable
+# nonfree-packages-directory-support = disable
 
 # Online RSS support to track changes of the things happened on the database.
 # Here are basic settings, like the ability to enable/disable this feature or
 # set the name of the feed.
-# Feed will be uploaded on the same packages.db.[bz2|gz] directory
+# Feed will be uploaded on the same packages.db.[bz2 | gz] directory
 #
 # syntax for rss-feed:
-#    rss-feed|<enable/disable>
+#    rss-feed = <enable/disable>
 #
-rss-feed|enable
+rss-feed = enable
 
 # syntax for rss-name:
-#    rss-name|<name.rss>
+#    rss-name = <name.rss>
 #
-rss-name|packages.rss
+rss-name = packages.rss
 
 # This option allows to specify a base URL for the <guid> and <link> RSS entry.
 # If you have the entropy web portal online, just add its path to index.py which
 # will be wrapped to add ?search=...
 # syntax for rss-base-url:
-#    rss-base-url|<URL>
+#    rss-base-url = <URL>
 #
-rss-base-url|http://pkg.sabayon.org/
+rss-base-url = http://pkg.sabayon.org/
 # This is just the website url that will be added to the RSS
-rss-website-url|http://www.sabayon.org/
+rss-website-url = http://www.sabayon.org/
 
 # Maximum RSS entries, oldest will be dropped
 # syntax for max-rss-entries:
-#    max-rss-entries|<number>
+#    max-rss-entries = <number>
 #
-max-rss-entries|10000
+max-rss-entries = 10000
 
 # Maximum RSS entries for the light version, oldest will be dropped
 # syntax for max-rss-light-entries:
-#    max-rss-light-entries|<number>
+#    max-rss-light-entries = <number>
 #
-# max-rss-light-entries|100
+# max-rss-light-entries = 100
 
 # RSS Editor E-mail (corresponding to managingEditor tag)
 # syntax for max-rss-entries:
-#    managing-editor|<email>
+#    managing-editor = <email>
 #
-managing-editor|
+managing-editor = 
diff --git a/conf/socket.conf b/conf/socket.conf
index 134ae99ae..be1405540 100644
--- a/conf/socket.conf
+++ b/conf/socket.conf
@@ -7,74 +7,74 @@
 
 #
 # Listening address:
-# listen|<valid IP address or hostname>
+# listen = <valid IP address or hostname>
 #
 #   example (default):
-#   listen|localhost
+#   listen = localhost
 #   use * to allow the interface to listen on any interface/address
 #
-# listen|localhost
+# listen = localhost
 #
 # Listening port (non-SSL server instances):
-# listen-port|<valid port, from 1-65535>
+# listen-port = <valid port, from 1-65535>
 #
 #   example (default):
-#   listen-port|999
+#   listen-port = 999
 #
-# listen-port|999
+# listen-port = 999
 #
 # Listening timeout:
-# listen-timeout|<valid timeout, in seconds>
+# listen-timeout = <valid timeout, in seconds>
 #
 #   example (default):
-#   listen-timeout|30
+#   listen-timeout = 30
 #
-# listen-timeout|30
+# listen-timeout = 30
 #
 # Listening threads:
-# listen-threads|<number of listening threads>
+# listen-threads = <number of listening threads>
 #
 #   example (default):
-#   listen-threads|5
+#   listen-threads = 5
 #
-# listen-threads|5
+# listen-threads = 5
 #
 # Sessions TTL:
-# session-ttl|<number of seconds>
+# session-ttl = <number of seconds>
 #
 #   example (default):
-#   session-ttl|120
+#   session-ttl = 120
 #
-# session-ttl|120
+# session-ttl = 120
 #
 # Maximum number of simulaneous connections:
-# max-connections|<number of connections>
+# max-connections = <number of connections>
 #
 #   example (default):
-#   max-connections|5
+#   max-connections = 5
 #
-# max-connections|5
+# max-connections = 5
 #
 # SSL port (when using SSL):
-# ssl-port|<valid port, from 1-65535>
+# ssl-port = <valid port, from 1-65535>
 #
 #   example (default):
-#   ssl-port|998
+#   ssl-port = 998
 #
-# ssl-port|998
+# ssl-port = 998
 #
 # Disabled commands (space separated):
-# disabled-commands|<existing_command_1 existing_command_2 existing_command_3>
+# disabled-commands = <existing_command_1 existing_command_2 existing_command_3>
 #
 #   example:
-#   disabled-commands|existing_command_1 existing_command_2
+#   disabled-commands = existing_command_1 existing_command_2
 #
-# disabled-commands|
+# disabled-commands = 
 #
 # Blacklisted IPs (space separated):
-# ip-blacklist|<ip1 ip2 ip3>
+# ip-blacklist = <ip1 ip2 ip3>
 #
 #   example:
-#   ip-blacklist|123.123.123.123 111.111.111.111
+#   ip-blacklist = 123.123.123.123 111.111.111.111
 #
-# ip-blacklist|
+# ip-blacklist =