layout fixes, indentation and small typo fixes

customization/dark-theme.md

@@ -18,7 +18,7 @@ The image below shows the default light theme after installation.
 This is the result after applying the steps described here.
 ![end result dark theme](/attachment/wiki/Dark-Theme/kde-end-result.png)
 
-1 - Change `Workspace Appearance`
+1. Change `Workspace Appearance`
 
     1. Open the `Workspace Appearance` window
 
@@ -32,7 +32,7 @@ This is the result after applying the steps described here.
 
     3. Select `Oxygen` and `Apply` the change
 
-2 - (Optional) Remove blue glowing task items
+2. (Optional) Remove blue glowing task items
 
     ![blue glowing task bar items](/attachment/wiki/Dark-Theme/kde-taskbar-blue-glowing-border.png)
 
@@ -50,14 +50,12 @@ This is the result after applying the steps described here.
 
         ![task bar items blue glowing removed](/attachment/wiki/Dark-Theme/kde-taskbar-blue-glowing-removed.png)
 
-3 - Change `Application Appearance`
+3. Change `Application Appearance`
 
     1. Open the `Application Appearance` window
 
-
             Qubes Menu -> System Tools -> System Settings -> Application Appearance
 
-
     2. Go to `Colors`
 
         ![colors tab](/attachment/wiki/Dark-Theme/kde-app-appearance-menu-colors.png)
@@ -72,7 +70,7 @@ This is the result after applying the steps described here.
 
         ![result black Qubes Manager](/attachment/wiki/Dark-Theme/kde-black-qubes-manager.png)
 
-**Note:** Chaning the `Window Decorations` from `Plastik for Qubes` will remove the border color and the VM name. The problem with `Plastik for Qubes` is it does not overwrite the background and text color for Minimize, Maximize and Close buttons. The three button are therefor hard to read.
+**Note:** Chaning the `Window Decorations` from `Plastik for Qubes` will remove the border color and the VM name. The problem with `Plastik for Qubes` is, that it does not overwrite the background and text color for Minimize, Maximize and Close buttons. The three button are therefor hard to read.
 
 Dark XCFE in Dom0
 -----------------
@@ -85,7 +83,7 @@ The image below shows the default light theme after installation.
 This is the result after applying the steps described here.
 ![end result dark theme](/attachment/wiki/Dark-Theme/xfce-end-result.png)
 
-1 - Change Appearance
+1. Change Appearance
 
     1. Open the `Appearance` dialog
 
@@ -97,7 +95,7 @@ This is the result after applying the steps described here.
 
     **Note:** The black appearance theme `Xfce-dusk` makes the VM names in the `Qubes OS Manager` unreadable.
 
-2 - *(Optional)* Change Window Manager Style
+2. *(Optional)* Change Window Manager Style
 
     1. Open the `Window Manager` dialog
 
@@ -120,23 +118,23 @@ The advantage of creating a dark themed Template VM is, that each AppVM which is
 
 **Note:** Gnome-Tweak-Tool crashes under Archlinux. A workaround is to assign the AppVM to another TemplateVM (Debian, Fedora) which has Gnome-Tweak-Tool installed. Start the AppVM and configure the settings. Shutdown the machine and switch the template VM back to Archlinux.
 
-0 - Start VM
+1. Start VM
 
     **Note:** In case of App VM start the Template on which the AppVM is based on.
 
-1 - Install `Gnome-Tweak-Tool`
+2. Install `Gnome-Tweak-Tool`
 
-1. Fedora
+    - Fedora
 
             sudo dnf install gnome-tweak-tool
 
-2. Debian
+    - Debian
 
             sudo apt-get install gnome-tweak-tool
 
-2 - *(Only AppVM)* Stop template and start AppVM
+3. *(Only AppVM)* Stop template and start AppVM
 
-3 - Add `Gnome-Tweak-Tool` to the Application Menu
+4. Add `Gnome-Tweak-Tool` to the Application Menu
 
     1. `Right-click` on VM entry in `Qubes VM Manager` select `Add/remove app shortcuts`
 
