diff --git a/apk/spoc b/apk/spoc
index ffa0927..4e7921e 160000
--- a/apk/spoc
+++ b/apk/spoc
@@ -1 +1 @@
-Subproject commit ffa0927119374532eda8a576438740039e7b42f5
+Subproject commit 4e7921e85dfc7b66667ceb1d9a5da840a757a5a4
diff --git a/apk/vmmgr b/apk/vmmgr
index cf629dc..43f55e5 160000
--- a/apk/vmmgr
+++ b/apk/vmmgr
@@ -1 +1 @@
-Subproject commit cf629dc6d1343b4c8e0b7719d4e232979648fd6f
+Subproject commit 43f55e59172836e8f7a1390fac82a1070b4660c4
diff --git a/extra/myip.php b/extra/myip.php
index 5e172e8..439471b 100644
--- a/extra/myip.php
+++ b/extra/myip.php
@@ -1,2 +1,2 @@
-<?php
-echo $_SERVER['REMOTE_ADDR'];
+<?php
+echo $_SERVER['REMOTE_ADDR'];
diff --git a/lxc-apps/ckan/install/adminpwd.sql b/lxc-apps/ckan/install/adminpwd.sql
index 94c5806..03ebd42 100644
--- a/lxc-apps/ckan/install/adminpwd.sql
+++ b/lxc-apps/ckan/install/adminpwd.sql
@@ -1 +1 @@
-INSERT INTO public.user (id, name, apikey, created, about, password, fullname, email, reset_key, sysadmin, activity_streams_email_notifications, state) VALUES ('${CKAN_ADMIN_UUID}', '${CKAN_ADMIN_USER}', '${CKAN_ADMIN_APIKEY}', NOW(), NULL, '${CKAN_ADMIN_HASH}', NULL, '${CKAN_ADMIN_EMAIL}', NULL, TRUE, FALSE, 'active');
+INSERT INTO public.user (id, name, apikey, created, about, password, fullname, email, reset_key, sysadmin, activity_streams_email_notifications, state) VALUES ('${CKAN_ADMIN_UUID}', '${CKAN_ADMIN_USER}', '${CKAN_ADMIN_APIKEY}', NOW(), NULL, '${CKAN_ADMIN_HASH}', NULL, '${CKAN_ADMIN_EMAIL}', NULL, TRUE, FALSE, 'active');
diff --git a/lxc-apps/ckan/install/createdb.sql b/lxc-apps/ckan/install/createdb.sql
index ab71432..e5a166c 100644
--- a/lxc-apps/ckan/install/createdb.sql
+++ b/lxc-apps/ckan/install/createdb.sql
@@ -1,16 +1,16 @@
-CREATE ROLE ckan NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_PWD}';
-CREATE ROLE ckan_datastore NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_DS_PWD}';
-
-CREATE DATABASE ckan;
-REVOKE ALL ON DATABASE ckan FROM public;
-ALTER DATABASE ckan OWNER TO ckan;
-
-CREATE DATABASE ckan_datastore;
-REVOKE ALL ON DATABASE ckan_datastore FROM public;
-GRANT CONNECT, CREATE, TEMPORARY ON DATABASE ckan_datastore TO ckan;
-ALTER DATABASE ckan_datastore OWNER TO ckan_datastore;
-
-\c ckan
-CREATE EXTENSION postgis;
-GRANT ALL ON geometry_columns TO ckan;
-GRANT ALL ON spatial_ref_sys TO ckan;
+CREATE ROLE ckan NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_PWD}';
+CREATE ROLE ckan_datastore NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_DS_PWD}';
+
+CREATE DATABASE ckan;
+REVOKE ALL ON DATABASE ckan FROM public;
+ALTER DATABASE ckan OWNER TO ckan;
+
+CREATE DATABASE ckan_datastore;
+REVOKE ALL ON DATABASE ckan_datastore FROM public;
+GRANT CONNECT, CREATE, TEMPORARY ON DATABASE ckan_datastore TO ckan;
+ALTER DATABASE ckan_datastore OWNER TO ckan_datastore;
+
+\c ckan
+CREATE EXTENSION postgis;
+GRANT ALL ON geometry_columns TO ckan;
+GRANT ALL ON spatial_ref_sys TO ckan;
diff --git a/lxc-apps/crisiscleanup/install/cc_conf/secrets.yml b/lxc-apps/crisiscleanup/install/cc_conf/secrets.yml
index 7c00802..0f7a99b 100644
--- a/lxc-apps/crisiscleanup/install/cc_conf/secrets.yml
+++ b/lxc-apps/crisiscleanup/install/cc_conf/secrets.yml
@@ -1,2 +1,2 @@
-production:
-  secret_key_base: ${CRISISCLEANUP_SECRET}
+production:
+  secret_key_base: ${CRISISCLEANUP_SECRET}
diff --git a/lxc-apps/cts/image b/lxc-apps/cts/image
index 1114f84..7d64476 100644
--- a/lxc-apps/cts/image
+++ b/lxc-apps/cts/image
@@ -34,7 +34,7 @@ RUN EOF
     rm -rf /root/.cache
 EOF
 
