diff --git a/._cfg0000_DIR_COLORS b/._cfg0000_DIR_COLORS
deleted file mode 100644
index 89c085d..0000000
--- a/._cfg0000_DIR_COLORS
+++ /dev/null
@@ -1,243 +0,0 @@
-# Configuration file for dircolors, a utility to help you set the
-# LS_COLORS environment variable used by GNU ls with the --color option.
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-# Copying and distribution of this file, with or without modification,
-# are permitted provided the copyright notice and this notice are preserved.
-
-# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
-# slackware version of dircolors) are recognized but ignored.
-
-# You can copy this file to .dir_colors in your $HOME directory to override
-# the system defaults.
-
-# Below, there should be one TERM entry for each termtype that is colorizable
-TERM Eterm
-TERM ansi
-TERM color-xterm
-TERM con132x25
-TERM con132x30
-TERM con132x43
-TERM con132x60
-TERM con80x25
-TERM con80x28
-TERM con80x30
-TERM con80x43
-TERM con80x50
-TERM con80x60
-TERM cons25
-TERM console
-TERM cygwin
-TERM dtterm
-TERM eterm-color
-TERM gnome
-TERM gnome-256color
-TERM hurd
-TERM jfbterm
-TERM konsole
-TERM kterm
-TERM linux
-TERM linux-c
-TERM mach-color
-TERM mach-gnu-color
-TERM mlterm
-TERM putty
-TERM putty-256color
-TERM rxvt
-TERM rxvt-256color
-TERM rxvt-cygwin
-TERM rxvt-cygwin-native
-TERM rxvt-unicode
-TERM rxvt-unicode-256color
-TERM rxvt-unicode256
-TERM screen
-TERM screen-256color
-TERM screen-256color-bce
-TERM screen-bce
-TERM screen-w
-TERM screen.Eterm
-TERM screen.rxvt
-TERM screen.linux
-TERM st
-TERM st-256color
-TERM terminator
-TERM vt100
-TERM xterm
-TERM xterm-16color
-TERM xterm-256color
-TERM xterm-88color
-TERM xterm-color
-TERM xterm-debian
-
-# Below are the color init strings for the basic file types. A color init
-# string consists of one or more of the following numeric codes:
-# Attribute codes:
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-# Text color codes:
-# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-# Background color codes:
-# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-#NORMAL 00	# no color code at all
-#FILE 00	# regular file: use no color at all
-RESET 0		# reset to "normal" color
-DIR 01;34	# directory
-LINK 01;36	# symbolic link.  (If you set this to 'target' instead of a
-                # numerical value, the color is as for the file pointed to.)
-MULTIHARDLINK 00	# regular file with more than one link
-FIFO 40;33	# pipe
-SOCK 01;35	# socket
-DOOR 01;35	# door
-BLK 40;33;01	# block device driver
-CHR 40;33;01	# character device driver
-ORPHAN 01;05;37;41  # orphaned syminks
-MISSING 01;05;37;41 # ... and the files they point to
-SETUID 37;41	# file that is setuid (u+s)
-SETGID 30;43	# file that is setgid (g+s)
-CAPABILITY 30;41	# file with capability
-STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
-OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
-STICKY 37;44	# dir with the sticky bit set (+t) and not other-writable
-
-# This is for files with execute permission:
-EXEC 01;32
-
-# List any file extensions like '.gz' or '.tar' that you would like ls
-# to colorize below. Put the extension, a space, and the color init string.
-# (and any comments you want to add after a '#')
-
-# If you use DOS-style suffixes, you may want to uncomment the following:
-#.cmd 01;32 # executables (bright green)
-#.exe 01;32
-#.com 01;32
-#.btm 01;32
-#.bat 01;32
-# Or if you want to colorize scripts even if they do not have the
-# executable bit actually set.
-#.sh  01;32
-#.csh 01;32
-
- # archives or compressed (bright red)
-.tar 01;31
-.tgz 01;31
-.arc 01;31
-.arj 01;31
-.taz 01;31
-.lha 01;31
-.lz4 01;31
-.lzh 01;31
-.lzma 01;31
-.tlz 01;31
-.txz 01;31
-.tzo 01;31
-.t7z 01;31
-.zip 01;31
-.z   01;31
-.Z   01;31
-.dz  01;31
-.gz  01;31
-.lrz 01;31
-.lz  01;31
-.lzo 01;31
-.xz  01;31
-.bz2 01;31
-.bz  01;31
-.tbz 01;31
-.tbz2 01;31
-.tz  01;31
-.deb 01;31
-.rpm 01;31
-.jar 01;31
-.war 01;31
-.ear 01;31
-.sar 01;31
-.rar 01;31
-.alz 01;31
-.ace 01;31
-.zoo 01;31
-.cpio 01;31
-.7z  01;31
-.rz  01;31
-.cab 01;31
-
-# image formats
-.jpg 01;35
-.jpeg 01;35
-.gif 01;35
-.bmp 01;35
-.pbm 01;35
-.pgm 01;35
-.ppm 01;35
-.tga 01;35
-.xbm 01;35
-.xpm 01;35
-.tif 01;35
-.tiff 01;35
-.png 01;35
-.svg 01;35
-.svgz 01;35
-.mng 01;35
-.pcx 01;35
-.mov 01;35
-.mpg 01;35
-.mpeg 01;35
-.m2v 01;35
-.mkv 01;35
-.webm 01;35
-.ogm 01;35
-.mp4 01;35
-.m4v 01;35
-.mp4v 01;35
-.vob 01;35
-.qt  01;35
-.nuv 01;35
-.wmv 01;35
-.asf 01;35
-.rm  01;35
-.rmvb 01;35
-.flc 01;35
-.avi 01;35
-.fli 01;35
-.flv 01;35
-.gl 01;35
-.dl 01;35
-.xcf 01;35
-.xwd 01;35
-.yuv 01;35
-.cgm 01;35
-.emf 01;35
-
-# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 01;35
-.anx 01;35
-.ogv 01;35
-.ogx 01;35
-
-# Document files
-.pdf 00;32
-.ps 00;32
-.txt 00;32
-.patch 00;32
-.diff 00;32
-.log 00;32
-.tex 00;32
-.doc 00;32
-
-# audio formats
-.aac 00;36
-.au 00;36
-.flac 00;36
-.m4a 00;36
-.mid 00;36
-.midi 00;36
-.mka 00;36
-.mp3 00;36
-.mpc 00;36
-.ogg 00;36
-.ra 00;36
-.wav 00;36
-
-# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 00;36
-.oga 00;36
-.spx 00;36
-.xspf 00;36
diff --git a/._cfg0000_mke2fs.conf b/._cfg0000_mke2fs.conf
deleted file mode 100644
index 47f59cc..0000000
--- a/._cfg0000_mke2fs.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-[defaults]
-	base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr
-	default_mntopts = acl,user_xattr
-	enable_periodic_fsck = 0
-	blocksize = 4096
-	inode_size = 256
-	inode_ratio = 16384
-
-[fs_types]
-	ext3 = {
-		features = has_journal
-	}
-	ext4 = {
-		features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
-		auto_64-bit_support = 1
-		inode_size = 256
-	}
-	ext4dev = {
-		features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
-		inode_size = 256
-		options = test_fs=1
-	}
-	small = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 4096
-	}
-	floppy = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 8192
-	}
-	big = {
-		inode_ratio = 32768
-	}
-	huge = {
-		inode_ratio = 65536
-	}
-	news = {
-		inode_ratio = 4096
-	}
-	largefile = {
-		inode_ratio = 1048576
-		blocksize = -1
-	}
-	largefile4 = {
-		inode_ratio = 4194304
-		blocksize = -1
-	}
-	hurd = {
-	     blocksize = 4096
-	     inode_size = 128
-	}
diff --git a/._cfg0000_tox-bootstrapd.conf b/._cfg0000_tox-bootstrapd.conf
deleted file mode 100644
index 3413f59..0000000
--- a/._cfg0000_tox-bootstrapd.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-// Tox DHT bootstrap daemon configuration file.
-
-// Listening port (UDP).
-port = 33445
-
-// A key file is like a password, so keep it where no one can read it.
-// If there is no key file, a new one will be generated.
-// The daemon should have permission to read/write it.
-keys_file_path = "/var/lib/tox-bootstrapd/keys"
-
-// The PID file written to by the daemon.
-// Make sure that the user that daemon runs as has permissions to write to the
-// PID file.
-pid_file_path = "/var/run/tox-bootstrapd/tox-bootstrapd.pid"
-
-// Enable IPv6.
-enable_ipv6 = true
-
-// Fallback to IPv4 in case IPv6 fails.
-enable_ipv4_fallback = true
-
-// Automatically bootstrap with nodes on local area network.
-enable_lan_discovery = true
-
-enable_tcp_relay = true
-
-// While Tox uses 33445 port by default, 443 (https) and 3389 (rdp) ports are very
-// common among nodes, so it's encouraged to keep them in place.
-tcp_relay_ports = [443, 3389, 33445]
-
-// Reply to MOTD (Message Of The Day) requests.
-enable_motd = true
-
-// Just a message that is sent when someone requests MOTD.
-// Put anything you want, but note that it will be trimmed to fit into 255 bytes.
-motd = "tox-bootstrapd"
-
-// Any number of nodes the daemon will bootstrap itself off.
-//
-// Remember to replace the provided example with your own node list.
-// There is a maintained list of bootstrap nodes on Tox's wiki, if you need it
-// (https://wiki.tox.chat/users/nodes).
-//
-// You may leave the list empty or remove "bootstrap_nodes" completely,
-// in both cases this will be interpreted as if you don't want to bootstrap
-// from anyone.
-//
-// address = any IPv4 or IPv6 address and also any US-ASCII domain name.
-bootstrap_nodes = (
-  { // Example Node 1 (IPv4)
-    address = "127.0.0.1"
-    port = 33445
-    public_key = "728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854"
-  },
-  { // Example Node 2 (IPv6)
-    address = "::1/128"
-    port = 33445
-    public_key = "3E78BACF0F84235B30054B54898F56793E1DEF8BD46B1038B9D822E8460FAB67"
-  },
-  { // Example Node 3 (US-ASCII domain name)
-    address = "example.org"
-    port = 33445
-    public_key = "8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858"
-  }
-)
diff --git a/DIR_COLORS b/DIR_COLORS
index de64a03..89c085d 100644
--- a/DIR_COLORS
+++ b/DIR_COLORS
@@ -1,7 +1,7 @@
 # Configuration file for dircolors, a utility to help you set the
 # LS_COLORS environment variable used by GNU ls with the --color option.
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Copying and distribution of this file, with or without modification,
 # are permitted provided the copyright notice and this notice are preserved.
 