@@ -144,7 +142,7 @@ The advantage of creating a dark themed Template VM is, that each AppVM which is
 
         ![Application Dialog](/attachment/wiki/Dark-Theme/dialog-add-gnome-tweak-tool.png)
 
-4 - Enable `Global Dark Theme`
+5. Enable `Global Dark Theme`
 
     1. *Debian only*
 
@@ -157,7 +155,7 @@ The advantage of creating a dark themed Template VM is, that each AppVM which is
 
         ![Global Dark Theme enabled](/attachment/wiki/Dark-Theme/gnome-tweak-tool.png)
 
-5 - *(Optional)* Modify Firefox
+6. *(Optional)* Modify Firefox
 
     **Note:** Firefox uses GTK style settings by default. This can create side effects such as unusable forms or search fields. There are two different ways to avoid this. Either by using a add-on or by overwriting the defaults.
 
@@ -167,18 +165,18 @@ The advantage of creating a dark themed Template VM is, that each AppVM which is
 
             sed -i.bak "s/Exec=firefox %u/Exec=bash -c 'GTK_THEME=Adwaita:light firefox %u'/g" /usr/share/applications/firefox.desktop
 
-6 - Restart VM or all application
+7. Restart VM or all application
 
 Manually
 --------
 
 Manually works for Debian, Fedora and Archlinux.
 
-0 - Start VM
+1. Start VM
 
     **Note:** In case of App VM start the Template on which the AppVM is based on.
 
-1 - Enable `Global Dark Theme`
+2. Enable `Global Dark Theme`
 
         cd ~/.config/
         mkdir gtk-3.0
@@ -190,4 +188,4 @@ add the following lines to `settings.ini`
         [Settings]
         gtk-application-prefer-dark-theme=1
 
-2 - follow step 5 and 6 in: Using `Gnome-Tweak-Tool`
+3. follow step 6 and 7 in: Using `Gnome-Tweak-Tool`

managing-os/pentesting.md

@@ -8,15 +8,15 @@ permalink: /doc/pentesting/
 
 The usage of penetration testing tools outside your own laboratory environment requires the permission of the organization you attack. Penetration testing without such a permission can have legal consequences.
 