-COPY lxc
+COPY image.d
 
 ENV DJANGO_SETTINGS_MODULE cts.settings.spotter
 WORKDIR /srv/cts
diff --git a/lxc-apps/cts/lxc/etc/nginx/nginx.conf b/lxc-apps/cts/image.d/etc/nginx/nginx.conf
similarity index 100%
rename from lxc-apps/cts/lxc/etc/nginx/nginx.conf
rename to lxc-apps/cts/image.d/etc/nginx/nginx.conf
diff --git a/lxc-apps/cts/lxc/etc/services.d/.s6-svscan/finish b/lxc-apps/cts/image.d/etc/services.d/.s6-svscan/finish
similarity index 100%
rename from lxc-apps/cts/lxc/etc/services.d/.s6-svscan/finish
rename to lxc-apps/cts/image.d/etc/services.d/.s6-svscan/finish
diff --git a/lxc-apps/cts/lxc/etc/services.d/cts/down-signal b/lxc-apps/cts/image.d/etc/services.d/cts/down-signal
similarity index 87%
rename from lxc-apps/cts/lxc/etc/services.d/cts/down-signal
rename to lxc-apps/cts/image.d/etc/services.d/cts/down-signal
index fc6cc59..d751378 100644
--- a/lxc-apps/cts/lxc/etc/services.d/cts/down-signal
+++ b/lxc-apps/cts/image.d/etc/services.d/cts/down-signal
@@ -1 +1 @@
-SIGINT
+SIGINT
diff --git a/lxc-apps/cts/lxc/etc/services.d/cts/run b/lxc-apps/cts/image.d/etc/services.d/cts/run
similarity index 100%
rename from lxc-apps/cts/lxc/etc/services.d/cts/run
rename to lxc-apps/cts/image.d/etc/services.d/cts/run
diff --git a/lxc-apps/cts/lxc/etc/services.d/nginx/run b/lxc-apps/cts/image.d/etc/services.d/nginx/run
similarity index 100%
rename from lxc-apps/cts/lxc/etc/services.d/nginx/run
rename to lxc-apps/cts/image.d/etc/services.d/nginx/run
diff --git a/lxc-apps/opendatakit/opendatakit-build.image.d/bin/add-ca-cert b/lxc-apps/opendatakit/opendatakit-build.image.d/bin/add-ca-cert
index 1aa7710..6d787dc 100755
--- a/lxc-apps/opendatakit/opendatakit-build.image.d/bin/add-ca-cert
+++ b/lxc-apps/opendatakit/opendatakit-build.image.d/bin/add-ca-cert
@@ -1,4 +1,4 @@
-#!/bin/sh
-
-true | openssl s_client -connect host:443 | openssl x509 -out /usr/local/share/ca-certificates/host.crt
-update-ca-certificates
+#!/bin/sh
+
+true | openssl s_client -connect host:443 | openssl x509 -out /usr/local/share/ca-certificates/host.crt
+update-ca-certificates
diff --git a/lxc-apps/opendatakit/opendatakit-build.image.d/etc/services.d/odkbuild/down-signal b/lxc-apps/opendatakit/opendatakit-build.image.d/etc/services.d/odkbuild/down-signal
index fc6cc59..d751378 100644
--- a/lxc-apps/opendatakit/opendatakit-build.image.d/etc/services.d/odkbuild/down-signal
+++ b/lxc-apps/opendatakit/opendatakit-build.image.d/etc/services.d/odkbuild/down-signal
@@ -1 +1 @@
-SIGINT
+SIGINT
diff --git a/lxc-apps/sahana/image.d/etc/services.d/uwsgi/down-signal b/lxc-apps/sahana/image.d/etc/services.d/uwsgi/down-signal
index fc6cc59..d751378 100755
--- a/lxc-apps/sahana/image.d/etc/services.d/uwsgi/down-signal
+++ b/lxc-apps/sahana/image.d/etc/services.d/uwsgi/down-signal
@@ -1 +1 @@
-SIGINT
+SIGINT
diff --git a/lxc-apps/sahana/install/sahana_data/Spotter/css.cfg b/lxc-apps/sahana/install/sahana_data/Spotter/css.cfg
index 9776edc..085b141 100644
--- a/lxc-apps/sahana/install/sahana_data/Spotter/css.cfg
+++ b/lxc-apps/sahana/install/sahana_data/Spotter/css.cfg
@@ -1,47 +1,47 @@
-../themes/default/layout.css
-../themes/default/xtheme-gray.css
-../themes/default/footer.css
-../themes/default/widgets.css
-../themes/default/shortcut.css
-../themes/default/homepage.css
-font-awesome/font-awesome.css
-plugins/jquery.cluetip.css
-plugins/jquery.dataTables.css
-plugins/jquery.dataTables.responsive.css
-plugins/jquery.tagit.css
-#ui/accordion.css
-ui/core.css
-ui/autocomplete.css
-ui/button.css
-ui/datepicker.css
-ui/dialog.css
-# Needed for Delphi
-ui/draggable.css
-ui/menu.css
-#ui/progressbar.css
-ui/resizable.css
-ui/selectmenu.css
-ui/slider.css
-#ui/sortable.css
-#ui/spinner.css
-ui/tabs.css
-#ui/tooltip.css
-ui/fgtimepicker.css
-ui/multiselect.css
-ui/timepicker-addon.css
-#calendars/ui-smoothness.calendars.picker.css
-../themes/foundation/jquery-ui.theme.css
-gis/style.css
-zocial/zocial.css
-../themes/default/gis.css
-../themes/foundation/map.css
-../themes/default/mobile.css
-../themes/default/print.css
-d3/nv.d3.css
-#../themes/default/project.css
-../themes/default/report.css
-../themes/default/survey.css
-../themes/default/newsfeed.css
-../themes/default/theme.css
-#../themes/default/style.css
-# Final line required for parsing
+../themes/default/layout.css
+../themes/default/xtheme-gray.css
+../themes/default/footer.css
+../themes/default/widgets.css
+../themes/default/shortcut.css
+../themes/default/homepage.css
+font-awesome/font-awesome.css
+plugins/jquery.cluetip.css
+plugins/jquery.dataTables.css
+plugins/jquery.dataTables.responsive.css
+plugins/jquery.tagit.css
+#ui/accordion.css
+ui/core.css
+ui/autocomplete.css
+ui/button.css
+ui/datepicker.css
+ui/dialog.css
+# Needed for Delphi
+ui/draggable.css
+ui/menu.css
+#ui/progressbar.css
+ui/resizable.css
+ui/selectmenu.css
+ui/slider.css
+#ui/sortable.css
+#ui/spinner.css
+ui/tabs.css
+#ui/tooltip.css
+ui/fgtimepicker.css
+ui/multiselect.css
+ui/timepicker-addon.css
+#calendars/ui-smoothness.calendars.picker.css
+../themes/foundation/jquery-ui.theme.css
+gis/style.css
+zocial/zocial.css
+../themes/default/gis.css
+../themes/foundation/map.css
+../themes/default/mobile.css
+../themes/default/print.css
+d3/nv.d3.css
+#../themes/default/project.css
+../themes/default/report.css
+../themes/default/survey.css
+../themes/default/newsfeed.css
+../themes/default/theme.css
+#../themes/default/style.css
+# Final line required for parsing
diff --git a/lxc-apps/sahana/install/sahana_data/Spotter/project_theme.csv b/lxc-apps/sahana/install/sahana_data/Spotter/project_theme.csv
index 385a0d9..6d9ae9e 100644
--- a/lxc-apps/sahana/install/sahana_data/Spotter/project_theme.csv
+++ b/lxc-apps/sahana/install/sahana_data/Spotter/project_theme.csv
@@ -1,30 +1,30 @@
-Name,Comments
-Capacity Development,"training and development, institutional strengthening, institutional learning"
-Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action"
-Climate Change,"adaptation to climate change, sustainable development"
-Community-based DRR,"local knowledge, local risk mapping"
-Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict"
-Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies"
-Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness"
-Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling"
-Economics of DRR,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters"
-Education & School Safety,"learning, safe schools"
-Environment,"sustainable development, environmental degradation, ecosystems and environmental management"
-Food Security & Agriculture,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasterscost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters"
-Gender,"gendered vulnerability, gender-sensitive disaster risk management"
-GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping"
-Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction"
-Health & Health Facilities,"capacity of health practitioners, mental health"
-Indigenous Knowledge,"indigenous early warning system, local adaptation for implementation, local knowledge, local skills, local technical knowledge, local knowledge systems, traditional knowledge, transferable indigenous knowledge; related: coastal zones, food security and agricultural practice, housing, mountain ecosystems, river basin management, water management"
-Information Management,"disaster databases, disaster information, disaster risk information portals, ICT"
-Media,"disaster reporting, disaster information dissemination"
-Private-public Partnerships,"corporate social responsibility, private sector engagement in DRR"
-Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter"
-Risk Identification & Assessment,"risk assessment, loss data, disaster risk management"
-Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling"
-Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention"
-Space Technology,satellite disaster imagery
-Structural Safety,"building codes, building standards, building materials, construction, retrofitting"
-Urban Risk & Planning,"urban planning, urban management"
-Vulnerable Populations,"at-risk populations, including: children, orphans, disabled, elderly, homeless, hospitalized people, illegal immigrants, illiterate, medically or chemically dependent, impoverished populations, migrants, Person With Disabilities (PWDs), speakers of non-local languages"
+Name,Comments
+Capacity Development,"training and development, institutional strengthening, institutional learning"
+Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action"
+Climate Change,"adaptation to climate change, sustainable development"
+Community-based DRR,"local knowledge, local risk mapping"
+Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict"
+Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies"
+Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness"
+Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling"
+Economics of DRR,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters"
+Education & School Safety,"learning, safe schools"
+Environment,"sustainable development, environmental degradation, ecosystems and environmental management"
+Food Security & Agriculture,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasterscost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters"
+Gender,"gendered vulnerability, gender-sensitive disaster risk management"
+GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping"
+Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction"
+Health & Health Facilities,"capacity of health practitioners, mental health"
+Indigenous Knowledge,"indigenous early warning system, local adaptation for implementation, local knowledge, local skills, local technical knowledge, local knowledge systems, traditional knowledge, transferable indigenous knowledge; related: coastal zones, food security and agricultural practice, housing, mountain ecosystems, river basin management, water management"
+Information Management,"disaster databases, disaster information, disaster risk information portals, ICT"
+Media,"disaster reporting, disaster information dissemination"
+Private-public Partnerships,"corporate social responsibility, private sector engagement in DRR"
+Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter"
+Risk Identification & Assessment,"risk assessment, loss data, disaster risk management"
+Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling"
+Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention"
+Space Technology,satellite disaster imagery
+Structural Safety,"building codes, building standards, building materials, construction, retrofitting"
+Urban Risk & Planning,"urban planning, urban management"
+Vulnerable Populations,"at-risk populations, including: children, orphans, disabled, elderly, homeless, hospitalized people, illegal immigrants, illiterate, medically or chemically dependent, impoverished populations, migrants, Person With Disabilities (PWDs), speakers of non-local languages"
 Water,"drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management"
\ No newline at end of file