diff --git a/README.md b/README.md
index 8c12735883bba6285c58e0f64bb6d352852e3bc6..19de054e3c417f1443fd229039b3a4d391c51454 100644
--- a/README.md
+++ b/README.md
@@ -16,17 +16,17 @@
 ### Observações
 
 * É possível que esta solução se aplique também aos computadores do pregão 23/2012, mas nós não tivemos ainda a oportunidade de testá-la, pois não temos equipamentos deste pregão em nenhuma escola municipal de Mogi das Cruzes.
-* Esta solução pode aplicar-se a outros progões do ProInfo Rural, **desde que a placa de vídeo original ATI Rage XL Quad seja substituída por um par de placas TN-502 Dual ou uma placa TN-502 Quad**.
+* Esta solução pode aplicar-se a outros pregões do ProInfo Rural, **desde que a placa de vídeo original ATI Rage XL Quad seja substituída por um par de placas TN-502 Dual ou uma placa TN-502 Quad**.
 
 ## Sabores do Ubuntu recomendados para os computadores do ProInfo
 
 Os sabores e arquiteturas do Ubuntu que nós recomendamos para os computadores do ProInfo são os seguintes:
 
-| Tipo de computador                            | Sabor do Ubuntu    | arquitetura |
-|:---------------------------------------------:|:------------------:|:-----------:|
-| multiterminal com menos de 2GB de memória RAM | Xubuntu ou Lubuntu | 32 bits     |
-| multiterminal com 2GB de memória RAM ou mais  | Xubuntu            | 64 bits     |
-| servidor                                      | Ubuntu MATE        | 64 bits     |
+| Tipo de computador                            | Sabor do Ubuntu                                                                                                                                                                                             | Arquitetura |
+|:---------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-----------:|
+| multiterminal com menos de 2GB de memória RAM | [Xubuntu](http://cdimage.ubuntu.com/xubuntu/releases/xenial/release/xubuntu-16.04-desktop-i386.iso) ou [Lubuntu](http://cdimage.ubuntu.com/lubuntu/releases/16.04/release/lubuntu-16.04-desktop-i386.iso)   | 32 bits     |
+| multiterminal com 2GB de memória RAM ou mais  | [Xubuntu](http://cdimage.ubuntu.com/xubuntu/releases/xenial/release/xubuntu-16.04-desktop-amd64.iso) ou [Lubuntu](http://cdimage.ubuntu.com/lubuntu/releases/16.04/release/lubuntu-16.04-desktop-amd64.iso) | 64 bits     |
+| servidor                                      | [Ubuntu MATE](http://cdimage.ubuntu.com/ubuntu-mate/releases/xenial/release/ubuntu-mate-16.04-desktop-amd64.iso)                                                                                            | 64 bits     |
 
 ## Resumo do roteiro
 
@@ -45,4 +45,4 @@ Caso algum de seus computadores seja afetado pelo [bug da tela listrada](../../w
 1. Instale o Linux Educacional 5.0 a partir da ISO disponível na [página de suporte do Paraná Digital](http://www.prdsuporte.seed.pr.gov.br/uploads/Linux-Educacional_5.0.2-1-escola-le5-stable-i386-20150817.iso), seguindo [este roteiro](wikis/Instalacao-do-Linux-Educacional-5-0).
 2. Configure o multiterminal no LE 5.0 seguindo [este roteiro](wikis/Configuracao-do-multiterminal-no-Linux-Educacional-5-0). **Não é necessário completar a associação de teclados/mouses, tampouco ativar a licença do Userful Multiseat**.
 3. Reinicie o computador de volta para o Ubuntu 16.04 LTS e execute o script `contornar-bug-tela-listrada.sh` que consta desta solução.
-4. Desligue e ligue novamente o computador.
\ No newline at end of file
+4. Desligue e ligue novamente o computador.
diff --git a/autostart-disable-nm/nm-applet.desktop b/autostart-disable-nm/nm-applet.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..e1e3e173236277e9a88de8f937b943c77b45796c
--- /dev/null
+++ b/autostart-disable-nm/nm-applet.desktop
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=true
diff --git a/autostart-disable/blueman.desktop b/autostart-disable/blueman.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..e1e3e173236277e9a88de8f937b943c77b45796c
--- /dev/null
+++ b/autostart-disable/blueman.desktop
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=true
diff --git a/autostart-disable/light-locker.desktop b/autostart-disable/light-locker.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..e1e3e173236277e9a88de8f937b943c77b45796c
--- /dev/null
+++ b/autostart-disable/light-locker.desktop
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=true
diff --git a/autostart-disable/print-applet.desktop b/autostart-disable/print-applet.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..e1e3e173236277e9a88de8f937b943c77b45796c
--- /dev/null
+++ b/autostart-disable/print-applet.desktop
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=true
diff --git a/autostart-disable/update-notifier.desktop b/autostart-disable/update-notifier.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..e1e3e173236277e9a88de8f937b943c77b45796c
--- /dev/null
+++ b/autostart-disable/update-notifier.desktop
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=true
diff --git a/autostart-disable/xfce4-power-manager.desktop b/autostart-disable/xfce4-power-manager.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..e1e3e173236277e9a88de8f937b943c77b45796c
--- /dev/null
+++ b/autostart-disable/xfce4-power-manager.desktop
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=true
diff --git a/autostart/wine.desktop b/autostart/wine.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..679f5d985b0a63c1569133e0df90763a279d1414
--- /dev/null
+++ b/autostart/wine.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=WINE desktop startup
+TryExec=wine
+Exec=wine explorer.exe /desktop
diff --git a/configurar-epoptes-client.sh b/configurar-epoptes-client.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6d6f34d918cc914e8ef09ed4a1505fc5d3339b42
--- /dev/null
+++ b/configurar-epoptes-client.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+install -m 644 systemd/epoptes-client.service /etc/systemd/system
+systemctl stop epoptes-client
+systemctl disable epoptes-client
+systemctl enable epoptes-client.service
+systemctl start epoptes-client.service
diff --git a/configurar-multiterminal-xephyr.sh b/configurar-multiterminal-xephyr.sh
new file mode 100755
index 0000000000000000000000000000000000000000..85f97d8627492795ca834b33cf0df8507ffdceb9
--- /dev/null
+++ b/configurar-multiterminal-xephyr.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+install -m 644 systemd/xorg-daemon.s* /etc/systemd/system
+install -m 644 udev/* /etc/udev/rules.d
+
+install -d /etc/X11/xorg.conf.d
+install -m 644 xorg/9[78]*.conf /etc/X11/xorg.conf.d
+install -m 755 seat-attach-assistant /usr/local/bin
+install -m 755 update-xorg-conf /usr/local/bin
+install -m 755 xorg-daemon /usr/local/bin
+install -m 755 xephyr-wrapper /usr/local/bin
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/*.conf /etc/xdg/lightdm/lightdm.conf.d
+
+update-xorg-conf SM501 /etc/X11/xorg.conf.d/98-proinfo-*.conf
+systemctl enable xorg-daemon.socket
+systemctl start xorg-daemon.socket
+
+apt-add-repository ppa:ubuntu-multiseat/xephyr
+apt update
+apt -y upgrade
+apt -y install xserver-xorg-video-siliconmotion xserver-xephyr compton numlockx
+
+udevadm trigger
+systemctl restart lightdm
diff --git a/configurar-multiterminal-xf86-video-nested.sh b/configurar-multiterminal-xf86-video-nested.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c9e8a9a1245662e6673a28bbd13a93f54280027b
--- /dev/null
+++ b/configurar-multiterminal-xf86-video-nested.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+install -m 644 systemd/xorg-daemon.s* /etc/systemd/system
+install -m 644 udev/* /etc/udev/rules.d
+
+install -d /etc/X11/xorg.conf.d
+install -m 644 xorg/*.conf /etc/X11/xorg.conf.d
+install -m 755 seat-attach-assistant /usr/local/bin
+install -m 755 update-xorg-conf /usr/local/bin
+install -m 755 xorg-daemon /usr/local/bin
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/9[5679]*.conf /etc/xdg/lightdm/lightdm.conf.d
+
+update-xorg-conf SM501 /etc/X11/xorg.conf.d/98-proinfo-*.conf
+systemctl enable xorg-daemon.socket
+systemctl start xorg-daemon.socket
+
+apt-add-repository ppa:ubuntu-multiseat/xf86-video-nested
+apt update
+apt -y upgrade
+apt -y install xserver-xorg-video-siliconmotion xserver-xorg-video-nested compton numlockx
+
+udevadm trigger
+systemctl restart lightdm
diff --git a/configurar-wine.sh b/configurar-wine.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5674c51f2ad7ec9a849c7350f957b731f76e8c4f
--- /dev/null
+++ b/configurar-wine.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+install -m 644 autostart/wine.desktop /etc/xdg/autostart
diff --git a/contornar-bug-tela-listrada.sh b/contornar-bug-tela-listrada.sh
index 110164786e238ea224a61ee7b9325f0538e4fc0e..9d2ffc467afb705c6ec683e5104a5c167e71dcbe 100755
--- a/contornar-bug-tela-listrada.sh
+++ b/contornar-bug-tela-listrada.sh
@@ -44,7 +44,12 @@ echo "       Índice correspondente no menu do GRUB: ${indice}."
 
 install -m 644 systemd/le-nextboot-* /etc/systemd/system
 
-systemctl enable le-nextboot-poweroff@${indice}
+cat > /etc/le-nextboot.conf << EOF
+LE_NEXTBOOT_ENABLE=true
+LE_NEXTBOOT_INDEX=${indice}
+EOF
+
+systemctl enable le-nextboot-poweroff.service
 grub-reboot ${indice}
 
 mount ${particao} /mnt
diff --git a/criar-usuarios-alunos-lubuntu.sh b/criar-usuarios-alunos-lubuntu.sh
new file mode 100755
index 0000000000000000000000000000000000000000..584269b0765faeae6b3ce6d38bbe413acfbbf55b
--- /dev/null
+++ b/criar-usuarios-alunos-lubuntu.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+addgroup freeze
+adduser --gecos "Modelo para Freeze" --shell /bin/bash freezetemplate
+
+for i in 0 1 2 3 4
+do
+    adduser --disabled-login --gecos "Aluno #${i}" --shell /bin/bash aluno${i}
+    adduser aluno${i} freeze
+    echo aluno${i}:aluno${i} | chpasswd
+done
+
+apt update
+apt -y install libpam-mount bindfs
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/96-disable-guest.conf /etc/xdg/lightdm/lightdm.conf.d
+install -m 755 mount-wrapper /usr/local/sbin
+install -m 755 prepare-clonezilla /usr/local/sbin
+install -m 644 pam_mount.conf.xml /etc/security
+install -m 644 lubuntu/*.policy /usr/share/polkit-1/actions
+
+install -d /usr/local/share/file-manager/actions
+install -m 644 lubuntu/*.desktop /usr/local/share/file-manager/actions
+install -m 755 lubuntu/*-pkexec /usr/local/bin
+
+install -m 755 freeze-session-auto /usr/local/bin
+install -d /home/freezetemplate/.config/autostart
+install -m 644 autostart/freeze-session-auto.desktop /home/freezetemplate/.config/autostart
+install -m 644 autostart-disable/*.desktop /home/freezetemplate/.config/autostart
+
+mkdir -m 0777 /var/freeze-data
+ln -s /var/freeze-data "/home/freezetemplate/SALVAR AQUI!"
+
+chown -R freezetemplate:freezetemplate /home/freezetemplate
diff --git a/criar-usuarios-alunos-xubuntu.sh b/criar-usuarios-alunos-xubuntu.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fbe27bf33690a01a5b9316ee281da5433c0ea8d4
--- /dev/null
+++ b/criar-usuarios-alunos-xubuntu.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+addgroup freeze
+adduser --gecos "Modelo para Freeze" --shell /bin/bash freezetemplate
+
+for i in 0 1 2 3 4
+do
+    adduser --disabled-login --gecos "Aluno #${i}" --shell /bin/bash aluno${i}
+    adduser aluno${i} freeze
+    echo aluno${i}:aluno${i} | chpasswd
+done
+
+apt update
+apt -y install libpam-mount bindfs
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/96-disable-guest.conf /etc/xdg/lightdm/lightdm.conf.d
+install -m 755 mount-wrapper /usr/local/sbin
+install -m 755 prepare-clonezilla /usr/local/sbin
+install -m 644 pam_mount.conf.xml /etc/security
+install -m 644 xubuntu/*.policy /usr/share/polkit-1/actions
+
+install -m 755 freeze-session-auto /usr/local/bin
+install -d /home/freezetemplate/.config/autostart
+install -m 644 autostart/freeze-session-auto.desktop /home/freezetemplate/.config/autostart
+install -m 644 autostart-disable/*.desktop /home/freezetemplate/.config/autostart
+
+install -d /home/freezetemplate/.config/Thunar
+install -m 644 xubuntu/uca.xml /home/freezetemplate/.config/Thunar
+
+mkdir -m 0777 /var/freeze-data
+ln -s /var/freeze-data "/home/freezetemplate/SALVAR AQUI!"
+
+chown -R freezetemplate:freezetemplate /home/freezetemplate
diff --git a/instalar-pacotes-recomendados.sh b/instalar-pacotes-recomendados.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c109c7d10be91356aeea0d8cfb47cbd8e8b7cdb1
--- /dev/null
+++ b/instalar-pacotes-recomendados.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+PACOTES="
+ubuntu-edu-preschool
+ubuntu-edu-primary
+ubuntu-edu-secondary
+kde-l10n-ptbr
+gparted
+pinta
+vlc
+ktouch
+openshot
+dreamchess
+gnome-chess
+supertux
+supertuxkart
+pingus
+chromium-browser
+adobe-flashplugin
+ssvnc
+epoptes-client
+ssh
+nginx-light
+wine
+"
+
+apt-add-repository ppa:oiteam/epoptes
+apt update
+
+OMNITUX="http://downloads.sourceforge.net/project/omnitux/omnitux/v1.2.1/omnitux_1.2.1_all.deb?r=http%3A%2F%2Fomnitux.sourceforge.net%2Fdownload.en.php&ts=1462984447&use_mirror=liquidtelecom"
+wget -c $OMNITUX -O /tmp/omnitux_1.2.1_all.deb && apt install /tmp/omnitux_1.2.1_all.deb
+
+apt install $PACOTES
+
+install -m 644 tuxpaint.conf /etc/tuxpaint
diff --git a/lightdm/98-xephyr-multi-seat.conf b/lightdm/98-xephyr-multi-seat.conf
index 266f36247c3e24ff444d52d007f5232b9793b9ce..073a95f5d8082785ce5cf32ccdbc68e99c161126 100644
--- a/lightdm/98-xephyr-multi-seat.conf
+++ b/lightdm/98-xephyr-multi-seat.conf
@@ -1,11 +1,11 @@
 [Seat:seat-V0]
-xserver-command=env DISPLAY=:90.0 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output VGA
+xserver-command=xephyr-wrapper :90.0 -output VGA
 
 [Seat:seat-L0]
-xserver-command=env DISPLAY=:90.0 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output LVDS
+xserver-command=xephyr-wrapper :90.0 -output LVDS
 
 [Seat:seat-V1]
-xserver-command=env DISPLAY=:90.1 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output VGA
+xserver-command=xephyr-wrapper :90.1 -output VGA
 
 [Seat:seat-L1]
-xserver-command=env DISPLAY=:90.1 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output LVDS
+xserver-command=xephyr-wrapper :90.1 -output LVDS
diff --git a/lubuntu/leafpad-pkexec b/lubuntu/leafpad-pkexec
new file mode 100755
index 0000000000000000000000000000000000000000..7e43fdc23d5470fd9193c06c90bfb23674beac67
--- /dev/null
+++ b/lubuntu/leafpad-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/leafpad" "$@"
diff --git a/lubuntu/lxterminal-pkexec b/lubuntu/lxterminal-pkexec
new file mode 100755
index 0000000000000000000000000000000000000000..2f0b072895dedef215f697aa6c71083c125fdd64
--- /dev/null
+++ b/lubuntu/lxterminal-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/lxterminal" "$@"
diff --git a/lubuntu/open-as-root.desktop b/lubuntu/open-as-root.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..cdef38d09e0205b81058553688af5c7d30bd7e3f
--- /dev/null
+++ b/lubuntu/open-as-root.desktop
@@ -0,0 +1,41 @@
+[Desktop Entry]
+Type=Action
+Profiles=profile-folder;profile-non-plain-text;profile-plain-text;
+Name[pt_BR]=Abrir como administrador
+Name[en_US]=Open As Root
+Name[en]=Open As Root
+Name[C]=Open As Root
+Tooltip[pt_BR]=Abrir com privilégios administrativos
+Tooltip[en_US]=Open As Root
+Tooltip[en]=Open As Root
+Tooltip[C]=Open As Root
+ToolbarLabel[pt_BR]=Abrir como administrador
+ToolbarLabel[en_US]=Open As Root
+ToolbarLabel[en]=Open As Root
+ToolbarLabel[C]=Open As Root
+
+Icon=gtk-dialog-authentication
+
+[X-Action-Profile profile-folder]
+MimeTypes=inode/directory;
+Exec=pcmanfm-pkexec %u
+Name[pt_BR]=Abrir pasta como administrador
+Name[en_US]=Open Folder As Root
+Name[en]=Open Folder As Root
+Name[C]=Open Folder As Root
+
+[X-Action-Profile profile-non-plain-text]
+MimeTypes=all/allfiles;!text/plain;
+Exec=pcmanfm-pxexec %d
+Name[pt_BR]=Abrir como administrador
+Name[en_US]=Open Folder As Root
+Name[en]=Open Folder As Root
+Name[C]=Open Folder As Root
+
+[X-Action-Profile profile-plain-text]
+MimeTypes=text/plain;
+Exec=leafpad-pkexec %f
+Name[pt_BR]=Editar arquivo como administrador
+Name[en_US]=Edit File As Root
+Name[en]=Edit File As Root
+Name[C]=Edit File As Root
diff --git a/lubuntu/org.lxde.leafpad.policy b/lubuntu/org.lxde.leafpad.policy
new file mode 100644
index 0000000000000000000000000000000000000000..eba92973295df415875083fd345c23df88a13b88
--- /dev/null
+++ b/lubuntu/org.lxde.leafpad.policy
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>Leafpad</vendor>
+  <vendor_url>http://lxde.org/</vendor_url>
+
+  <action id="org.lxde.leafpad">
+    <message>Authentication is required to run Leafpad as root</message>
+    <message xml:lang="de">Legitimierung wird benötigt, um Leafpad als Systemverwalter zu starten.</message>
+    <message xml:lang="es">Para ejecutar Leafpad con permisos administrativos necesita autenticarse</message>
+    <message xml:lang="fi">Tunnistautuminen vaaditaan, jotta Leafpad voidaan ajaa pääkäyttäjänä</message>
+    <message xml:lang="fr">Une authentification est requise pour exécuter Leafpad en tant que root</message>
+    <message xml:lang="gl">Requírese autenticación para executar Leafpad como superusuario</message>
+    <message xml:lang="hu">Hitelesítés szükséges a Leafpad root-ként való futtatásához</message>
+    <message xml:lang="is">Auðkenningar er krafist til að keyra Leafpad sem root</message>
+    <message xml:lang="lt">Norint vykdyti Leafpad kaip root, reikalingas tapatybės nustatymas</message>
+    <message xml:lang="ml">മൗസ്പാഡ് റൂട്ടായി പ്രവര്‍ത്തിപ്പിക്കാന്‍ ആധികാരികത ആവശ്യമാണ്</message>
+    <message xml:lang="nl">Authenticatie is vereist om te werken met Leafpad als root</message>
+    <message xml:lang="pl">Wymagane jest uwierzytelnienie, aby uruchomić Leafpad w trybie administratora</message>
+    <message xml:lang="pt">É necessário autenticação para executar o Leafpad como root</message>
+    <message xml:lang="ru">Требуется идентификация, чтобы запустить Leafpad от имени суперпользователя</message>
+    <message xml:lang="sr">Потврђивање идентитета је потребно за администраторско покретање табле миша</message>
+    <message xml:lang="tr">Leafpad'i kök kullanıcı olarak çalıştırmak için yetkilendirme gerekli</message>
+    <icon_name>leafpad</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/leafpad</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
diff --git a/lubuntu/org.lxde.lxterminal.policy b/lubuntu/org.lxde.lxterminal.policy
new file mode 100644
index 0000000000000000000000000000000000000000..1cc8cf712cc037c48716008596bb6ae5cbee1a03
--- /dev/null
+++ b/lubuntu/org.lxde.lxterminal.policy
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  
+
+ <vendor>LXTerminal</vendor>
+ <vendor_url>http://lxde.org/</vendor_url>
+ <icon_name>utilities-terminal</icon_name>
+
+
+ <action id="org.lxde.lxterminal">
+ 
+ <description>Run LXTerminal as root</description>
+ <description xml:lang="ar">شغل ثونار كجذر</description>
+ <description xml:lang="ast">Executar LXTerminal como root</description>
+ <description xml:lang="bg">Стартирай LXTerminal като администратор</description>
+ <description xml:lang="cs">Spustit LXTerminal jako root</description>
+ <description xml:lang="da">Kør LXTerminal med rodrettigheder</description>
+ <description xml:lang="de">LXTerminal als Systemverwalter starten</description>
+ <description xml:lang="el">Εκτέλεση LXTerminal ως διαχειριστής</description>
+ <description xml:lang="en_AU">Run LXTerminal as root</description>
+ <description xml:lang="es">Iniciar LXTerminal como superusuario</description>
+ <description xml:lang="fi">Käynnistä LXTerminal pääkäyttäjän oikeuksin.</description>
+ <description xml:lang="fr">Lancer LXTerminal en tant que root</description>
+ <description xml:lang="gl">Executar LXTerminal como administrador</description>
+ <description xml:lang="he">הרץ את LXTerminal בתור שורש</description>
+ <description xml:lang="hr">Pokreni LXTerminal kao root korisnik</description>
+ <description xml:lang="hu">LXTerminal futtatása rendszergazdaként</description>
+ <description xml:lang="is">Keyra LXTerminal sem kerfisstjóri (root)</description>
+ <description xml:lang="it">Esegui LXTerminal come amministratore</description>
+ <description xml:lang="ja">root で LXTerminal を起動</description>
+ <description xml:lang="kk">LXTerminal-ды әкімші ретінде орындау</description>
+ <description xml:lang="ko">Root 권한으로 LXTerminal 작동</description>
+ <description xml:lang="lt">Vykdyti LXTerminal administratoriaus teisėmis</description>
+ <description xml:lang="ms">Jalankan LXTerminal sebagai root</description>
+ <description xml:lang="nb">Kjør LXTerminal som root</description>
+ <description xml:lang="nl">LXTerminal draaien met rootbevoegdheid</description>
+ <description xml:lang="pl">Uruchom LXTerminal jako root</description>
+ <description xml:lang="pt">Executar LXTerminal como root</description>
+ <description xml:lang="pt_BR">Rodar LXTerminal como superusuário</description>
+ <description xml:lang="ro">Pornește LXTerminal ca root</description>
+ <description xml:lang="ru">Запустить LXTerminal от суперпользователя</description>
+ <description xml:lang="sk">Spustiť LXTerminal ako root</description>
+ <description xml:lang="sr">Покрени Тунара са кореним овлашћењима</description>
+ <description xml:lang="th">เรียกทำงาน LXTerminal ในฐานะ root</description>
+ <description xml:lang="tr">LXTerminal'ı root olarak çalıştır</description>
+ <description xml:lang="uk">Запустити LXTerminal з правами суперкористувача</description>
+ <description xml:lang="zh_CN">以 root 身份运行 LXTerminal</description>
+ <description xml:lang="zh_TW">以 root 身份執行 LXTerminal</description>
+ <message>Authentication is required to run LXTerminal as root.</message>
+ <message xml:lang="ast">Ríquese l'autenticación pa executar LXTerminal como root.</message>
+ <message xml:lang="bg">Изисква се удостоверяване за да стартирате LXTerminal като администратор</message>
+ <message xml:lang="cs">Pro spuštění aplikace LXTerminal jako root se vyžaduje autentizace.</message>
+ <message xml:lang="da">Der kræves godkendelse for at køre LXTerminal som root.</message>
+ <message xml:lang="de">Legitimierung wird benötigt, um LXTerminal als Systemverwalter zu starten.</message>
+ <message xml:lang="el">Απαιτείται πιστοποίηση για εκτέλεση του LXTerminal ως διαχειριστής.</message>
+ <message xml:lang="en_AU">Authentication is required to run LXTerminal as root.</message>
+ <message xml:lang="es">Es necesario autentificarse para iniciar LXTerminal como superusuario.</message>
+ <message xml:lang="fi">Jotta LXTerminal voidaan käynnistää pääkäyttäjän oikeuksin, todennus tarvitaan.</message>
+ <message xml:lang="fr">Une authentification est requise pour lancer LXTerminal en tant que root.</message>
+ <message xml:lang="gl">Requírese autenticación para executar LXTerminal como administrador</message>
+ <message xml:lang="he">נדרש אימות כדי להריץ את LXTerminal בתור שורש.</message>
+ <message xml:lang="hr">Potrebna je provjera za pokretanje LXTerminala kao root.</message>
+ <message xml:lang="hu">A LXTerminal rendszergazdai futtatásához hitelesítés szükséges.</message>
+ <message xml:lang="is">Auðkenningar er krafist til að keyra LXTerminal sem kerfisstjóri (root)</message>
+ <message xml:lang="it">Per eseguire LXTerminal come amministratore è richiesta l'autenticazione</message>
+ <message xml:lang="ja">root で LXTerminal を起動するには認証が必要です。</message>
+ <message xml:lang="kk">LXTerminal-ды әкімші ретінде орындау үшін аутентификация керек.</message>
+ <message xml:lang="ko">Root 권한으로 LXTerminal를 작동하려면 인증이 필요합니다.</message>
+ <message xml:lang="lt">LXTerminal vykdymui administratoriaus teisėmis, reikalingas tapatybės nustatymas.</message>
+ <message xml:lang="ms">Pengesahihan diperlukan untuk jalankan LXTerminal sebagai root.</message>
+ <message xml:lang="nb">Identitetsbekreftelse kreves for å kjøre LXTerminal som root.</message>
+ <message xml:lang="nl">Authenticatie is vereist om LXTerminal met rootbevoegdheid te draaien.</message>
+ <message xml:lang="pl">Wymagane jest uwierzytelnienie, aby uruchomić program LXTerminal w trybie administratora.</message>
+ <message xml:lang="pt">Autenticação necessária para executar LXTerminal como root.</message>
+ <message xml:lang="pt_BR">Autenticação é requerida para rodar LXTerminal como superusuário.</message>
+ <message xml:lang="ro">Pentru a porni LXTerminal ca root este nevoie de autentificare.</message>
+ <message xml:lang="ru">Требуется аутентификация для запуска LXTerminal от суперпользователя</message>
+ <message xml:lang="sk">Na spustenie LXTerminalu ako root je potrebná autentifikácia.</message>
+ <message xml:lang="sr">Потребна је потврда овлашћења ради покретања Тунара под кореним овлашћењима</message>
+ <message xml:lang="th">ต้องยืนยันตัวบุคคลก่อนเรียกทำงาน LXTerminal ในฐานะ root</message>
+ <message xml:lang="tr">LXTerminal'ı root olarak çalıştırmak için kimlik doğrulaması gereklidir</message>
+ <message xml:lang="uk">Вимагається розпізнавання для запуску LXTerminal з правами суперкористувача.</message>
+ <message xml:lang="zh_CN">以 root 身份运行 LXTerminal 需要进行身份验证。</message>
+ <message xml:lang="zh_TW">要以 root 身份執行 LXTerminal 需要認證。</message>
+ <defaults>
+ <allow_any>no</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/lxterminal</annotate>
+ <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+
+</policyconfig>
diff --git a/lubuntu/org.lxde.pcmanfm.policy b/lubuntu/org.lxde.pcmanfm.policy
new file mode 100644
index 0000000000000000000000000000000000000000..4a02df4f9dfda96013d4b0e256e2d5e01312a82e
--- /dev/null
+++ b/lubuntu/org.lxde.pcmanfm.policy
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  
+
+ <vendor>PCManFM</vendor>
+ <vendor_url>http://lxde.org/</vendor_url>
+ <icon_name>system-file-manager</icon_name>
+
+
+ <action id="org.lxde.pcmanfm">
+ 
+ <description>Run PCManFM as root</description>
+ <description xml:lang="ar">شغل ثونار كجذر</description>
+ <description xml:lang="ast">Executar PCManFM como root</description>
+ <description xml:lang="bg">Стартирай PCManFM като администратор</description>
+ <description xml:lang="cs">Spustit PCManFM jako root</description>
+ <description xml:lang="da">Kør PCManFM med rodrettigheder</description>
+ <description xml:lang="de">PCManFM als Systemverwalter starten</description>
+ <description xml:lang="el">Εκτέλεση PCManFM ως διαχειριστής</description>
+ <description xml:lang="en_AU">Run PCManFM as root</description>
+ <description xml:lang="es">Iniciar PCManFM como superusuario</description>
+ <description xml:lang="fi">Käynnistä PCManFM pääkäyttäjän oikeuksin.</description>
+ <description xml:lang="fr">Lancer PCManFM en tant que root</description>
+ <description xml:lang="gl">Executar PCManFM como administrador</description>
+ <description xml:lang="he">הרץ את PCManFM בתור שורש</description>
+ <description xml:lang="hr">Pokreni PCManFM kao root korisnik</description>
+ <description xml:lang="hu">PCManFM futtatása rendszergazdaként</description>
+ <description xml:lang="is">Keyra PCManFM sem kerfisstjóri (root)</description>
+ <description xml:lang="it">Esegui PCManFM come amministratore</description>
+ <description xml:lang="ja">root で PCManFM を起動</description>
+ <description xml:lang="kk">PCManFM-ды әкімші ретінде орындау</description>
+ <description xml:lang="ko">Root 권한으로 PCManFM 작동</description>
+ <description xml:lang="lt">Vykdyti PCManFM administratoriaus teisėmis</description>
+ <description xml:lang="ms">Jalankan PCManFM sebagai root</description>
+ <description xml:lang="nb">Kjør PCManFM som root</description>
+ <description xml:lang="nl">PCManFM draaien met rootbevoegdheid</description>
+ <description xml:lang="pl">Uruchom PCManFM jako root</description>
+ <description xml:lang="pt">Executar PCManFM como root</description>
+ <description xml:lang="pt_BR">Rodar PCManFM como superusuário</description>
+ <description xml:lang="ro">Pornește PCManFM ca root</description>
+ <description xml:lang="ru">Запустить PCManFM от суперпользователя</description>
+ <description xml:lang="sk">Spustiť PCManFM ako root</description>
+ <description xml:lang="sr">Покрени Тунара са кореним овлашћењима</description>
+ <description xml:lang="th">เรียกทำงาน PCManFM ในฐานะ root</description>
+ <description xml:lang="tr">PCManFM'ı root olarak çalıştır</description>
+ <description xml:lang="uk">Запустити PCManFM з правами суперкористувача</description>
+ <description xml:lang="zh_CN">以 root 身份运行 PCManFM</description>
+ <description xml:lang="zh_TW">以 root 身份執行 PCManFM</description>
+ <message>Authentication is required to run PCManFM as root.</message>
+ <message xml:lang="ast">Ríquese l'autenticación pa executar PCManFM como root.</message>
+ <message xml:lang="bg">Изисква се удостоверяване за да стартирате PCManFM като администратор</message>
+ <message xml:lang="cs">Pro spuštění aplikace PCManFM jako root se vyžaduje autentizace.</message>
+ <message xml:lang="da">Der kræves godkendelse for at køre PCManFM som root.</message>
+ <message xml:lang="de">Legitimierung wird benötigt, um PCManFM als Systemverwalter zu starten.</message>
+ <message xml:lang="el">Απαιτείται πιστοποίηση για εκτέλεση του PCManFM ως διαχειριστής.</message>
+ <message xml:lang="en_AU">Authentication is required to run PCManFM as root.</message>
+ <message xml:lang="es">Es necesario autentificarse para iniciar PCManFM como superusuario.</message>
+ <message xml:lang="fi">Jotta PCManFM voidaan käynnistää pääkäyttäjän oikeuksin, todennus tarvitaan.</message>
+ <message xml:lang="fr">Une authentification est requise pour lancer PCManFM en tant que root.</message>
+ <message xml:lang="gl">Requírese autenticación para executar PCManFM como administrador</message>
+ <message xml:lang="he">נדרש אימות כדי להריץ את PCManFM בתור שורש.</message>
+ <message xml:lang="hr">Potrebna je provjera za pokretanje PCManFMa kao root.</message>
+ <message xml:lang="hu">A PCManFM rendszergazdai futtatásához hitelesítés szükséges.</message>
+ <message xml:lang="is">Auðkenningar er krafist til að keyra PCManFM sem kerfisstjóri (root)</message>
+ <message xml:lang="it">Per eseguire PCManFM come amministratore è richiesta l'autenticazione</message>
+ <message xml:lang="ja">root で PCManFM を起動するには認証が必要です。</message>
+ <message xml:lang="kk">PCManFM-ды әкімші ретінде орындау үшін аутентификация керек.</message>
+ <message xml:lang="ko">Root 권한으로 PCManFM를 작동하려면 인증이 필요합니다.</message>
+ <message xml:lang="lt">PCManFM vykdymui administratoriaus teisėmis, reikalingas tapatybės nustatymas.</message>
+ <message xml:lang="ms">Pengesahihan diperlukan untuk jalankan PCManFM sebagai root.</message>
+ <message xml:lang="nb">Identitetsbekreftelse kreves for å kjøre PCManFM som root.</message>
+ <message xml:lang="nl">Authenticatie is vereist om PCManFM met rootbevoegdheid te draaien.</message>
+ <message xml:lang="pl">Wymagane jest uwierzytelnienie, aby uruchomić program PCManFM w trybie administratora.</message>
+ <message xml:lang="pt">Autenticação necessária para executar PCManFM como root.</message>
+ <message xml:lang="pt_BR">Autenticação é requerida para rodar PCManFM como superusuário.</message>
+ <message xml:lang="ro">Pentru a porni PCManFM ca root este nevoie de autentificare.</message>
+ <message xml:lang="ru">Требуется аутентификация для запуска PCManFM от суперпользователя</message>
+ <message xml:lang="sk">Na spustenie PCManFMu ako root je potrebná autentifikácia.</message>
+ <message xml:lang="sr">Потребна је потврда овлашћења ради покретања Тунара под кореним овлашћењима</message>
+ <message xml:lang="th">ต้องยืนยันตัวบุคคลก่อนเรียกทำงาน PCManFM ในฐานะ root</message>
+ <message xml:lang="tr">PCManFM'ı root olarak çalıştırmak için kimlik doğrulaması gereklidir</message>
+ <message xml:lang="uk">Вимагається розпізнавання для запуску PCManFM з правами суперкористувача.</message>
+ <message xml:lang="zh_CN">以 root 身份运行 PCManFM 需要进行身份验证。</message>
+ <message xml:lang="zh_TW">要以 root 身份執行 PCManFM 需要認證。</message>
+ <defaults>
+ <allow_any>auth_admin</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/pcmanfm</annotate>
+ <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+
+</policyconfig>
diff --git a/lubuntu/pcmanfm-pkexec b/lubuntu/pcmanfm-pkexec
new file mode 100755
index 0000000000000000000000000000000000000000..db759d4c89c5aaf40d616849be403b2165664b7a
--- /dev/null
+++ b/lubuntu/pcmanfm-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/pcmanfm" "$@"
diff --git a/lubuntu/terminal-as-root.desktop b/lubuntu/terminal-as-root.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..40695f340077816d90e9a6e815ca5917c41fda9e
--- /dev/null
+++ b/lubuntu/terminal-as-root.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Action
+Profiles=profile-folder;
+Name[pt_BR]=Abrir a pasta atual no terminal como administrador
+Name[en_US]=Open current folder in terminal As Root
+Name[en]=Open current folder in terminal As Root
+Name[C]=Open current folder in terminal As Root
+Tooltip[pt_BR]=Abrir a pasta atual no terminal com privilégios administrativos
+Tooltip[en_US]=Open current folder in terminal As Root
+Tooltip[en]=Open current folder in terminal As Root
+Tooltip[C]=Open current folder in terminal As Root
+ToolbarLabel[pt_BR]=Abrir a pasta atual no terminal como administrador
+ToolbarLabel[en_US]=Open current folder in terminal As Root
+ToolbarLabel[en]=Open current folder in terminal As Root
+ToolbarLabel[C]=Open current folder in terminal As Root
+
+Icon=utilities-terminal
+
+[X-Action-Profile profile-folder]
+MimeTypes=inode/directory;
+Exec=lxterminal-pkexec --working-directory=%f
diff --git a/prepare-clonezilla b/prepare-clonezilla
new file mode 100755
index 0000000000000000000000000000000000000000..e25ddb45f43bc9e57c5111285bd03050a8ac4f08
--- /dev/null
+++ b/prepare-clonezilla
@@ -0,0 +1,17 @@
+#!/bin/sh
+apt autoremove
+apt clean
+rm /etc/epoptes/server.crt
+sed -i -e 's/^.*ComputerName.*$//g' /home/freezetemplate/.wine/system.reg
+rm -rf /root/.ssh
+rm -rf /root/.bash_history
+rm -rf /home/freezetemplate/.ssh
+rm -rf /home/freezetemplate/.bash_history
+rm -rf /home/freezetemplate/.cache/upstart/*.log
+rm -rf /home/freezetemplate/.cache/xfce4/xfce4-appfinder/history
+rm -rf /home/freezetemplate/.{X,ICE}authority
+rm -rf /home/admin/.ssh
+rm -rf /home/admin/.bash_history
+rm -rf /home/admin/.cache/upstart/*.log
+rm -rf /home/admin/.cache/xfce4/xfce4-appfinder/history
+rm -rf /home/admin/.{X,ICE}authority
diff --git a/reconfigurar-rede.sh b/reconfigurar-rede.sh
index 68ed2679e617aec4ee0b57ec64c3759404d0f991..e5fc009a789169a5f8c45f93b1a492d30e283d50 100755
--- a/reconfigurar-rede.sh
+++ b/reconfigurar-rede.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
 install -m 644 systemd/cabeada.network /etc/systemd/network
+install -m 644 systemd/*.pkla /etc/polkit-1/localauthority/50-local.d
+
+install -m 644 autostart-disable-nm/*.desktop /home/freezetemplate/.config/autostart
+chown -R freezetemplate:freezetemplate /home/freezetemplate/.config/autostart
 
 if [ -n "${wifi_iface}" ]
 then
diff --git a/systemd/epoptes-client.service b/systemd/epoptes-client.service
new file mode 100644
index 0000000000000000000000000000000000000000..3284c5a63cade87c19357469f9ec34d7d347bd13
--- /dev/null
+++ b/systemd/epoptes-client.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Epoptes-client system daemon
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+EnvironmentFile=-/etc/default/epoptes-client
+ExecStartPre=/bin/sh -c "[ -s /etc/epoptes/server.crt ] || /usr/sbin/epoptes-client -c ${SERVER}"
+ExecStart=/usr/sbin/epoptes-client
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/le-nextboot-poweroff.service b/systemd/le-nextboot-poweroff.service
new file mode 100644
index 0000000000000000000000000000000000000000..abaa57dfc346b44ab036433149908545a46c96b8
--- /dev/null
+++ b/systemd/le-nextboot-poweroff.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Schedule next boot to Linux Educacional on system power off
+After=getty@tty1.service display-manager.service
+Before=systemd-halt.service systemd-poweroff.service
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/le-nextboot.conf
+ExecStart=/bin/sh -c "${LE_NEXTBOOT_ENABLE} && grub-reboot ${LE_NEXTBOOT_INDEX}"
+
+[Install]
+WantedBy=halt.target poweroff.target
diff --git a/systemd/le-nextboot-read-write.service b/systemd/le-nextboot-read-write.service
new file mode 100644
index 0000000000000000000000000000000000000000..a4c64ae0f82bf81cb206326e73751488df23ab33
--- /dev/null
+++ b/systemd/le-nextboot-read-write.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Schedule next boot to Linux Educacional on system power on
+After=local-fs.target
+Before=sysinit.target
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ENvironmentFile=/etc/le-nextboot.conf
+ExecStart=/bin/sh -c "${LE_NEXTBOOT_ENABLE} && grub-reboot ${LE_NEXTBOOT_INDEX}"
+
+[Install]
+WantedBy=sysinit.target
diff --git a/systemd/org.freedesktop.hostname1.set-hostname.pkla b/systemd/org.freedesktop.hostname1.set-hostname.pkla
new file mode 100644
index 0000000000000000000000000000000000000000..ee1e889a9853eddad6620afc309b258364dd7125
--- /dev/null
+++ b/systemd/org.freedesktop.hostname1.set-hostname.pkla
@@ -0,0 +1,6 @@
+[Allow systemd-networkd to set transient hostname from DHCP]
+Identity=unix-user:systemd-network
+Action=org.freedesktop.hostname1.set-hostname
+ResultAny=yes
+ResultInactive=yes
+ResultActive=yes
diff --git a/systemd/xorg-daemon.service b/systemd/xorg-daemon.service
index e847140954e46a1a1f6db421c19db4838c7ac066..0b406f1da481cc370b11c5ddb1e71a197fbe7fb9 100644
--- a/systemd/xorg-daemon.service
+++ b/systemd/xorg-daemon.service
@@ -2,6 +2,6 @@
 Description=Service for Xorg server at display :90
 
 [Service]
-ExecStartPre=/usr/local/bin/update-xorg-conf SM501 /etc/X11/xorg.conf.d/99-proinfo-urbano.conf /etc/X11/xorg.conf.d/99-proinfo-rural.conf
+ExecStartPre=/usr/local/bin/update-xorg-conf Silicon.Motion /etc/X11/xorg.conf.d/98-proinfo-urbano.conf /etc/X11/xorg.conf.d/98-proinfo-rural.conf
 ExecStart=/usr/local/bin/xorg-daemon :90
 SuccessExitStatus=0 1
diff --git a/tuxpaint.conf b/tuxpaint.conf
new file mode 100644
index 0000000000000000000000000000000000000000..0610b37cadf0390a578403ed275e71e82b19f03a
--- /dev/null
+++ b/tuxpaint.conf
@@ -0,0 +1,259 @@
+# /etc/tuxpaint/tuxpaint.conf
+# 
+# Configuration file for Tux Paint
+# See tuxpaint(1) or run 'tuxpaint --help' for details on using Tux Paint
+#
+# Bill Kendrick <bill@newbreedsoftware.com>
+# http://www.tuxpaint.org/
+#
+# Default distribution version last modified:
+# April 30, 2012
+# 
+# $Id: tuxpaint.conf,v 1.8 2012/04/30 16:56:28 wkendrick Exp $
+
+
+# FIXME: Add alllocalefonts, allowscreensaver, stampsize, datadir, nolockfile -bjk 2010.04.15
+
+
+# The variables described below are initially commented out.
+#
+# Most options come in pairs:
+#
+# The top examples change the default behavior
+#   (e.g., "fullscreen=yes" enables full-screen mode, while
+#   the default mode is windowed, not fullscreen.)
+#
+# The bottom examples reenable the default behavior
+#   (e.g., "windowed=yes" enables fullscreen mode.)
+#
+#   In the system-wide Tux Paint configuration file
+#     (e.g. "/etc/tuxpaint/tuxpaint.conf"
+#     or "/usr/local/etc/tuxpaint/tuxpaint.conf")
+#     the default options are redundant.
+#
+#   They are, however, useful to place in a user's personal confiugration file
+#     ("~/.tuxpaintrc"), to override any settings they don't like in the
+#     system-wide configuration file, and which they don't want to always have
+#     to override via command-line options.
+#
+# For more information, see Tux Paint's "OPTIONS" documentation file
+
+
+### Fullscreen or Windowed?
+### -----------------------
+#
+fullscreen=yes
+# windowed=yes
+
+
+### Window size / screen resolution.  (800x600 is the default.)
+### (Any size 640-or-wider by 480-or-taller should work.)
+### NOTE: This affects canvas (drawing area) size.
+### -----------------------------------------------------------
+# 
+# windowsize=800x600
+
+
+### Use native screen size when in fullscreen.
+### (Overrides 'windowsize' or default (800x600) when in fullscreen,
+### and tries to make Tux Paint fit in the current desktop resolution.)
+### -------------------------------------------------------------------
+# 
+native=yes
+
+
+### Window / screen orientation.  (Landscape (no rotation) is the default.)
+### -----------------------------------------------------------------------
+# 
+# orient=portrait
+# orient=landscape
+
+
+### Disable sound effects?
+### ----------------------
+#
+# nosound=yes
+# sound=yes
+
+
+### Disable the on-screen 'Quit' button in the toolbar?
+### ---------------------------------------------------
+### Note: Pressing the [Escape] key,
+### or clicking the window's 'Close' button will still work
+#
+# noquit=yes
+# quit=yes
+
+
+### Disable the printing feature?
+### -----------------------------
+# 
+# noprint=yes
+# print=yes
+
+
+### Restrict printing?
+### ------------------
+### For example, if 'printdelay=60',
+### the user can only print once per minute (60 seconds)
+# 
+# printdelay={SECONDS}
+# printdelay=0
+
+
+### Use stored printer configuration?
+### ---------------------------------
+#
+# printcfg=yes
+# printcfg=no
+
+
+### Use a different print command?
+### ------------------------------
+### Note: The command should expect PostScript on its STDIN (standard-in)
+### 
+### For example, to convert the image to greyscale before converting
+### to PostScript, use "pstopnm | ppmtopgm | pnmtops | lpr" as the command
+# 
+# printcommand={COMMAND}
+# printcommand=lpr
+
+
+### Paper size
+### ----------
+### Note: The size listed should be one supported by libpaper
+### From papersize(5):
+###   a3, a4, a5, b5, letter, legal, executive, note, 11x17,
+###   a0, a1, a2, a6, a7, a8, a9, a10, b0, b1, b2, b3, b4, tabloid,
+###   statement, note, halfletter, halfexecutive, folio, quarto, ledger,
+###   archA, archB, archC, archD, archE, flsa, flse, csheet, dsheet, esheet
+###   or 10x14.
+###
+### If not set, libpaper will check your $PAPER environment variable,
+### then /etc/papersize, then the default system paper size.
+#
+# papersize={PAPERSIZSE}
+# papersize=a4
+
+
+### Use the simpler shape tool? (No rotating)
+### -----------------------------------------
+# 
+# simpleshapes=yes
+# complexshapes=yes
+
+
+### Display only uppercase letters?
+### -------------------------------
+#
+# uppercase=yes
+# mixedcase=yes
+
+
+### Grab the mouse and keyboard?
+### ----------------------------
+#
+# grab=yes
+# dontgrab=yes
+
+
+### Disable [Control] key shortcuts?
+### --------------------------------
+#
+# noshortcuts=yes
+# shortcuts=yes
+
+
+### Disable wheel mouse support?
+### ----------------------------
+#
+# nowheelmouse=yes
+# wheelmouse=yes
+
+
+### Don't use special mouse pointer (cursor) shapes?
+### ------------------------------------------------
+#
+# nofancycursors=yes
+# fancycursors=yes
+
+
+### Use the keyboard to control the mouse pointer (cursor)?
+### -------------------------------------------------------
+#
+# keyboard=yes
+# mouse=yes
+
+
+### Use less graphics-intensive outlines?
+### -------------------------------------
+#
+# nooutlines=yes
+# outlines=yes
+
+
+### Disable the Stamp tool?
+### -----------------------
+#
+# nostamps=yes
+# stamps=yes
+
+
+### Disable Stamp controls (flip, mirror, size)?
+### --------------------------------------------
+# 
+# nostampcontrols=yes
+# stampcontrols=yes
+
+
+### Show mirrored stamps by default? (e.g., for those prefering right-to-left)
+### --------------------------------------------------------------------------
+#
+# mirrorstamps=yes
+# dontmirrorstamps=yes
+
+
+### Disable 'Save Over Older Picture?' Prompt
+### Always save over, instead
+### -----------------------------------------
+#
+# saveover=yes
+# saveover=ask
+
+
+### Disable 'Save Over Older Picture?' Prompt
+### Always make a new picture, instead
+### -----------------------------------------
+#
+# saveover=new
+# saveover=ask
+
+
+### Disable the 'Save' feature altogether?
+### --------------------------------------
+#
+# nosave=yes
+# save=yes
+
+
+### Save images somewhere different?
+### --------------------------------
+### Note: Window users, use the form:  savedir=C:\WINDOWS\TUXPAINT
+### Note: Actual image files will go under a subdirectory/subfolder, "saved"
+#
+# savedir=~/.tuxpaint
+
+
+### Use a different language?
+### -------------------------
+### Note: Where the language is a known language name (e.g., "spanish")
+### 
+### For a full list, see tuxpaint(1) man page, README.txt documentation,
+### or language usage output (by running the command "tuxpaint --lang help")
+#
+# lang={LANGUAGE}
+# lang=english
+
+
+# (End of configuration file)
+
diff --git a/update-xorg-conf b/update-xorg-conf
index 5761e0195522c9b8f902c425c9a628b23b315aa4..30c7fca71f327332eacfc4bf68c64f4b28371d46 100755
--- a/update-xorg-conf
+++ b/update-xorg-conf
@@ -30,7 +30,7 @@ shift
 while read -r line
 do
     address=$(echo "${line}" | awk '{ sub(/\./, ":", $1) } { print $1 }')
-    echo TN502_ADDRESS_${index} = ${address}
+    echo VIDEO_ADDRESS_${index} = ${address}
 
     for xorgconf in "${@}"
     do
diff --git a/xephyr-wrapper b/xephyr-wrapper
new file mode 100755
index 0000000000000000000000000000000000000000..615a0e2d4ae56620c3a21887cad47c9576c7bb3a
--- /dev/null
+++ b/xephyr-wrapper
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+tries=10
+export DISPLAY=${1}
+shift
+
+# This is a workaround for the case Xephyr is started before host Xorg
+# server is ready for connections, despite the socket activation.
+for i in $(seq ${tries})
+do
+  if xset q >/dev/null 2>&1
+  then
+    exec Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 ${@}
+  fi
+done
+
+exit 1
diff --git a/xorg/97-proinfo-monitores.conf b/xorg/97-proinfo-monitores.conf
new file mode 100644
index 0000000000000000000000000000000000000000..61d1a71d185c168f1309c3993304d98bf7507823
--- /dev/null
+++ b/xorg/97-proinfo-monitores.conf
@@ -0,0 +1,9 @@
+Section "Monitor"
+    Identifier "VGA Monitor"
+    Option "Enable" "true"
+EndSection
+
+Section "Monitor"
+    Identifier "LVDS Monitor"
+    Option "RightOf" "VGA Monitor"
+EndSection
diff --git a/xorg/98-proinfo-rural.conf b/xorg/98-proinfo-rural.conf
new file mode 100644
index 0000000000000000000000000000000000000000..4ab707a08aa5e606f2c896b9277895b8d9c8673a
--- /dev/null
+++ b/xorg/98-proinfo-rural.conf
@@ -0,0 +1,42 @@
+Section "Device"
+    MatchSeat "__fake-seat-2__"
+    Identifier "ThinNetworks TN-502/TN-750 PCI Video Card 1"
+    BusID "PCI:0:0:0"
+    Driver "siliconmotion"
+    Option "PanelSize" "1360x768"
+    Option "Dualhead" "true"
+    Option "monitor-LVDS" "LVDS Monitor"
+    Option "monitor-VGA" "VGA Monitor"
+EndSection
+
+Section "Device"
+    MatchSeat "__fake-seat-2__"
+    Identifier "ThinNetworks TN-502/TN-750 PCI Video Card 2"
+    BusID "PCI:0:0:0"
+    Driver "siliconmotion"
+    Option "PanelSize" "1360x768"
+    Option "Dualhead" "true"
+    Option "monitor-LVDS" "LVDS Monitor"
+    Option "monitor-VGA" "VGA Monitor"
+EndSection
+
+Section "Screen"
+    MatchSeat "__fake-seat-2__"
+    Identifier "ThinNetworks TN-502/TN-750 Screen 1"
+    Device "ThinNetworks TN-502/TN-750 PCI Video Card 1"
+    DefaultDepth 16
+EndSection
+
+Section "Screen"
+    MatchSeat "__fake-seat-2__"
+    Identifier "ThinNetworks TN-502/TN-750 Screen 2"
+    Device "ThinNetworks TN-502/TN-750 PCI Video Card 2"
+    DefaultDepth 16
+EndSection
+
+Section "ServerLayout"
+    MatchSeat "__fake-seat-2__"
+    Identifier "ThinNetworks TN-502/TN-750 Dual-Card Layout"
+    Screen 0 "ThinNetworks TN-502/TN-750 Screen 1"
+    Screen 1 "ThinNetworks TN-502/TN-750 Screen 2"
+EndSection
diff --git a/xorg/98-proinfo-urbano.conf b/xorg/98-proinfo-urbano.conf
new file mode 100644
index 0000000000000000000000000000000000000000..c7ea10a93354bd2752c55e82e0f7fd32114b20f8
--- /dev/null
+++ b/xorg/98-proinfo-urbano.conf
@@ -0,0 +1,17 @@
+Section "Device"
+    MatchSeat "__fake-seat-1__"
+    Identifier "ThinNetworks TN-502/TN-750 Video Card"
+    BusID "PCI:0:0:0"
+    Driver "siliconmotion"
+    Option "PanelSize" "1360x768"
+    Option "Dualhead" "true"
+    Option "monitor-LVDS" "LVDS Monitor"
+    Option "monitor-VGA" "VGA Monitor"
+EndSection
+
+Section "Screen"
+    MatchSeat "__fake-seat-1__"
+    Identifier "ThinNetworks TN-502/TN-750 Screen"
+    Device "ThinNetworks TN-502/TN-750 PCI Video Card"
+    DefaultDepth 16
+EndSection
diff --git a/xorg/99-seat-lvds-0.conf b/xorg/99-seat-lvds-0.conf
new file mode 100644
index 0000000000000000000000000000000000000000..80c8a4fc4f129dcbb4ecc9b2ed217349da606816
--- /dev/null
+++ b/xorg/99-seat-lvds-0.conf
@@ -0,0 +1,14 @@
+Section "Device"
+    MatchSeat "seat-L0"
+    Identifier "Nested Device 0"
+    Driver "nested"
+    Option "Display" ":90.0"
+EndSection
+
+Section "Screen"
+    MatchSeat "seat-L0"
+    Identifier "Nested Screen LVDS 0"
+    Device "Nested Device 0"
+    DefaultDepth 16
+    Option "Output" "LVDS"
+EndSection
diff --git a/xorg/99-seat-lvds-1.conf b/xorg/99-seat-lvds-1.conf
new file mode 100644
index 0000000000000000000000000000000000000000..c7b78aa7987e5af83ab35e54d0771fba31eb1058
--- /dev/null
+++ b/xorg/99-seat-lvds-1.conf
@@ -0,0 +1,14 @@
+Section "Device"
+    MatchSeat "seat-L1"
+    Identifier "Nested Device 1"
+    Driver "nested"
+    Option "Display" ":90.1"
+EndSection
+
+Section "Screen"
+    MatchSeat "seat-L1"
+    Identifier "Nested Screen LVDS 1"
+    Device "Nested Device 1"
+    DefaultDepth 16
+    Option "Output" "LVDS"
+EndSection
diff --git a/xorg/99-seat-vga-0.conf b/xorg/99-seat-vga-0.conf
new file mode 100644
index 0000000000000000000000000000000000000000..2a19db212a2c3933675e7aa561f3a238b178590b
--- /dev/null
+++ b/xorg/99-seat-vga-0.conf
@@ -0,0 +1,14 @@
+Section "Device"
+    MatchSeat "seat-V0"
+    Identifier "Nested Device 0"
+    Driver "nested"
+    Option "Display" ":90.0"
+EndSection
+
+Section "Screen"
+    MatchSeat "seat-V0"
+    Identifier "Nested Screen VGA 0"
+    Device "Nested Device 0"
+    DefaultDepth 16
+    Option "Output" "VGA"
+EndSection
diff --git a/xorg/99-seat-vga-1.conf b/xorg/99-seat-vga-1.conf
new file mode 100644
index 0000000000000000000000000000000000000000..f52b2fc6a9e107705db31994990dc3bddc2703a2
--- /dev/null
+++ b/xorg/99-seat-vga-1.conf
@@ -0,0 +1,14 @@
+Section "Device"
+    MatchSeat "seat-V1"
+    Identifier "Nested Device 1"
+    Driver "nested"
+    Option "Display" ":90.1"
+EndSection
+
+Section "Screen"
+    MatchSeat "seat-V1"
+    Identifier "Nested Screen VGA 1"
+    Device "Nested Device 1"
+    DefaultDepth 16
+    Option "Output" "VGA"
+EndSection
diff --git a/xubuntu/org.xfce.terminal.policy b/xubuntu/org.xfce.terminal.policy
new file mode 100644
index 0000000000000000000000000000000000000000..44f72b5c73874953b72d391859465db3618aa088
--- /dev/null
+++ b/xubuntu/org.xfce.terminal.policy
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  
+
+ <vendor>Terminal</vendor>
+ <vendor_url>http://xfce.org/</vendor_url>
+ <icon_name>utilities-terminal</icon_name>
+
+
+ <action id="org.xfce.terminal">
+ 
+ <description>Run Terminal as root</description>
+ <description xml:lang="ar">شغل ثونار كجذر</description>
+ <description xml:lang="ast">Executar Terminal como root</description>
+ <description xml:lang="bg">Стартирай Terminal като администратор</description>
+ <description xml:lang="cs">Spustit Terminal jako root</description>
+ <description xml:lang="da">Kør Terminal med rodrettigheder</description>
+ <description xml:lang="de">Terminal als Systemverwalter starten</description>
+ <description xml:lang="el">Εκτέλεση Terminal ως διαχειριστής</description>
+ <description xml:lang="en_AU">Run Terminal as root</description>
+ <description xml:lang="es">Iniciar Terminal como superusuario</description>
+ <description xml:lang="fi">Käynnistä Terminal pääkäyttäjän oikeuksin.</description>
+ <description xml:lang="fr">Lancer Terminal en tant que root</description>
+ <description xml:lang="gl">Executar Terminal como administrador</description>
+ <description xml:lang="he">הרץ את Terminal בתור שורש</description>
+ <description xml:lang="hr">Pokreni Terminal kao root korisnik</description>
+ <description xml:lang="hu">Terminal futtatása rendszergazdaként</description>
+ <description xml:lang="is">Keyra Terminal sem kerfisstjóri (root)</description>
+ <description xml:lang="it">Esegui Terminal come amministratore</description>
+ <description xml:lang="ja">root で Terminal を起動</description>
+ <description xml:lang="kk">Terminal-ды әкімші ретінде орындау</description>
+ <description xml:lang="ko">Root 권한으로 Terminal 작동</description>
+ <description xml:lang="lt">Vykdyti Terminal administratoriaus teisėmis</description>
+ <description xml:lang="ms">Jalankan Terminal sebagai root</description>
+ <description xml:lang="nb">Kjør Terminal som root</description>
+ <description xml:lang="nl">Terminal draaien met rootbevoegdheid</description>
+ <description xml:lang="pl">Uruchom Terminal jako root</description>
+ <description xml:lang="pt">Executar Terminal como root</description>
+ <description xml:lang="pt_BR">Rodar Terminal como superusuário</description>
+ <description xml:lang="ro">Pornește Terminal ca root</description>
+ <description xml:lang="ru">Запустить Terminal от суперпользователя</description>
+ <description xml:lang="sk">Spustiť Terminal ako root</description>
+ <description xml:lang="sr">Покрени Тунара са кореним овлашћењима</description>
+ <description xml:lang="th">เรียกทำงาน Terminal ในฐานะ root</description>
+ <description xml:lang="tr">Terminal'ı root olarak çalıştır</description>
+ <description xml:lang="uk">Запустити Terminal з правами суперкористувача</description>
+ <description xml:lang="zh_CN">以 root 身份运行 Terminal</description>
+ <description xml:lang="zh_TW">以 root 身份執行 Terminal</description>
+ <message>Authentication is required to run Terminal as root.</message>
+ <message xml:lang="ast">Ríquese l'autenticación pa executar Terminal como root.</message>
+ <message xml:lang="bg">Изисква се удостоверяване за да стартирате Terminal като администратор</message>
+ <message xml:lang="cs">Pro spuštění aplikace Terminal jako root se vyžaduje autentizace.</message>
+ <message xml:lang="da">Der kræves godkendelse for at køre Terminal som root.</message>
+ <message xml:lang="de">Legitimierung wird benötigt, um Terminal als Systemverwalter zu starten.</message>
+ <message xml:lang="el">Απαιτείται πιστοποίηση για εκτέλεση του Terminal ως διαχειριστής.</message>
+ <message xml:lang="en_AU">Authentication is required to run Terminal as root.</message>
+ <message xml:lang="es">Es necesario autentificarse para iniciar Terminal como superusuario.</message>
+ <message xml:lang="fi">Jotta Terminal voidaan käynnistää pääkäyttäjän oikeuksin, todennus tarvitaan.</message>
+ <message xml:lang="fr">Une authentification est requise pour lancer Terminal en tant que root.</message>
+ <message xml:lang="gl">Requírese autenticación para executar Terminal como administrador</message>
+ <message xml:lang="he">נדרש אימות כדי להריץ את Terminal בתור שורש.</message>
+ <message xml:lang="hr">Potrebna je provjera za pokretanje Terminala kao root.</message>
+ <message xml:lang="hu">A Terminal rendszergazdai futtatásához hitelesítés szükséges.</message>
+ <message xml:lang="is">Auðkenningar er krafist til að keyra Terminal sem kerfisstjóri (root)</message>
+ <message xml:lang="it">Per eseguire Terminal come amministratore è richiesta l'autenticazione</message>
+ <message xml:lang="ja">root で Terminal を起動するには認証が必要です。</message>
+ <message xml:lang="kk">Terminal-ды әкімші ретінде орындау үшін аутентификация керек.</message>
+ <message xml:lang="ko">Root 권한으로 Terminal를 작동하려면 인증이 필요합니다.</message>
+ <message xml:lang="lt">Terminal vykdymui administratoriaus teisėmis, reikalingas tapatybės nustatymas.</message>
+ <message xml:lang="ms">Pengesahihan diperlukan untuk jalankan Terminal sebagai root.</message>
+ <message xml:lang="nb">Identitetsbekreftelse kreves for å kjøre Terminal som root.</message>
+ <message xml:lang="nl">Authenticatie is vereist om Terminal met rootbevoegdheid te draaien.</message>
+ <message xml:lang="pl">Wymagane jest uwierzytelnienie, aby uruchomić program Terminal w trybie administratora.</message>
+ <message xml:lang="pt">Autenticação necessária para executar Terminal como root.</message>
+ <message xml:lang="pt_BR">Autenticação é requerida para rodar Terminal como superusuário.</message>
+ <message xml:lang="ro">Pentru a porni Terminal ca root este nevoie de autentificare.</message>
+ <message xml:lang="ru">Требуется аутентификация для запуска Terminal от суперпользователя</message>
+ <message xml:lang="sk">Na spustenie Terminalu ako root je potrebná autentifikácia.</message>
+ <message xml:lang="sr">Потребна је потврда овлашћења ради покретања Тунара под кореним овлашћењима</message>
+ <message xml:lang="th">ต้องยืนยันตัวบุคคลก่อนเรียกทำงาน Terminal ในฐานะ root</message>
+ <message xml:lang="tr">Terminal'ı root olarak çalıştırmak için kimlik doğrulaması gereklidir</message>
+ <message xml:lang="uk">Вимагається розпізнавання для запуску Terminal з правами суперкористувача.</message>
+ <message xml:lang="zh_CN">以 root 身份运行 Terminal 需要进行身份验证。</message>
+ <message xml:lang="zh_TW">要以 root 身份執行 Terminal 需要認證。</message>
+ <defaults>
+ <allow_any>no</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/xfce4-terminal</annotate>
+ <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+
+</policyconfig>
diff --git a/xubuntu/uca.xml b/xubuntu/uca.xml
new file mode 100644
index 0000000000000000000000000000000000000000..27e19cad17e7fbe533e0f7ecb55b3b951a9db4bd
--- /dev/null
+++ b/xubuntu/uca.xml
@@ -0,0 +1,48 @@
+<?xml encoding="UTF-8" version="1.0"?>
+<actions>
+<action>
+	<icon>utilities-terminal</icon>
+	<name>Abra o Emulador de Terminal aqui</name>
+	<unique-id>1461173151717256-1</unique-id>
+	<command>xfce4-terminal --working-directory %f</command>
+	<description>Abre um emulador de terminal nesta pasta</description>
+	<patterns>*</patterns>
+	<directories/>
+</action>
+<action>
+	<icon>utilities-terminal</icon>
+	<name>Abra o Emulador de Terminal aqui (com privilégios administrativos)</name>
+	<unique-id>1462472571145703-7</unique-id>
+	<command>pkexec xfce4-terminal --working-directory %f</command>
+	<description>Abre um emulador de terminal nesta pasta como root</description>
+	<patterns>*</patterns>
+	<directories/>
+</action>
+<action>
+	<icon>filefind</icon>
+	<name>Localizar nesta pasta</name>
+	<unique-id>1461173151717332-2</unique-id>
+	<command>catfish --path=%f</command>
+	<description>Procurar arquivos dentro desta pasta</description>
+	<patterns>*</patterns>
+	<directories/>
+</action>
+<action>
+	<icon>system-file-manager</icon>
+	<name>Abrir esta pasta com privilégios administrativos</name>
+	<unique-id>1462472627191725-8</unique-id>
+	<command>pkexec thunar %f</command>
+	<description>Abre a pasta selecionada com privilégios administrativos</description>
+	<patterns>*</patterns>
+	<directories/>
+</action>
+<action>
+	<icon>accessories-text-editor</icon>
+	<name>Editar este aquivo com privilégios administrativos</name>
+	<unique-id>1462472637607390-9</unique-id>
+	<command>pkexec mousepad %f</command>
+	<description>Abre o arquivo selecionado em um editor com privilégios administrativos</description>
+	<patterns>*</patterns>
+	<text-files/>
+</action>
+</actions>