@@ -32,14 +32,17 @@ TERM dtterm
 TERM eterm-color
 TERM gnome
 TERM gnome-256color
+TERM hurd
 TERM jfbterm
 TERM konsole
 TERM kterm
 TERM linux
 TERM linux-c
 TERM mach-color
+TERM mach-gnu-color
 TERM mlterm
 TERM putty
+TERM putty-256color
 TERM rxvt
 TERM rxvt-256color
 TERM rxvt-cygwin
@@ -116,18 +119,25 @@ EXEC 01;32
  # archives or compressed (bright red)
 .tar 01;31
 .tgz 01;31
+.arc 01;31
 .arj 01;31
 .taz 01;31
+.lha 01;31
+.lz4 01;31
 .lzh 01;31
 .lzma 01;31
 .tlz 01;31
 .txz 01;31
+.tzo 01;31
+.t7z 01;31
 .zip 01;31
 .z   01;31
 .Z   01;31
 .dz  01;31
 .gz  01;31
+.lrz 01;31
 .lz  01;31
+.lzo 01;31
 .xz  01;31
 .bz2 01;31
 .bz  01;31
@@ -141,11 +151,13 @@ EXEC 01;32
 .ear 01;31
 .sar 01;31
 .rar 01;31
+.alz 01;31
 .ace 01;31
 .zoo 01;31
 .cpio 01;31
 .7z  01;31
 .rz  01;31
+.cab 01;31
 
 # image formats
 .jpg 01;35
@@ -214,6 +226,7 @@ EXEC 01;32
 .aac 00;36
 .au 00;36
 .flac 00;36
+.m4a 00;36
 .mid 00;36
 .midi 00;36
 .mka 00;36
diff --git a/conf.d/._cfg0000_git-daemon b/conf.d/._cfg0000_git-daemon
deleted file mode 100644
index 69b209f..0000000
--- a/conf.d/._cfg0000_git-daemon
+++ /dev/null
@@ -1,19 +0,0 @@
-# conf.d file for git-daemon
-#
-# Please check man 1 git-daemon for more information about the options
-# git-daemon accepts. You MUST edit this to include your repositories you wish
-# to serve.
-#
-# Some of the meaningful options are:
-#   --syslog      --- Enables syslog logging
-#   --verbose     --- Enables verbose logging
-#   --export-all  --- Exports all repositories
-#   --port=XXXX   --- Starts in port XXXX instead of 9418
-#
-GITDAEMON_OPTS="--syslog --base-path=/var/git"
-
-# To run an anonymous git safely, the following user should be able to only
-# read your Git repositories. It should not be able to write to anywhere on
-# your system, esp. not the repositories.
-GIT_USER="nobody"
-GIT_GROUP="nobody"
diff --git a/conf.d/._cfg0000_tox-dht-daemon b/conf.d/._cfg0000_tox-dht-daemon
deleted file mode 100644
index 33f850b..0000000
--- a/conf.d/._cfg0000_tox-dht-daemon
+++ /dev/null
@@ -1,2 +0,0 @@
-TOX_GROUP=tox
-TOX_USER=tox
diff --git a/conf.d/git-daemon b/conf.d/git-daemon
index db77de5..69b209f 100644
--- a/conf.d/git-daemon
+++ b/conf.d/git-daemon
@@ -13,7 +13,7 @@
 GITDAEMON_OPTS="--syslog --base-path=/var/git"
 
 # To run an anonymous git safely, the following user should be able to only