-To avoid such legal conflicts please refer to the [Code of Ethics](https://www.eccouncil.org/Support/code-of-ethics).
+To avoid such legal conflicts please refer to the [EC-Council: Code of Ethics](https://www.eccouncil.org/Support/code-of-ethics).
 
 Penetration Testing
 ===================
 
 "A penetration test, informally pen test, is an attack on a computer system that looks for security weaknesses, potentially gaining access to the computer's features and data." (source [Penetration test](https://en.wikipedia.org/wiki/Penetration_test)).
 
-Penetration Testing Distributions:
+Penetration Testing Distributions
-----------------------------------
+---------------------------------
 
 The following install instructions explain how to setup a penetration testing distribution within Qubes OS.  
 
@@ -27,7 +27,4 @@ The following install instructions explain how to setup a penetration testing di
 Using Qubes OS to host a "hacking" laboratory
 ---------------------------------------------
 
-Qubes OS is a hypervisor based operating system. Qubes OS can various operating systems such as Linux, Unix or Windows in parallel. Qubes OS can therefor be used to host your own "hacking" laboratory.
+Qubes OS is a hypervisor based operating system. Qubes OS can host various operating systems such as Linux, Unix or Windows and run them parallel. Qubes OS can therefor be used to host your own "hacking" laboratory.
-
-- [Creating and Using HVM Domains](/doc/hvm-create/)
-- [Templates](/doc/templates/)

managing-os/pentesting/blackarch.md

@@ -23,29 +23,25 @@ How to Create a BlackArch VM
 Create ArchLinux Based BlackArch Template
 -----------------------------------------
 
-0 - Create ArchlLinux Template
+1. Create ArchlLinux Template
 
     - Follow the [Archlinux Template instructions](/doc/templates/archlinux/)
 
-1 - Update Template
 
-~~~
+2. Update Template
+
         sudo pacman -Syyu
-~~~
 
-2 - Clone template
+3. Clone template
 
     1. Via Qubes VM Manager
 
     2. Via command line
 
-   ~~~
             qvm-clone archlinux blackarch
-   ~~~
 
-3 - Install BlackArch repository
+4. Install BlackArch repository
 
-~~~
         $ curl -O https://blackarch.org/strap.sh
 
         # The SHA1 sum should match: 86eb4efb68918dbfdd1e22862a48fda20a8145ff
@@ -56,19 +52,15 @@ $ chmod +x strap.sh
 
         # Run strap.sh
         $ sudo ./strap.sh
-~~~
 
-4 - Install tools
+5. Install tools
 
     - install all tools
 
-    ~~~
             sudo pacman -S blackarch
-    ~~~
 
     - or by category:
 
-    ~~~
             # list available categories
             pacman -Sg | grep blackarch
 
@@ -77,11 +69,9 @@ $ sudo ./strap.sh
 
             # example
             sudo pacman -S blackarch-forensic
-    ~~~
 
     - or specific tool
 
-    ~~~
             # Search for tool
             pacman -Ss <tool-name>
 
@@ -91,9 +81,8 @@ $ sudo ./strap.sh
             # Example
             pacman -Ss burpsuite
             sudo pacman -S burpsuite
-    ~~~
 
-5 - Create a AppVMs based on the `ptf` template
+6. Create a AppVMs based on the `ptf` template
 
     - (Optional) Attach necessary devices
 
@@ -102,3 +91,4 @@ Alternative Options to BlackArch
 
 - [Kali](/doc/kali/)
 - [PenTester Framework (PTF)](/doc/ptf/)
+- [Pentesting](/doc/pentesting/)

managing-os/pentesting/kali.md

@@ -24,29 +24,25 @@ There are multiple ways to create a Kali Linux VM. One way is to create a HVM an
 Kali Linux HVM
 --------------
 
-0 - Download the Kali installation DVD
+1. Download the Kali installation DVD
 
-1 - Create a new HVM
+2. Create a new HVM
 
-2 - Start the HVM with attached CD/DVD
+3. Start the HVM with attached CD/DVD
 
-~~~
         qvm-start <hvm-name> --cdrom <vm-name>:/home/user/Downloads/<iso-name>.iso
-~~~
 
 Create Debian Based Kali Template
 ---------------------------------
 
-0 - (Optional) Install `debian-8` template (if not already installed)
+1. *(Optional)* Install `debian-8` template (if not already installed)
 
-1 - Update your `debian-8` template
+2. Update your `debian-8` template
 
-~~~
         sudo apt-get update
         sudo apt-get dist-upgrade
-~~~
 
-2 - Clone `debian-8` template (two options)
+3. Clone `debian-8` template (two options)
 
     1. Via Qubes VM Manager
 
@@ -54,67 +50,54 @@ sudo apt-get dist-upgrade
 
     2. Via command line
 
-    ~~~
             qvm-clone debian-8 kali
-    ~~~
 
-3 - Start and upgrade the `kali` Template from Debian 8 to Debian 9
+4. Start and upgrade the `kali` Template from Debian 8 to Debian 9
 
-~~~
+        sudo sed -i 's/jessie/stretch/g' /etc/apt/sources.list
-user@kali:~$ sudo sed -i 's/jessie/stretch/g' /etc/apt/sources.list
+        sudo sed -i 's/jessie/stretch/g' /etc/apt/sources.list.d/qubes-r3.list
-user@kali:~$ sudo sed -i 's/jessie/stretch/g' /etc/apt/sources.list.d/qubes-r3.list
+        sudo apt-get update
-user@kali:~$ sudo apt-get update
+        sudo apt-get dist-upgrade
-user@kali:~$ sudo apt-get dist-upgrade
+        sudo apt-get autoremove
-user@kali:~$ sudo apt-get autoremove
-~~~
 
-NOTICE: From now on there are two possible ways either doing everything manually or automatically with [Katoolin](https://github.com/LionSec/katoolin).
+    **Note:** From now on there are two possible ways either doing everything manually or automatically with [Katoolin](https://github.com/LionSec/katoolin).
 
     Katoolin is a script (written in Python) which helps you to install Kali tools.
 
-4 *manually* - Add Kali Linux repositories
+5. *manually* - Add Kali Linux repositories
 
     1. Add Kali Linux repositories to `/etc/apt/sources.list`
 
-  ~~~
             deb http://http.kali.org/kali kali-rolling main contrib non-free
             deb http://repo.kali.org/kali kali-bleeding-edge main
-  ~~~
 
     2. Add kali signing key
 
         - The signing key can be found here [Download Kali Linux Images Securely](https://www.kali.org/downloads/)
 
-      ~~~
                 sudo apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys 7D8D0BF6
                 sudo apt-get update
-      ~~~
 
 
 
-4 *katoolin* - Install Katoolin and add Kali Linux repositories
+6. *katoolin* - Install Katoolin and add Kali Linux repositories
 
     1. Install Katoolin
 
-  ~~~
             sudo apt-get install git
             git clone https://github.com/LionSec/katoolin.git
             sudo cp katoolin/katoolin.py /usr/bin/katoolin
             sudo chmod +x /usr/bin/katoolin
             rm -rf katoolin
-  ~~~
 
     2. Add Kali Linux repositories
 
         - start katoolin
 
-      ~~~
                 sudo katoolin
-      ~~~
 
         - select 'Add Kali repositories & Update'
 
-      ~~~
                 1) Add Kali repositories & Update
                 2) View Categories
                 3) Install classicmenu indicator
@@ -122,103 +105,79 @@ Katoolin is a script (written in Python) which helps you to install Kali tools.
                 5) Help
 
                 kat > 1
-      ~~~
 
             ![Add Kali repositories and Update menu](/attachment/wiki/Kali/katoolin-add-update-repo-menu.png)
 
         - select 'Add kali linux repositories'
 
-      ~~~
                 1) Add kali linux repositories
                 2) Update
                 3) Remove all kali linux repositories
                 4) View the contents of sources.list file
 
                 What do you want to do ?> 1