-# read your Git repositories. It should not able able to write to anywhere on
+# read your Git repositories. It should not be able to write to anywhere on
 # your system, esp. not the repositories.
 GIT_USER="nobody"
 GIT_GROUP="nobody"
diff --git a/conf.d/tox-dht-daemon b/conf.d/tox-dht-daemon
index e4aac3a..33f850b 100644
--- a/conf.d/tox-dht-daemon
+++ b/conf.d/tox-dht-daemon
@@ -1,7 +1,2 @@
-# [--ipv4|--ipv6]
-cmdline=""
-
-# open node
-ip=""
-port=""
-key=""
+TOX_GROUP=tox
+TOX_USER=tox
diff --git a/mke2fs.conf b/mke2fs.conf
index 0871f77..47f59cc 100644
--- a/mke2fs.conf
+++ b/mke2fs.conf
@@ -1,5 +1,5 @@
 [defaults]
-	base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
+	base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr
 	default_mntopts = acl,user_xattr
 	enable_periodic_fsck = 0
 	blocksize = 4096
diff --git a/security/._cfg0000_limits.conf b/security/._cfg0000_limits.conf
deleted file mode 100644
index be621a7..0000000
--- a/security/._cfg0000_limits.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# /etc/security/limits.conf
-#
-#Each line describes a limit for a user in the form:
-#
-#<domain>        <type>  <item>  <value>
-#
-#Where:
-#<domain> can be:
-#        - a user name
-#        - a group name, with @group syntax
-#        - the wildcard *, for default entry
-#        - the wildcard %, can be also used with %group syntax,
-#                 for maxlogin limit
-#
-#<type> can have the two values:
-#        - "soft" for enforcing the soft limits
-#        - "hard" for enforcing hard limits
-#
-#<item> can be one of the following:
-#        - core - limits the core file size (KB)
-#        - data - max data size (KB)
-#        - fsize - maximum filesize (KB)
-#        - memlock - max locked-in-memory address space (KB)
-#        - nofile - max number of open file descriptors
-#        - rss - max resident set size (KB)
-#        - stack - max stack size (KB)
-#        - cpu - max CPU time (MIN)
-#        - nproc - max number of processes
-#        - as - address space limit (KB)
-#        - maxlogins - max number of logins for this user
-#        - maxsyslogins - max number of logins on the system
-#        - priority - the priority to run user process with
-#        - locks - max number of file locks the user can hold
-#        - sigpending - max number of pending signals
-#        - msgqueue - max memory used by POSIX message queues (bytes)
-#        - nice - max nice priority allowed to raise to values: [-20, 19]
-#        - rtprio - max realtime priority
-#
-#<domain>      <type>  <item>         <value>
-#
-
-#*               soft    core            0
-#*               hard    rss             10000
-#@student        hard    nproc           20
-#@faculty        soft    nproc           20
-#@faculty        hard    nproc           50
-#ftp             hard    nproc           0
-#@student        -       maxlogins       4
-
-# End of file
diff --git a/security/._cfg0000_namespace.init b/security/._cfg0000_namespace.init
deleted file mode 100755
index 67d4aa2..0000000
--- a/security/._cfg0000_namespace.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# It receives polydir path as $1, the instance path as $2,
-# a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
-# and user name in $4.
-#
-# The following section will copy the contents of /etc/skel if this is a
-# newly created home directory.
-if [ "$3" = 1 ]; then
-        # This line will fix the labeling on all newly created directories
-        [ -x /sbin/restorecon ] && /sbin/restorecon "$1"
-        user="$4"
-        passwd=$(getent passwd "$user")
-        homedir=$(echo "$passwd" | cut -f6 -d":")
-        if [ "$1" = "$homedir" ]; then
-                gid=$(echo "$passwd" | cut -f4 -d":")
-                cp -rT /etc/skel "$homedir"
-                chown -R "$user":"$gid" "$homedir"
-                mask=$(awk '/^UMASK/{gsub("#.*$", "", $2); print $2; exit}' /etc/login.defs)
-                mode=$(printf "%o" $((0777 & ~$mask)))
-                chmod ${mode:-700} "$homedir"
-                [ -x /sbin/restorecon ] && /sbin/restorecon -R "$homedir"
-        fi
-fi
-
-exit 0
diff --git a/security/limits.conf b/security/limits.conf
index fd66ab7..be621a7 100644
--- a/security/limits.conf
+++ b/security/limits.conf
@@ -21,7 +21,7 @@
 #        - data - max data size (KB)
 #        - fsize - maximum filesize (KB)
 #        - memlock - max locked-in-memory address space (KB)
-#        - nofile - max number of open files
+#        - nofile - max number of open file descriptors
 #        - rss - max resident set size (KB)
 #        - stack - max stack size (KB)
 #        - cpu - max CPU time (MIN)
diff --git a/security/namespace.init b/security/namespace.init
index 9ab5806..67d4aa2 100755
--- a/security/namespace.init
+++ b/security/namespace.init
@@ -1,4 +1,4 @@
-#!/bin/sh -p
+#!/bin/sh
 # It receives polydir path as $1, the instance path as $2,
 # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
 # and user name in $4.