-      ~~~
 
             ![Add Kali repositories](/attachment/wiki/Kali/katoolin-add-repos-menu.png)
 
         - update Kali repositories
 
-      ~~~
+
                 1) Add kali linux repositories
                 2) Update
                 3) Remove all kali linux repositories
                 4) View the contents of sources.list file
 
                 What do you want to do ?> 2
-      ~~~
 
         - quit katoolin by pressing `CRTL` + `c` keys
 
-      ~~~
                 What do you want to do ?> ^CShutdown requested...Goodbye...
-      ~~~
 
-5 - Cleanup and update `kali` template
+7. Cleanup and update `kali` template
 
-~~~
     sudo apt-get dist-upgrade
     sudo apt-get autoremove
-~~~
 
-
+8. Shutdown and trim `kali` template
-6 - Shutdown and trim `kali` template
 
     - Shutdown `kali` template
 
-    ~~~
             sudo shutdown -h now
-    ~~~
 
     - In `dom0` console:
 
-    ~~~
             qvm-trim-template kali
-    ~~~
 
-7 - Start image
+9. Start image
 
-8 *manually* - Install tools
+10. *manually* - Install tools
 
     **Warning:** `kali-linux` and `kali-linux-full` does currently not work properly. Please use `Katoolin` or `PTF`.
 
     1. List available packages
 
-    ~~~
             sudo apt-cache search kali-linux
-    ~~~
 
     2. Select and install tools
 
         - install base system
 
-      ~~~
                 sudo apt-get install kali-linux
-      ~~~
 
         - or install all tools
 
-      ~~~
                 sudo apt-get install kali-linux-full
-      ~~~
 
         - or select specific (example):
 
-      ~~~
                 sudo apt-get install kali-linux-top10 kali-linux-web
-      ~~~
+11. *katoolin* - Install tools
-
-8 *katoolin* - Install tools
 
     1. View Categories
 
         - start katoolin
 
-      ~~~
                 sudo katoolin
-      ~~~
 
         - select `2) View Categories`
 
@@ -228,7 +187,7 @@ sudo apt-get autoremove
 
         - **Note:** The `all` option does not work for `Information Gathering`, `Web Apps`, `Forensic Tools`, `Reverse Engineering` and `Extra`.
 
-9 - Create a AppVMs based on the `kali` template
+12. Create a AppVMs based on the `kali` template
 
     - (Optional) Attach necessary devices
 
@@ -238,3 +197,4 @@ Alternative Options to Kali
 
 - [BlackArch](/doc/blackarch/)
 - [PenTester Framework (PTF)](/doc/ptf/)
+- [Pentesting](/doc/pentesting/)

managing-os/pentesting/ptf.md

@@ -24,112 +24,89 @@ PTF attempts to install all of your penetration testing tools (latest and greate
 Create Debian Based Penetration Testers Framework (PTF) Template
 ----------------------------------------------------------------
 
-1 - Create PTF template
+1. Create PTF template
+
+    1. Follow [Create Debian Based Kali Template](/doc/kali/) till step 7.
 
-  1. Follow the [Create Debian Based Kali Template](/doc/kali/) till step 7.
     2. (Optional) Rename the cloned template to `ptf`
 
-2 - Download PTF
+2. Download PTF
 
-~~~
         sudo apt-get install git
         cd /opt
         sudo git clone https://github.com/trustedsec/ptf.git
-~~~
 
     - (Optional) Configure PTF
 
         1. Go to configuration directory
 
-  ~~~
                 cd /opt/ptf/config
-  ~~~
 
         2. Edit the configuration file
 
             for example by using vim:
 
-  ~~~
                 sudo vim ptf.config
-  ~~~
 
-  The configuration options are described in the `ptf.config` file
+            the configuration options are described in the `ptf.config` file
 
-4 - Install PTF
+3. Install PTF
 
-~~~
         cd /opt/ptf
         sudo ./ptf
-~~~
 
     **Note:** the config file has to be in the same directory as the executable. It is not
 possible to do sudo ptf/ptf
 
     PTF will put itself into `/usr/local/bin/ptf`. You can use `ptf` from now on.
 
-5 - Install/Update modules (tools)
+4. Install/Update modules (tools)
 
     1. Start PTF
 
-  ~~~
             sudo ptf
-  ~~~
 
         ![PTF start banner](/attachment/wiki/PTF/ptf-banner.png)
 
     2. Show available modules (tools)
 
-  ~~~
             ptf> show modules
-  ~~~
 
     3. Install/Update modules (all/)
 
         - Install/Update all tools
 
-      ~~~
                 ptf> use modules/install_update_all
-      ~~~
 
         - or by category Install/Update
 
-      ~~~
                 ptf> use modules/code-audit/install_update_all
-      ~~~
 
         - or individually (example Metasploit)
 
             1. Search for module
 
-        ~~~
                     ptf> search metasploit
                     [*] Search results below:
                     modules/exploitation/metasploit
-        ~~~
 
             2. Use module
 
-        ~~~
                     ptf> use modules/exploitation/metasploit
                     ptf:(modules/exploitation/metasploit)>
-        ~~~
 
             3. Install module
 
-       ~~~
                     ptf:(modules/exploitation/metasploit)>install
-       ~~~
 
             4. Run Metasploit
 
-      ~~~
                     ptf:(modules/exploitation/metasploit)>exit
                     ptf> quit
                     [*] Exiting PTF - the easy pentest platform creation framework.
-      ~$ sudo msfconsole
+                    sudo msfconsole
-      ~~~
 
-6 - Create a AppVMs based on the `ptf` template
+5. Create a AppVMs based on the `ptf` template
 
     - (Optional) Attach necessary devices
 
@@ -139,3 +116,4 @@ Alternative Options to PTF
 
 - [BlackArch](/doc/blackarch/)
 - [Kali](/doc/kali/)
+- [Pentesting](/doc/pentesting/)