diff --git a/texmf/dvipdfmx.d/._cfg0000_dvipdfmx.cfg b/texmf/dvipdfmx.d/._cfg0000_dvipdfmx.cfg
deleted file mode 100644
index 490de00..0000000
--- a/texmf/dvipdfmx.d/._cfg0000_dvipdfmx.cfg
+++ /dev/null
@@ -1,226 +0,0 @@
-%% dvipdfmx.cfg for dvipdfmx and xdvipdfmx.  (Public domain.)
-%%
-%% PDF Version Setting
-%%
-%% PDF (minor) version stamp to use in output file.
-%% This also implies maximal version of PDF file allowed to be included.
-%% Dvipdfmx does not support 1.0, 1.1, 1.2 since TrueType font embedded
-%% as CIDFontType2 requires at least version 1.3. Transparent imaging
-%% model requires version 1.4. So if you want soft-masking support for
-%% PNG image with alpha channels, you should set version to 4 or higher.
-%% PDF 1.5 enables object compression.
-
-V  5
-
-%% Dvipdfmx Compatibility Flags
-%%
-%%   0x0002  Use semi-transparent filling for tpic shading command,
-%%           instead of opaque gray color. (requires PDF 1.4)
-%%   0x0004  Treat all CIDFont as fixed-pitch font.
-%%           This is only for backward compatibility. Don't use that.
-%%   0x0008  Do not replace duplicate fontmap entries.
-%%           Dvipdfm's (not 'x') behaviour.
-%%   0x0010  Do not optimize PDF destinations. Use this if you want to
-%%           refer from other files to destinations in the current file.
-
-%C  0x0000
-
-%% PDF Document Settings
-%%
-%% Papersize Option:
-%%
-%%   p papersize-spec
-%%
-%% papersize-spec is 'paper-format' or length-pair, e.g., 'a4', 'letter',
-%% '20cm,30cm'. Recognized unit is 'cm', 'mm', 'bp', 'pt', 'in'.
-
-p  a4
-
-%% Annotation Box Margin:
-%%
-%%   g length
-%%
-%% Add margin to annotation rectangle created via various \specials. Many
-%% TeX macro packages set the annotation bounding box equal to the TeX box
-%% that encloses the material. That's not always what you want.
-%% Annotations created by pdf:bannot/pdf:eannot is also affected.
-
-%g  0
-
-%% Bookmark Open Level:
-%%
-%%   O integer
-%%
-%% Mark bookmark (outline) item as initial state 'open' if the depth
-%% of that item (from root node) is less than or equal to the integer
-%% specified with this option.
-
-O  0
-
-%% PDF Security (Encryption) Setting
-%%
-%% Those options won't take effects unless you use flag 'S'.
-%%
-%% Key bits for PDF encryption (40 - 128)
-
-K  40
-
-%% Permission flag for PDF encryption: Revision will be 3 if the key size
-%% is greater than 40 bits.
-%%
-%% 0x0004 (Revision 2) Print the document.
-%%        (Revision 3) Print the document (possibly not at the highest quality
-%%        level, depending on whether bit 12[0x0800] is also set).
-%% 0x0008 Modify the contents of the document by operations other than those
-%%        controlled by bits 6[0x0020], 9[0x0100], and 11[0x0400].
-%% 0x0010 (Revision 2) Copy or otherwise extract text and graphics from the
-%%        document, including extracting text and graphics (in support of
-%%        accessibility to disabled users or for other purposes).
-%%        (Revision 3) Copy or otherwise extract text and grphics from the
-%%        document by operations other than that controlled by bit 10[0x0200].
-%% 0x0020 Add or modify text annotations, fill in interactive form fields,
-%%        and, if bit 4[0x0008] is also set, create or modify interactive
-%%        form fields (including signature fields).
-%%
-%% (Revision 3 only)
-%% 0x0100 Fill in existing interactive form fields (including signature
-%%        fields), even if bit 6 is clear.
-%% 0x0200 Extract text and graphics (in support of accessibility to disabled
-%%        users or for other purposes).
-%% 0x0400 Assemble the document (insert, rotate, or delete pages and create
-%%        bookmarks or thumbnail images), even if bit 4 is clear.
-%% 0x0800 Print the document to a representation from which a faithful digital
-%%        copy of the PDF content could be generated. When this bit is clear
-%%        (and bit 3 is set), printing is limited to a low-level representation
-%%        of the appearance, possibly of degraded quality.
-
-P  0x003C
-
-%% Image Handler
-%%
-%% With 'D' option dvipdfmx may invoke shell command via system()
-%% function call.
-%%
-%% Command-line template for a-to-b conversion:
-%%
-%% Supported target format ('b') is currently PDF.
-%% Percent sign '%' is special character:
-%%
-%%   %i  Input file name (FQPN). Name of file to be converted to PDF.
-%%   %o  Output file name (FQPN). Temporary file to store conversion
-%%       result. Removed after inclusion is finished. (regardless of
-%%       success or failure)
-%%   %b  The "base" name of the input file, e.g., "foo" instead of
-%%       "foo.eps".
-%%   %v  The PDF version to be converted to, e.g. "1.4" for PDF 1.4.
-%%   %%  Replaced with single '%'.
-
-%% Ghostscript (PS-to-PDF and PDF-to-PDF):
-%%
-%% ps2pdf is a front-end to gs. For a complete list of options, see
-%% http://ghostscript.com/doc/current/Ps2pdf.htm#Options
-%%
-%% In TeX Live, we use the rungs wrapper instead of ps2pdf, becuse we
-%% must omit the -dSAFER which ps2pdf specifies: in order for pstricks
-%% to work with xetex,
-%% /usr/local/texlive/*/texmf-dist/dvips/pstricks/pstricks.pro (for
-%% example) needs to be accessed.  Also, it is better to use our
-%% supplied gs on Windows.
-%% 
-%% Without the -dEPSCROP below, an eps file with negative llx/lly (as
-%% created by MetaPost, for example) fails.  In 2013, changes were made
-%% to the drivers xetex.def, dvipdfmx.def, etc., to handle non-zero
-%% llx/lly so we could use it.  The file epsf-dvipdfmx.tex is available
-%% from CTAN/TL/etc. to support plain's epsf.tex.
-%% 
-%% In 2014, we discovered that -sPAPERSIZE=a0 was needed to support
-%% pstricks under xetex; otherwise, images were cropped (see thread at
-%% http://tug.org/pipermail/xetex/2014-November/025664.html).
-%% Happily, it seems that using both -dEPSCROP and -sPAPERSIZE=a0
-%% simultaneously works ok.  So that's we do below.
-%% 
-%% By default, gs encodes all images contained in a PS file using
-%% the lossy DCT (i.e., JPEG) filter. This often leads to inferior
-%% result (see the discussion at http://electron.mit.edu/~gsteele/pdf/).
-%% The "-dAutoFilterXXXImages" and "-dXXXImageFilter" options used
-%% below force all images to be encoded with the lossless Flate (zlib,
-%% same as PNG) filter. Note that if the PS file already contains DCT
-%% encoded images (which is possible in PS level 2), then these images
-%% will also be re-encoded using Flate. To turn the conversion off,
-%% simply remove the options mentioned above.
-%% 
-%% Incidentally, especially in TL, more than one dvipdfmx.cfg may be
-%% extant.  You can find the one that is active by running:
-%% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg
-%% and control which one is found by setting DVIPDFMXINPUTS.
-%%
-D  "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
-
-% other random ps converters people have experimented with.
-%D "/usr/local/bin/ps2pdf -dEPSCrop '%i' '%o'"
-%D "/usr/texbin/epstopdf '%i' -o '%o'"
-%D "/usr/bin/pstopdf '%i' -o '%o'"
-%
-%% Frank Siegert's PStill:
-%D  "/usr/local/bin/pstill -c -o '%o' '%i'"
-%
-%% Batik + Fop (SVG-to-PDF):
-%% If you want both PS and SVG, you need to write a script or program
-%% that selectively invokes converters.
-%D  "java -classpath classpaths -jar /path/to/batik-rasterizer.jar -m application/pdf -d '%o' '%i'"
-%
-%% There are no way to directly know suggested size of (raster) images.
-%% You may want to use %b here, since you can try reading the ebb file
-%% to see what is natural (physical) size of images. 
-%D  "ras2pdf -r 300x300 -b '%b.bb' -o '%o' '%i'"
-%
-%% ImageMagick:
-%% Easiest way to support various file formats.
-%D  "convert '%i' 'epdf:%o'"
-
-%% Other Options
-%%
-%% DPI for PK font creation
-
-%r  600
-
-%% Set number of fractional digit kept for various numbers in PDF page
-%% content output. By setting this to 2 (default), dvipdfmx rounds
-%% real numbers at 2nd fractional (decimal) digit; e.g., "3.14159" is
-%% written as "3.14". Increasing this to more than 2 isn't meaningful
-%% for old Acrobat due to implementation limit of Acrobat.
-%% Length 0.01 in unscaled coordinate system amount to width of 1 pixel
-%% in 7200ppi display. 
-
-%d  5
-
-%% Image cache life in hours
-%%  0 means erase all old images and leave new images
-%% -1 means erase all old images and also erase new images
-%% -2 means ignore image cache
-%I -2
-
-%% Font Map Files
-%%
-%% teTeX 2.x and TeX Live using updmap (pdfTeX format)
-f  pdftex.map
-
-%% teTeX 2.x and TeX Live using updmap (DVIPDFM format)
-%f dvipdfm.map
-
-%% teTeX 2.x and TeX Live using updmap (DVIPS format)
-%% MiKTeX 2.2 and 2.3
-%f psfonts.map
-
-%% Put additional fontmap files here (usually for Type0 fonts)
-%f  cid-x.map
-
-% the following file is generated by updmap(-sys) from the 
-% KanjiMap entries in the updmap.cfg file.
-f kanjix.map
-% minimal example for Chinese and Korean users
-% improvements please to tex-live@tug.org
-f ckx.map
-
-%% Include other config files
-%i <filename>
diff --git a/texmf/dvipdfmx.d/dvipdfmx.cfg b/texmf/dvipdfmx.d/dvipdfmx.cfg
index 1832f5a..490de00 100644
--- a/texmf/dvipdfmx.d/dvipdfmx.cfg
+++ b/texmf/dvipdfmx.d/dvipdfmx.cfg
@@ -120,6 +120,25 @@ P  0x003C
 %% ps2pdf is a front-end to gs. For a complete list of options, see
 %% http://ghostscript.com/doc/current/Ps2pdf.htm#Options
 %%
+%% In TeX Live, we use the rungs wrapper instead of ps2pdf, becuse we
+%% must omit the -dSAFER which ps2pdf specifies: in order for pstricks
+%% to work with xetex,
+%% /usr/local/texlive/*/texmf-dist/dvips/pstricks/pstricks.pro (for
+%% example) needs to be accessed.  Also, it is better to use our
+%% supplied gs on Windows.
+%% 
+%% Without the -dEPSCROP below, an eps file with negative llx/lly (as
+%% created by MetaPost, for example) fails.  In 2013, changes were made
+%% to the drivers xetex.def, dvipdfmx.def, etc., to handle non-zero
+%% llx/lly so we could use it.  The file epsf-dvipdfmx.tex is available
+%% from CTAN/TL/etc. to support plain's epsf.tex.
+%% 
+%% In 2014, we discovered that -sPAPERSIZE=a0 was needed to support
+%% pstricks under xetex; otherwise, images were cropped (see thread at
+%% http://tug.org/pipermail/xetex/2014-November/025664.html).
+%% Happily, it seems that using both -dEPSCROP and -sPAPERSIZE=a0
+%% simultaneously works ok.  So that's we do below.
+%% 
 %% By default, gs encodes all images contained in a PS file using
 %% the lossy DCT (i.e., JPEG) filter. This often leads to inferior
 %% result (see the discussion at http://electron.mit.edu/~gsteele/pdf/).
@@ -130,27 +149,12 @@ P  0x003C
 %% will also be re-encoded using Flate. To turn the conversion off,
 %% simply remove the options mentioned above.
 %% 
-%% The -dEPSCROP below converts PS files.  Before TL 2013,
-%% -sPAPERSIZE=a0 was used for this.  In 2013, changes were made to
-%% xetex.def, dvipdfmx.def, etc., to handle non-zero llx/lly.
-%%
-%% In TeX Live, we use the rungs wrapper instead of ps2pdf, becuse we
-%% must omit the -dSAFER which ps2pdf specifies: in order for pstricks
-%% to work with xetex,
-%% /usr/local/texlive/*/texmf-dist/dvips/pstricks/pstricks.pro (for
-%% example) needs to be accessed.  (Also, it is better to use our
-%% supplied gs on Windows.)  You can also add -dNOSAFER to the ps2pdf
-%% command line.
-%%
 %% Incidentally, especially in TL, more than one dvipdfmx.cfg may be
 %% extant.  You can find the one that is active by running:
 %% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg
 %% and control which one is found by setting DVIPDFMXINPUTS.
 %%
-D  "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
-
-% pre-2013 invocation using -sPAPERSIZE instead of -dEPSCrop, no other changes:
-%D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
+D  "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
 
 % other random ps converters people have experimented with.
 %D "/usr/local/bin/ps2pdf -dEPSCrop '%i' '%o'"
diff --git a/texmf/texmf.d/._cfg0000_00header.cnf b/texmf/texmf.d/._cfg0000_00header.cnf
deleted file mode 100644
index d181c60..0000000
--- a/texmf/texmf.d/._cfg0000_00header.cnf
+++ /dev/null
@@ -1,42 +0,0 @@
-% original texmf.cnf -- runtime path configuration file for kpathsea.
-% Public domain.
-% 
-% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
-% updated.  Instead, put your changes -- and only your changes, not an
-% entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2015/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2015/texmf.cnf.
-% 
-% What follows is a super-summary of what this .cnf file can
-% contain. Please read the Kpathsea manual for more information.
-%
-% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
-% The `=' (and surrounding spaces) is optional.
-% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
-%
-% Earlier entries (in the same or another file) override later ones, and
-% an environment variable foo overrides any texmf.cnf definition of foo.
-%
-% All definitions are read before anything is expanded, so you can use
-% variables before they are defined.
-%
-% If a variable assignment is qualified with `.PROGRAM', it is ignored
-% unless the current executable (last filename component of argv[0]) is
-% named PROGRAM.  This foo.PROGRAM construct is not recognized on the
-% right-hand side. For environment variables, use FOO_PROGRAM.
-%
-% Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
-%
-% // means to search subdirectories (recursively).
-% A leading !! means to look only in the ls-R db, never on the disk.
-% In this file, either ; or : can be used to separate path components.
-% A leading/trailing/doubled path separator in the paths will be
-%   expanded into the compile-time default. Probably not what you want.
-%
-% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  We make extensive
-% use of this.
-
-
diff --git a/texmf/texmf.d/._cfg0000_10standardpaths.cnf b/texmf/texmf.d/._cfg0000_10standardpaths.cnf
deleted file mode 100644
index 66a85e2..0000000
--- a/texmf/texmf.d/._cfg0000_10standardpaths.cnf
+++ /dev/null
@@ -1,375 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the following variables.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% WEB2C is for Web2C specific files.  The current directory may not be
-% a good place to look for them.
-WEB2C = $TEXMF/web2c
-
-% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc.  We specify paths for all known
-% formats, past or present.  Not all of them are built these days.
-
-% Plain TeX.  Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
-
-% Other plain-based formats.
-TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
-
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
-% used with 2.09 in latex209/.  In addition, we look in the directory
-% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
-
-% MLTeX.
-TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex         = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
-
-% e-TeX.
-TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfTeX.
-TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex      = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex        = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo    = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex     = .;$TEXMF/tex/{amstex,plain,generic,}//
-
-% pdfeTeX.
-TEXINPUTS.pdfelatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex       = .;$TEXMF/tex/{plain,generic,}//
-
-% LuaTeX.
-TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.luajittex     = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dviluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
-
-% XeTeX.
-TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
-
-% Omega / Aleph.
-TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.lamed         = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
-
-% p(La)TeX.
-TEXINPUTS.ptex          = .;$TEXMF/tex/{ptex,plain,generic,}//
-TEXINPUTS.platex        = .;$TEXMF/tex/{platex,latex,generic,}//
-
-% epTeX, and for pmpost.
-TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,plain,generic,}//
-TEX.pmpost = eptex
-
-% p(La)TeX-ng
-TEXINPUTS.ptex-ng   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
-TEXINPUTS.platex-ng = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
-
-% (e)up(La)TeX, and for upmpost
-TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
-TEXINPUTS.uptex   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
-TEXINPUTS.euptex  = .;$TEXMF/tex/{uptex,ptex,plain,generic}//
-TEX.upmpost = euptex
-
-% pBibTeX bibliographies and style files.
-BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
-BSTINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bst//
-
-% ConTeXt.
-TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic}//
-
-% jadetex.
-TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
-
-% XMLTeX.
-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-% Miscellany, no longer built.
-TEXINPUTS.lamstex       = .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop      = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
-
-% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
-
-% ttf2tfm.
-TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
-
-% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$GLOBALVARTEXFONTS,$VARTEXFONTS}/source//
-MPINPUTS = .;$TEXMF/metapost//
-
-% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-% We want to find the engine-specific file, e.g., cont-en.fmt can
-% exist under both pdftex/ and xetex/.  But just in case some formats
-% end up without an engine directory, look directly in web2c/ too.
-% We repeat the same definition three times because of the way fmtutil
-% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
-% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
-%
-% As of 2008, pool files don't exist any more (the strings are compiled
-% into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c
-MFPOOL = ${TEXPOOL}
-MPPOOL = ${TEXPOOL}
-
-% support the original xdvi.  Must come before the generic settings.
-PKFONTS.XDvi   = .;$TEXMF/%s;{$GLOBALVARTEXFONTS,$VARTEXFONTS}/pk/{%m,modeless}//
-VFFONTS.XDvi   = .;$TEXMF/%s
-PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi  = .;$TEXMF/%q{dvips,tex}//
-
-% Device-independent font metric files.
-VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$GLOBALVARTEXFONTS,$VARTEXFONTS}/tfm//
-
-% The $MAKETEX_MODE below means the drivers will not use a cx font when
-% the mode is ricoh.  If no mode is explicitly specified, kpse_prog_init
-% sets MAKETEX_MODE to /, so all subdirectories are searched.  See the manual.
-% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$GLOBALVARTEXFONTS,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
-
-% Similarly for the GF format, which only remains in existence because
-% Metafont outputs it (and MF isn't going to change).
-GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE//
-
-% A backup for PKFONTS and GFFONTS. Not used for anything.
-GLYPHFONTS = .;$TEXMF/fonts
-
-% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
-
-% font name map files.  This isn't just fonts/map// because ConTeXt
-% wants support for having files with the same name in the different
-% subdirs.  Maybe if the programs ever get unified to accepting the same
-% map file syntax the definition can be simplified again.
-TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
-
-% BibTeX bibliographies and style files.  bibtex8 also uses these.
-BIBINPUTS = .;$TEXMF/bibtex/bib//
-BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
-
-% MlBibTeX.
-MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
-MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
-
-% .ris and .bltxml bibliography formats.
-RISINPUTS = .;$TEXMF/bibtex/ris//
-BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
-
-% MFT style files.
-MFTINPUTS = .;$TEXMF/mft//
-
-% PostScript headers and prologues (.pro); unfortunately, some programs
-% also use this for acessing font files (enc, type1, truetype)
-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}//
-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}//
-
-% OSFONTDIR is to provide a convenient hook for allowing TeX to find
-% fonts installed on the system (outside of TeX).  An empty default
-% value would add "//" to the search paths, so we give it a dummy value.
-OSFONTDIR = /please/set/osfontdir/in/the/environment
-
-% PostScript Type 1 outline fonts.
-T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-
-% PostScript AFM metric files.
-AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
-
-% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
-
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
-
-% Type 42 outline fonts.
-T42FONTS = .;$TEXMF/fonts/type42//
-
-% Ligature definition files.
-LIGFONTS =  .;$TEXMF/fonts/lig//
-
-% Dvips' config.* files (this name should not start with `TEX'!).
-TEXCONFIG = $TEXMF/dvips//
-
-% Makeindex style (.ist) files.
-INDEXSTYLE = .;$TEXMF/makeindex//
-
-% Font encoding files (.enc).
-ENCFONTS = .;$TEXMF/fonts/enc//
-
-% CMap files.
-CMAPFONTS = .;$TEXMF/fonts/cmap//
-
-% Subfont definition files.
-SFDFONTS = .;$TEXMF/fonts/sfd//
-
-% OpenType feature files (.fea).
-FONTFEATURES=.;$TEXMF/fonts/fea//
-
-% .cid and .cidmap
-FONTCIDMAPS=.;$TEXMF/fonts/cid//
-
-% pdftex config files:
-PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
-
-% Used by DMP (ditroff-to-mpx), called by makempx -troff.
-TRFONTS = $SELFAUTODIR{/local,}/share/groff/{current/font,site-font}/devps
-MPSUPPORT = .;$TEXMF/metapost/support
-
-% For xdvi to find mime.types and .mailcap, if they do not exist in
-% ~.  These are single directories, not paths.
-% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = $SELFAUTOPARENT/etc
-MAILCAPLIBDIR = $SELFAUTOPARENT/etc
-
-% Default settings for the fontconfig library as used by the Windows
-% versions of xetex/xdvipdfmx.  Not used by xetex on Unixish systems.
-% ConTeXT MkIV (all platforms) also use these values.
-% 
-FONTCONFIG_FILE = fonts.conf
-FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
-
-% TeX documentation and source files, for use with texdoc and kpsewhich.
-TEXDOCS = $TEXMF/doc//
-TEXSOURCES = .;$TEXMF/source//
-
-% Web and CWeb input paths.
-WEBINPUTS = .;$TEXMF/web//
-CWEBINPUTS = .;$TEXMF/cweb//
-
-% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$GLOBALVARTEXFONTS,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$GLOBALVARTEXFONTS,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$GLOBALVARTEXFONTS,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$GLOBALVARTEXFONTS,$VARTEXFONTS}/ovp//
-OTPINPUTS = .;$TEXMF/omega/otp//
-OCPINPUTS = .;$TEXMF/omega/ocp//
-
-% Some additional input variables for several programs.  If you add
-% a program that uses the `other text files' or `other binary files'
-% search formats, you'll want to add their variables here as well.
-T4HTINPUTS   = .;$TEXMF/tex4ht//
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% TeXworks editor configuration and settings
-TW_LIBPATH = $TEXMFCONFIG/texworks
-TW_INIPATH = $TW_LIBPATH
-
-% For security, do not look in . for dvipdfmx.cfg, since the D option
-% would allow command execution.
-DVIPDFMXINPUTS = $TEXMF/dvipdfmx
-
-% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-% 
-% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
-% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
-% default expansion of TEXINPUTS will not happen and .lua files under
-% the /tex/ will not be found.
-% 
-% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
-% The default LUAINPUTS suffices for luatex and dviluatex.
-%
-LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
-
-% Lua needs to look for binary lua libraries distributed with packages.
-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-
-% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//
-
-% Other languages.
-JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
-PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-
-%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
-% KPSE_DOT = .
-
-% This definition isn't used from this .cnf file itself (that would be
-% paradoxical), but the compile-time default in paths.h is built from it.
-% The SELFAUTO* variables are set automatically from the location of
-% argv[0], in kpse_set_program_name.
-% 
-% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf.
-% Since this file is subject to future updates, the TeX Live installer
-% or human administrator may also create a file
-% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one.
-% 
-% For security reasons, it is best not to include . in this path.
-%
-% The idea behind this lengthy definition: for each of
-% SELFAUTO{LOC,DIR,PARENT}, look in the directory,
-% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf,
-% then the subdirectories ./texmf-local, texmf-dist, ./texmf.
-% At any given installation, most of these directories will not exist,
-% but they all turn out to be useful somewhere.
-% 
-% Special addition -- we want to include one more directory: the
-% great-grandparent's texmf-local, because that is how TL is installed
-% by default.  That is, given a binary
-% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find
-% /usr/local/texlive/texmf-local/web2c/texmf.cnf.  I.e., not under YYYY.
-% 
-% As a result, we cannot use actual brace expansion in the definition,
-% since we don't want to scatter ../'s throughout the value.  Hence we
-% explicitly list every directory.  Arguably more understandable anyway.
-%
-TEXMFCNF = {\
-$SELFAUTODIR/share/texmf-dist/web2c,\
-$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/local/share/texmf/web2c,\
-$SELFAUTOPARENT/etc/texmf/web2c\
-}
-%
-% For reference, here is the old brace-using definition:
-%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-
-% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-% expansions from binaries linked against an earlier version of the
-% library, we set $progname and $engine to something non-empty:
-progname = unsetprogname
-engine = unsetengine
-
-
-
diff --git a/texmf/texmf.d/._cfg0000_15options.cnf b/texmf/texmf.d/._cfg0000_15options.cnf
deleted file mode 100644
index eab03c9..0000000
--- a/texmf/texmf.d/._cfg0000_15options.cnf
+++ /dev/null
@@ -1,154 +0,0 @@
-%  Part 2: Options.
-
-% If this option is set to true, `tex a.b' will look first for a.b.tex
-% (within each path element), and then for a.b, i.e., we try standard
-% extensions first.  If this is false, we first look for a.b and then
-% a.b.tex, i.e., we try the name as-is first.
-%
-% Both names are always tried; the difference is the order in which they
-% are tried.  The setting applies to all searches, not just .tex.
-%
-% This setting only affects names being looked up which *already* have
-% an extension.  A name without an extension (e.g., `tex story') will
-% always have an extension added first.
-%
-% The default is true, because we already avoid adding the standard
-% extension(s) in the usual cases.  E.g., babel.sty will only look for
-% babel.sty, not babel.sty.tex, regardless of this setting.
-try_std_extension_first = t
-
-% Enable system commands via \write18{...}.  When enabled fully (set to
-% t), obviously insecure.  When enabled partially (set to p), only the
-% commands listed in shell_escape_commands are allowed.  Although this
-% is not fully secure either, it is much better, and so useful that we
-% enable it for everything but bare tex.
-shell_escape = p
-
-% No spaces in this command list.
-% 
-% The programs listed here are as safe as any we know: they either do
-% not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p.  They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs.  All to the best of our knowledge.  They also have practical use
-% for being called from TeX.
-% 
-shell_escape_commands = \
-bibtex,bibtex8,\
-extractbb,\
-kpsewhich,\
-makeindex,\
-mpost,\
-repstopdf,\
-
-% we'd like to allow:
-% dvips - but external commands can be executed, need at least -R1.
-% epspdf, ps2pdf, pstopdf - need to respect openout_any,
-%   and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-%   without Unix convert it hardly seems worth it, and Windows convert
-%   is something completely different that destroys filesystems, so skip.
-% pygmentize - but is the filter feature insecure?
-% ps4pdf - but it calls an unrestricted latex.
-% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
-% texindy,xindy - but is the module feature insecure?
-% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
-
-% plain TeX should remain unenhanced.
-shell_escape.tex = f
-shell_escape.initex = f
-
-% This is used by the Windows script wrapper for restricting searching
-% for the purportedly safe shell_escape_commands above to system
-% directories.
-TEXMF_RESTRICTED_SCRIPTS = \
-  {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
-
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
-% a (any)        : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
-% p (paranoid)   : as `r' and disallow going to parent directories, and
-%                  restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
-openin_any = a
-
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-%TEXMFOUTPUT = /tmp
-
-% If a dynamic file creation fails, log the command to this file, in
-% either the current directory or TEXMFOUTPUT.  Set to the
-% empty string or  0  to avoid logging.
-MISSFONT_LOG = missfont.log
-
-% Set to a colon-separated list of words specifying warnings to suppress.
-% To suppress everything, use TEX_HUSH = all; this is currently equivalent to
-% TEX_HUSH = checksum:lostchar:readable:special
-% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
-TEX_HUSH = none
-
-% Allow TeX, and MF to parse the first line of an input file for
-% the %&format construct.
-parse_first_line = t
-
-% But don't parse the first line if invoked as "tex", since we want that
-% to remain Knuth-compatible.  The src_specials and
-% file_line_error_style settings, as well as the options -enctex,
-% -mltex, -8bit, etc., also affect this, but they are all off by default.
-parse_first_line.tex = f
-parse_first_line.initex = f
-
-% Control file:line:error style messages.
-file_line_error_style = f
-
-% Enable the mktex... scripts by default?  These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option.  Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
-%
-% These values are ignored if the script names are changed; e.g., if you
-% set DVIPSMAKEPK to `foo', what counts is the value of the environment
-% variable/config value `FOO', not the `MKTEXPK' value.
-%
-%MKTEXTEX = 0
-%MKTEXPK = 0
-%MKTEXMF = 0
-%MKTEXTFM = 0
-%MKTEXFMT = 0
-%MKOCP = 0
-%MKOFM = 0
-
-% Used by makempx to run TeX.  We use "etex" because MetaPost is
-% expecting DVI, and not "tex" because we want first line parsing.
-TEX = etex
-#
-# Use Japanese eptex for Japanese pmpost.
-TEX.pmpost = eptex
-
-% These variables specify the external program called for the
-% interactive `e' option.  %d is replaced by the line number and %s by
-% the current filename.  The default is specified at compile-time, and
-% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d '%s'                    % default for Unix
-%TEXEDIT = texworks --position=+%d "%s"   % default for Windows
-%MFEDIT = ${TEXEDIT}
-%MPEDIT = ${TEXEDIT}
-
-% The default `codepage and sort order' file for BibTeX8, when none is
-% given as command line option or environment variable.
-BIBTEX_CSFILE = 88591lat.csf
-
-% This variable is specific to Windows.  It must be set to 0 or 1.  The
-% default is 0.  Setting it to 1 tells the Windows script wrappers to
-% use an already installed Perl interpreter if one is found on the
-% search path, in preference to the Perl shipped with TeX Live.  Thus,
-% it may be useful if you both (a) installed a full Perl distribution
-% for general use, and (b) need to run Perl programs from TL that use
-% additional modules we don't provide.  The TL Perl does provide all the
-% standard Perl modules.
-%
-%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
-
-
-
diff --git a/texmf/texmf.d/00header.cnf b/texmf/texmf.d/00header.cnf
index 7d713dc..d181c60 100644
--- a/texmf/texmf.d/00header.cnf
+++ b/texmf/texmf.d/00header.cnf
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2014/texmf.cnf.
+% installed in /some/path/to/texlive/2015/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2015/texmf.cnf.
 % 
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
diff --git a/texmf/texmf.d/10standardpaths.cnf b/texmf/texmf.d/10standardpaths.cnf
index 4dbc623..66a85e2 100644
--- a/texmf/texmf.d/10standardpaths.cnf
+++ b/texmf/texmf.d/10standardpaths.cnf
@@ -86,10 +86,15 @@ TEXINPUTS.platex        = .;$TEXMF/tex/{platex,latex,generic,}//
 TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,plain,generic,}//
 TEX.pmpost = eptex
 
-% (e)up(La)TeX.
+% p(La)TeX-ng
+TEXINPUTS.ptex-ng   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
+TEXINPUTS.platex-ng = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
+
+% (e)up(La)TeX, and for upmpost
 TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
 TEXINPUTS.uptex   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
 TEXINPUTS.euptex  = .;$TEXMF/tex/{uptex,ptex,plain,generic}//
+TEX.upmpost = euptex
 
 % pBibTeX bibliographies and style files.
 BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
diff --git a/texmf/texmf.d/15options.cnf b/texmf/texmf.d/15options.cnf
index 285e9b9..eab03c9 100644
--- a/texmf/texmf.d/15options.cnf
+++ b/texmf/texmf.d/15options.cnf
@@ -35,6 +35,7 @@ shell_escape = p
 % 
 shell_escape_commands = \
 bibtex,bibtex8,\
+extractbb,\
 kpsewhich,\
 makeindex,\
 mpost,\
@@ -121,6 +122,9 @@ file_line_error_style = f
 % Used by makempx to run TeX.  We use "etex" because MetaPost is
 % expecting DVI, and not "tex" because we want first line parsing.
 TEX = etex
+#
+# Use Japanese eptex for Japanese pmpost.
+TEX.pmpost = eptex
 
 % These variables specify the external program called for the
 % interactive `e' option.  %d is replaced by the line number and %s by
diff --git a/texmf/web2c.d/._cfg0000_fmtutil-hdr.cnf b/texmf/web2c.d/._cfg0000_fmtutil-hdr.cnf
deleted file mode 100644
index 46bda14..0000000
--- a/texmf/web2c.d/._cfg0000_fmtutil-hdr.cnf
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: fmtutil-hdr.cnf 37176 2015-05-04 02:06:19Z preining $
-# Originally written by Thomas Esser, 1998. Public domain.
-#
-# As of TeX Live 2015, fmtutil reads *all* fmtutil.cnf files found.
-# Consequently, any manual edits of this file (fmtutil.cnf in the 
-# TEXMFDIST tree) will be lost on update. So don't do that.
-#
-# For guidance on how to achieve local configurations, see the man
-# page of fmtutil, or the output of fmtutil --help.
-#
-# The format of the table is:
-#
-# format  engine  pattern-file  arguments
-#
-# The last "argument" must be the name of the file on which to run
-# the ini-engine (such as initex).  If the ini-engine is e-TeX, and the
-# e-TeX extensions should be enabled, the filename must be prefixed with
-# a * character; this is essentially equivalent to the -etex option.
-# 
-# fmtutil always passes the -ini option to the engine.
-# If no pattern-file is desired, use -.
-# Either spaces or tabs can be used as separators.
-# 
-# Other notes:
-# 1) tex and amstex just load hyphen.tex. No customization.
-#    You can have your own customized (via babel's hyphen.cfg)
-#    formats on top of plain by using "bplain.tex" instead of
-#    plain.tex (e.g., bplain.ini file for bplain format).
-#
-# 2) etex-based formats load language.def, not language.dat.
-#
-# 3) The symbolic link to the right engines (e.g. bplain -> tex)
-#    is generated by the "texlinks" script.
-# 
-# 4) usual comments start with "# ", whereas disabled configurations
-#    start with "#! " in this file.
-
diff --git a/texmf/web2c.d/fmtutil-hdr.cnf b/texmf/web2c.d/fmtutil-hdr.cnf
index b753274..46bda14 100644
--- a/texmf/web2c.d/fmtutil-hdr.cnf
+++ b/texmf/web2c.d/fmtutil-hdr.cnf
@@ -1,10 +1,12 @@
-# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $
+# $Id: fmtutil-hdr.cnf 37176 2015-05-04 02:06:19Z preining $
 # Originally written by Thomas Esser, 1998. Public domain.
 #
-# As of TeX Live 2008, the final fmtutil.cnf is generated by
-# tlmgr generate fmtutil.  You can use
-# tlmgr generate fmtutil -localcfg /some/file to make local additions.
-# See tlmgr --help for more info.
+# As of TeX Live 2015, fmtutil reads *all* fmtutil.cnf files found.
+# Consequently, any manual edits of this file (fmtutil.cnf in the 
+# TEXMFDIST tree) will be lost on update. So don't do that.
+#
+# For guidance on how to achieve local configurations, see the man
+# page of fmtutil, or the output of fmtutil --help.
 #
 # The format of the table is:
 #
diff --git a/tox-bootstrapd.conf b/tox-bootstrapd.conf
index d02eb3d..3413f59 100644
--- a/tox-bootstrapd.conf
+++ b/tox-bootstrapd.conf
@@ -39,7 +39,7 @@ motd = "tox-bootstrapd"
 //
 // Remember to replace the provided example with your own node list.
 // There is a maintained list of bootstrap nodes on Tox's wiki, if you need it
-// (http://wiki.tox.im/Nodes).
+// (https://wiki.tox.chat/users/nodes).
 //
 // You may leave the list empty or remove "bootstrap_nodes" completely,
 // in both cases this will be interpreted as if you don't want to bootstrap
@@ -62,4 +62,4 @@ bootstrap_nodes = (
     port = 33445
     public_key = "8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858"
   }
-)
\ No newline at end of file
+)