From c0aff67fe55fb64532f1e605aa8b24c5f3949338 Mon Sep 17 00:00:00 2001
From: Max Chadwick <mpchadwick@gmail.com>
Date: Sat, 15 Nov 2014 22:27:23 -0500
Subject: [PATCH 1/4] Update Icb template

---
 Templates/Icb.php | 71 ++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/Templates/Icb.php b/Templates/Icb.php
index b0ade78..8ab0b34 100644
--- a/Templates/Icb.php
+++ b/Templates/Icb.php
@@ -41,7 +41,7 @@ class Template_Icb extends AbstractTemplate
      * @var string
      * @access protected
      */
-    protected $htmlBlock = '/<!--- ### --->(.*?)<!--- ### --->/is';
+    protected $htmlBlock = '/Domain Information(.*?)are issued on a first come/is';
 
     /**
 	 * Blocks within the raw output of the whois
@@ -61,39 +61,40 @@ class Template_Icb extends AbstractTemplate
 	 * @access protected
 	 */
     protected $blockItems = array(
-            1 => array('/Organization Name:\n(?>[\x20\t]*)(.+)/i' => 'contacts:owner:organization', 
-                    '/Street:\n(?>[\x20\t]*)(.+)/i' => 'contacts:owner:address', 
-                    '/City:\n(?>[\x20\t]*)(.+)/i' => 'contacts:owner:city', 
-                    '/State:\n(?>[\x20\t]*)(.+)/i' => 'contacts:owner:state', 
-                    '/Postal Code:\n(?>[\x20\t]*)(.+)/i' => 'contacts:owner:zipcode', 
-                    '/Country:\n(?>[\x20\t]*)(.+)/i' => 'contacts:owner:country', 
-                    '/Created:\n(?>[\x20\t]*)(.+)/i' => 'created', 
-                    '/Last Updated:\n(?>[\x20\t]*)(.+)/i' => 'changed', 
-                    '/Expires:\n(?>[\x20\t]*)(.+)/i' => 'expires'), 
-            2 => array('/User ID:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:handle', 
-                    '/Contact Name:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:name', 
-                    '/Organization Name:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:organization', 
-                    '/Street:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:address', 
-                    '/City:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:city', 
-                    '/State:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:state', 
-                    '/Postal Code:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:zipcode', 
-                    '/Country:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:country', 
-                    '/Phone:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:phone', 
-                    '/Fax:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:fax', 
-                    '/E-Mail:\n(?>[\x20\t]*)(.+)/i' => 'contacts:admin:email'), 
-            3 => array('/User ID:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:handle', 
-                    '/Contact Name:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:name', 
-                    '/Organization Name:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:organization', 
-                    '/Street:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:address', 
-                    '/City:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:city', 
-                    '/State:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:state', 
-                    '/Postal Code:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:zipcode', 
-                    '/Country:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:country', 
-                    '/Phone:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:phone', 
-                    '/Fax:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:fax', 
-                    '/E-Mail:\n(?>[\x20\t]*)(.+)/i' => 'contacts:tech:email'), 
-            4 => array('/Nameserver:\n(?>[\x20\t]*)(.+)/i' => 'nameserver', 
-                    '/IP Address:\n(?>[\x20\t]*)(.+)/i' => 'ips'));
+            1 => array('/Organization Name : (?>[\x20\t]*)(.+)/i' => 'contacts:owner:organization',
+                    '/Street : (?>[\x20\t]*)(.+)/i' => 'contacts:owner:address',
+                    '/City : (?>[\x20\t]*)(.+)/i' => 'contacts:owner:city',
+                    '/State : (?>[\x20\t]*)(.+)/i' => 'contacts:owner:state',
+                    '/Postal Code : (?>[\x20\t]*)(.+)/i' => 'contacts:owner:zipcode',
+                    '/Country : (?>[\x20\t]*)(.+)/i' => 'contacts:owner:country',
+                    '/First Registered : (?>[\x20\t]*)(.+)/i' => 'created',
+                    '/Last Updated : (?>[\x20\t]*)(.+)/i' => 'changed',
+                    '/Domain Status : (?>[\x20\t]*)(.+)/i' => 'status',
+                    '/Expires : (?>[\x20\t]*)(.+)/i' => 'expires'),
+            2 => array('/User ID : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:handle',
+                    '/Contact Name : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:name',
+                    '/Organization Name : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:organization',
+                    '/Street : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:address',
+                    '/City : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:city',
+                    '/State : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:state',
+                    '/Postal Code : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:zipcode',
+                    '/Country : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:country',
+                    '/Phone : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:phone',
+                    '/Fax : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:fax',
+                    '/E-Mail : (?>[\x20\t]*)(.+)/i' => 'contacts:admin:email'),
+            3 => array('/User ID : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:handle',
+                    '/Contact Name : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:name',
+                    '/Organization Name : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:organization',
+                    '/Street : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:address',
+                    '/City : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:city',
+                    '/State : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:state',
+                    '/Postal Code : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:zipcode',
+                    '/Country : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:country',
+                    '/Phone : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:phone',
+                    '/Fax : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:fax',
+                    '/E-Mail : (?>[\x20\t]*)(.+)/i' => 'contacts:tech:email'),
+            4 => array('/Name Server : (?>[\x20\t]*)(.+)/i' => 'nameserver',
+                    '/IP Address : (?>[\x20\t]*)(.+)/i' => 'ips'));
 
     /**
      * RegEx to check availability of the domain name
@@ -101,5 +102,5 @@ class Template_Icb extends AbstractTemplate
      * @var string
      * @access protected
      */
-    protected $available = '/(There is no live registration)/i';
+    protected $available = '/available for purchase/i';
 }
\ No newline at end of file

From 7dff96880632d7a10d0f3b94bffc0780c214b451 Mon Sep 17 00:00:00 2001
From: Max Chadwick <mpchadwick@gmail.com>
Date: Fri, 19 Dec 2014 21:32:04 -0500
Subject: [PATCH 2/4] Add whois.donuts.co server and map .domains TLD

---
 Config/whois.ini     |  3 ++
 Templates/Donuts.php | 65 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 Templates/Donuts.php

diff --git a/Config/whois.ini b/Config/whois.ini
index 2f7a41f..8722d28 100644
--- a/Config/whois.ini
+++ b/Config/whois.ini
@@ -169,6 +169,9 @@ dk[format] = '--charset=utf-8 --show-handles %domain%'
 dm[server] = whois.nic.dm
 dm[template] = dm
 
+domains[server] = whois.donuts.co
+domains[template] = donuts
+
 dz[server] = whois.nic.dz
 dz[template] = dz
 
diff --git a/Templates/Donuts.php b/Templates/Donuts.php
new file mode 100644
index 0000000..aaa125a
--- /dev/null
+++ b/Templates/Donuts.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Novutec Domain Tools
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @category   Novutec
+ * @package    DomainParser
+ * @copyright  Copyright (c) 2007 - 2013 Novutec Inc. (http://www.novutec.com)
+ * @license    http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+/**
+ * @namespace Novutec\WhoisParser
+ */
+namespace Novutec\WhoisParser;
+
+/**
+ * Template for Donuts
+ *
+ * @category   Novutec
+ * @package    WhoisParser
+ * @copyright  Copyright (c) 2007 - 2013 Novutec Inc. (http://www.novutec.com)
+ * @license    http://www.apache.org/licenses/LICENSE-2.0
+ */
+class Template_Donuts extends AbstractTemplate
+{
+    /**
+     * Blocks within the raw output of the whois
+     *
+     * @var array
+     * @access protected
+     */
+    protected $blocks = array(1 => '/Domain Name:(?>[\x20\t]*)(.*?)(?=>>>)/is');
+
+    /**
+     * Items for each block
+     *
+     * @var array
+     * @access protected
+     */
+    protected $blockItems = array(
+        1 => array(
+            '/Registry Expiry Date: (?>[\x20\t]*)(.+)/i' => 'expires',
+            '/Creation Date: (?>[\x20\t]*)(.+)/i' => 'created',
+        )
+    );
+
+    /**
+     * RegEx to check availability of the domain name
+     *
+     * @var string
+     * @access protected
+     */
+    protected $available = '/Domain not found/i';
+}
\ No newline at end of file

From 6381039a37a7b6aaca0687b720ec695d2a31d5aa Mon Sep 17 00:00:00 2001
From: Max Chadwick <mpchadwick@gmail.com>
Date: Fri, 19 Dec 2014 23:45:32 -0500
Subject: [PATCH 3/4] Add donuts gTLDs

---
 Config/whois.ini | 452 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 449 insertions(+), 3 deletions(-)

diff --git a/Config/whois.ini b/Config/whois.ini
index 8722d28..325e30a 100644
--- a/Config/whois.ini
+++ b/Config/whois.ini
@@ -169,9 +169,6 @@ dk[format] = '--charset=utf-8 --show-handles %domain%'
 dm[server] = whois.nic.dm
 dm[template] = dm
 
-domains[server] = whois.donuts.co
-domains[template] = donuts
-
 dz[server] = whois.nic.dz
 dz[template] = dz
 
@@ -613,6 +610,455 @@ xxx[template] = afilias
 
 yt[server] = whois.nic.yt
 yt[template] = afnic
+
+;----------------------------------------------------------------
+; Donuts gTLDs
+;----------------------------------------------------------------
+.academy[server] = whois.donuts.co
+.academy[template] = donuts
+
+.bargains[server] = whois.donuts.co
+.bargains[template] = donuts
+
+.bike[server] = whois.donuts.co
+.bike[template] = donuts
+
+.boutique[server] = whois.donuts.co
+.boutique[template] = donuts
+
+.builders[server] = whois.donuts.co
+.builders[template] = donuts
+
+.cab[server] = whois.donuts.co
+.cab[template] = donuts
+
+.camera[server] = whois.donuts.co
+.camera[template] = donuts
+
+.camp[server] = whois.donuts.co
+.camp[template] = donuts
+
+.cards[server] = whois.donuts.co
+.cards[template] = donuts
+
+.careers[server] = whois.donuts.co
+.careers[template] = donuts
+
+.catering[server] = whois.donuts.co
+.catering[template] = donuts
+
+.center[server] = whois.donuts.co
+.center[template] = donuts
+
+.cheap[server] = whois.donuts.co
+.cheap[template] = donuts
+
+.cleaning[server] = whois.donuts.co
+.cleaning[template] = donuts
+
+.clothing[server] = whois.donuts.co
+.clothing[template] = donuts
+
+.codes[server] = whois.donuts.co
+.codes[template] = donuts
+
+.coffee[server] = whois.donuts.co
+.coffee[template] = donuts
+
+.community[server] = whois.donuts.co
+.community[template] = donuts
+
+.company[server] = whois.donuts.co
+.company[template] = donuts
+
+.computer[server] = whois.donuts.co
+.computer[template] = donuts
+
+.condos[server] = whois.donuts.co
+.condos[template] = donuts
+
+.construction[server] = whois.donuts.co
+.construction[template] = donuts
+
+.contractors[server] = whois.donuts.co
+.contractors[template] = donuts
+
+.cool[server] = whois.donuts.co
+.cool[template] = donuts
+
+.cruises[server] = whois.donuts.co
+.cruises[template] = donuts
+
+.dating[server] = whois.donuts.co
+.dating[template] = donuts
+
+.diamonds[server] = whois.donuts.co
+.diamonds[template] = donuts
+
+.directory[server] = whois.donuts.co
+.directory[template] = donuts
+
+.domains[server] = whois.donuts.co
+.domains[template] = donuts
+
+.education[server] = whois.donuts.co
+.education[template] = donuts
+
+.email[server] = whois.donuts.co
+.email[template] = donuts
+
+.enterprises[server] = whois.donuts.co
+.enterprises[template] = donuts
+
+.equipment[server] = whois.donuts.co
+.equipment[template] = donuts
+
+.estate[server] = whois.donuts.co
+.estate[template] = donuts
+
+.events[server] = whois.donuts.co
+.events[template] = donuts
+
+.expert[server] = whois.donuts.co
+.expert[template] = donuts
+
+.exposed[server] = whois.donuts.co
+.exposed[template] = donuts
+
+.farm[server] = whois.donuts.co
+.farm[template] = donuts
+
+.fish[server] = whois.donuts.co
+.fish[template] = donuts
+
+.flights[server] = whois.donuts.co
+.flights[template] = donuts
+
+.florist[server] = whois.donuts.co
+.florist[template] = donuts
+
+.foundation[server] = whois.donuts.co
+.foundation[template] = donuts
+
+.gallery[server] = whois.donuts.co
+.gallery[template] = donuts
+
+.glass[server] = whois.donuts.co
+.glass[template] = donuts
+
+.graphics[server] = whois.donuts.co
+.graphics[template] = donuts
+
+.guitars[server] = whois.donuts.co
+.guitars[template] = donuts
+
+.guru[server] = whois.donuts.co
+.guru[template] = donuts
+
+.holdings[server] = whois.donuts.co
+.holdings[template] = donuts
+
+.holiday[server] = whois.donuts.co
+.holiday[template] = donuts
+
+.house[server] = whois.donuts.co
+.house[template] = donuts
+
+.industries[server] = whois.donuts.co
+.industries[template] = donuts
+
+.institute[server] = whois.donuts.co
+.institute[template] = donuts
+
+.international[server] = whois.donuts.co
+.international[template] = donuts
+
+.kitchen[server] = whois.donuts.co
+.kitchen[template] = donuts
+
+.land[server] = whois.donuts.co
+.land[template] = donuts
+
+.lighting[server] = whois.donuts.co
+.lighting[template] = donuts
+
+.limo[server] = whois.donuts.co
+.limo[template] = donuts
+
+.maison[server] = whois.donuts.co
+.maison[template] = donuts
+
+.management[server] = whois.donuts.co
+.management[template] = donuts
+
+.marketing[server] = whois.donuts.co
+.marketing[template] = donuts
+
+.partners[server] = whois.donuts.co
+.partners[template] = donuts
+
+.parts[server] = whois.donuts.co
+.parts[template] = donuts
+
+.photography[server] = whois.donuts.co
+.photography[template] = donuts
+
+.photos[server] = whois.donuts.co
+.photos[template] = donuts
+
+.plumbing[server] = whois.donuts.co
+.plumbing[template] = donuts
+
+.productions[server] = whois.donuts.co
+.productions[template] = donuts
+
+.properties[server] = whois.donuts.co
+.properties[template] = donuts
+
+.recipes[server] = whois.donuts.co
+.recipes[template] = donuts
+
+.rentals[server] = whois.donuts.co
+.rentals[template] = donuts
+
+.repair[server] = whois.donuts.co
+.repair[template] = donuts
+
+.report[server] = whois.donuts.co
+.report[template] = donuts
+
+.shoes[server] = whois.donuts.co
+.shoes[template] = donuts
+
+.singles[server] = whois.donuts.co
+.singles[template] = donuts
+
+.solar[server] = whois.donuts.co
+.solar[template] = donuts
+
+.solutions[server] = whois.donuts.co
+.solutions[template] = donuts
+
+.supplies[server] = whois.donuts.co
+.supplies[template] = donuts
+
+.supply[server] = whois.donuts.co
+.supply[template] = donuts
+
+.systems[server] = whois.donuts.co
+.systems[template] = donuts
+
+.technology[server] = whois.donuts.co
+.technology[template] = donuts
+
+.tienda[server] = whois.donuts.co
+.tienda[template] = donuts
+
+.tips[server] = whois.donuts.co
+.tips[template] = donuts
+
+.today[server] = whois.donuts.co
+.today[template] = donuts
+
+.tools[server] = whois.donuts.co
+.tools[template] = donuts
+
+.training[server] = whois.donuts.co
+.training[template] = donuts
+
+.vacations[server] = whois.donuts.co
+.vacations[template] = donuts
+
+.ventures[server] = whois.donuts.co
+.ventures[template] = donuts
+
+.viajes[server] = whois.donuts.co
+.viajes[template] = donuts
+
+.villas[server] = whois.donuts.co
+.villas[template] = donuts
+
+.vision[server] = whois.donuts.co
+.vision[template] = donuts
+
+.voyage[server] = whois.donuts.co
+.voyage[template] = donuts
+
+.watch[server] = whois.donuts.co
+.watch[template] = donuts
+
+.works[server] = whois.donuts.co
+.works[template] = donuts
+
+.xn--unup4y[server] = whois.donuts.co
+.xn--unup4y[template] = donuts
+
+.zone[server] = whois.donuts.co
+.zone[template] = donuts
+
+.associates[server] = whois.donuts.co
+.associates[template] = donuts
+
+.capital[server] = whois.donuts.co
+.capital[template] = donuts
+
+.engineering[server] = whois.donuts.co
+.engineering[template] = donuts
+
+.gripe[server] = whois.donuts.co
+.gripe[template] = donuts
+
+.lease[server] = whois.donuts.co
+.lease[template] = donuts
+
+.media[server] = whois.donuts.co
+.media[template] = donuts
+
+.pictures[server] = whois.donuts.co
+.pictures[template] = donuts
+
+.reisen[server] = whois.donuts.co
+.reisen[template] = donuts
+
+.services[server] = whois.donuts.co
+.services[template] = donuts
+
+.town[server] = whois.donuts.co
+.town[template] = donuts
+
+.toys[server] = whois.donuts.co
+.toys[template] = donuts
+
+.university[server] = whois.donuts.co
+.university[template] = donuts
+
+.clinic[server] = whois.donuts.co
+.clinic[template] = donuts
+
+.fitness[server] = whois.donuts.co
+.fitness[template] = donuts
+
+.schule[server] = whois.donuts.co
+.schule[template] = donuts
+
+.care[server] = whois.donuts.co
+.care[template] = donuts
+
+.cash[server] = whois.donuts.co
+.cash[template] = donuts
+
+.dental[server] = whois.donuts.co
+.dental[template] = donuts
+
+.exchange[server] = whois.donuts.co
+.exchange[template] = donuts
+
+.fail[server] = whois.donuts.co
+.fail[template] = donuts
+
+.financial[server] = whois.donuts.co
+.financial[template] = donuts
+
+.fund[server] = whois.donuts.co
+.fund[template] = donuts
+
+.furniture[server] = whois.donuts.co
+.furniture[template] = donuts
+
+.gratis[server] = whois.donuts.co
+.gratis[template] = donuts
+
+.investments[server] = whois.donuts.co
+.investments[template] = donuts
+
+.limited[server] = whois.donuts.co
+.limited[template] = donuts
+
+.surgery[server] = whois.donuts.co
+.surgery[template] = donuts
+
+.tax[server] = whois.donuts.co
+.tax[template] = donuts
+
+.wtf[server] = whois.donuts.co
+.wtf[template] = donuts
+
+.creditcard[server] = whois.donuts.co
+.creditcard[template] = donuts
+
+.finance[server] = whois.donuts.co
+.finance[template] = donuts
+
+.insure[server] = whois.donuts.co
+.insure[template] = donuts
+
+.accountants[server] = whois.donuts.co
+.accountants[template] = donuts
+
+.claims[server] = whois.donuts.co
+.claims[template] = donuts
+
+.credit[server] = whois.donuts.co
+.credit[template] = donuts
+
+.digital[server] = whois.donuts.co
+.digital[template] = donuts
+
+.church[server] = whois.donuts.co
+.church[template] = donuts
+
+.guide[server] = whois.donuts.co
+.guide[template] = donuts
+
+.life[server] = whois.donuts.co
+.life[template] = donuts
+
+.loans[server] = whois.donuts.co
+.loans[template] = donuts
+
+.energy[server] = whois.donuts.co
+.energy[template] = donuts
+
+.delivery[server] = whois.donuts.co
+.delivery[template] = donuts
+
+.place[server] = whois.donuts.co
+.place[template] = donuts
+
+.city[server] = whois.donuts.co
+.city[template] = donuts
+
+.deals[server] = whois.donuts.co
+.deals[template] = donuts
+
+.healthcare[server] = whois.donuts.co
+.healthcare[template] = donuts
+
+.restaurant[server] = whois.donuts.co
+.restaurant[template] = donuts
+
+.sarl[server] = whois.donuts.co
+.sarl[template] = donuts
+
+.business[server] = whois.donuts.co
+.business[template] = donuts
+
+.xn--vhquv[server] = whois.donuts.co
+.xn--vhquv[template] = donuts
+
+.gifts[server] = whois.donuts.co
+.gifts[template] = donuts
+
+.immo[server] = whois.donuts.co
+.immo[template] = donuts
+
+.world[server] = whois.donuts.co
+.world[template] = donuts
+
+.pizza[server] = whois.donuts.co
+.pizza[template] = donuts
+
+
 ;----------------------------------------------------------------
 ; Whois server for private domain names
 ;----------------------------------------------------------------

From ef956ddf60380ce13f81fb6c55c886d952021c27 Mon Sep 17 00:00:00 2001
From: Max Chadwick <mpchadwick@gmail.com>
Date: Fri, 19 Dec 2014 23:59:47 -0500
Subject: [PATCH 4/4] Correct syntax error for donuts domains

---
 Config/whois.ini | 592 +++++++++++++++++++++++------------------------
 1 file changed, 296 insertions(+), 296 deletions(-)

diff --git a/Config/whois.ini b/Config/whois.ini
index 325e30a..c23e16a 100644
--- a/Config/whois.ini
+++ b/Config/whois.ini
@@ -614,449 +614,449 @@ yt[template] = afnic
 ;----------------------------------------------------------------
 ; Donuts gTLDs
 ;----------------------------------------------------------------
-.academy[server] = whois.donuts.co
-.academy[template] = donuts
+academy[server] = whois.donuts.co
+academy[template] = donuts
 
-.bargains[server] = whois.donuts.co
-.bargains[template] = donuts
+bargains[server] = whois.donuts.co
+bargains[template] = donuts
 
-.bike[server] = whois.donuts.co
-.bike[template] = donuts
+bike[server] = whois.donuts.co
+bike[template] = donuts
 
-.boutique[server] = whois.donuts.co
-.boutique[template] = donuts
+boutique[server] = whois.donuts.co
+boutique[template] = donuts
 
-.builders[server] = whois.donuts.co
-.builders[template] = donuts
+builders[server] = whois.donuts.co
+builders[template] = donuts
 
-.cab[server] = whois.donuts.co
-.cab[template] = donuts
+cab[server] = whois.donuts.co
+cab[template] = donuts
 
-.camera[server] = whois.donuts.co
-.camera[template] = donuts
+camera[server] = whois.donuts.co
+camera[template] = donuts
 
-.camp[server] = whois.donuts.co
-.camp[template] = donuts
+camp[server] = whois.donuts.co
+camp[template] = donuts
 
-.cards[server] = whois.donuts.co
-.cards[template] = donuts
+cards[server] = whois.donuts.co
+cards[template] = donuts
 
-.careers[server] = whois.donuts.co
-.careers[template] = donuts
+careers[server] = whois.donuts.co
+careers[template] = donuts
 
-.catering[server] = whois.donuts.co
-.catering[template] = donuts
+catering[server] = whois.donuts.co
+catering[template] = donuts
 
-.center[server] = whois.donuts.co
-.center[template] = donuts
+center[server] = whois.donuts.co
+center[template] = donuts
 
-.cheap[server] = whois.donuts.co
-.cheap[template] = donuts
+cheap[server] = whois.donuts.co
+cheap[template] = donuts
 
-.cleaning[server] = whois.donuts.co
-.cleaning[template] = donuts
+cleaning[server] = whois.donuts.co
+cleaning[template] = donuts
 
-.clothing[server] = whois.donuts.co
-.clothing[template] = donuts
+clothing[server] = whois.donuts.co
+clothing[template] = donuts
 
-.codes[server] = whois.donuts.co
-.codes[template] = donuts
+codes[server] = whois.donuts.co
+codes[template] = donuts
 
-.coffee[server] = whois.donuts.co
-.coffee[template] = donuts
+coffee[server] = whois.donuts.co
+coffee[template] = donuts
 
-.community[server] = whois.donuts.co
-.community[template] = donuts
+community[server] = whois.donuts.co
+community[template] = donuts
 
-.company[server] = whois.donuts.co
-.company[template] = donuts
+company[server] = whois.donuts.co
+company[template] = donuts
 
-.computer[server] = whois.donuts.co
-.computer[template] = donuts
+computer[server] = whois.donuts.co
+computer[template] = donuts
 
-.condos[server] = whois.donuts.co
-.condos[template] = donuts
+condos[server] = whois.donuts.co
+condos[template] = donuts
 
-.construction[server] = whois.donuts.co
-.construction[template] = donuts
+construction[server] = whois.donuts.co
+construction[template] = donuts
 
-.contractors[server] = whois.donuts.co
-.contractors[template] = donuts
+contractors[server] = whois.donuts.co
+contractors[template] = donuts
 
-.cool[server] = whois.donuts.co
-.cool[template] = donuts
+cool[server] = whois.donuts.co
+cool[template] = donuts
 
-.cruises[server] = whois.donuts.co
-.cruises[template] = donuts
+cruises[server] = whois.donuts.co
+cruises[template] = donuts
 
-.dating[server] = whois.donuts.co
-.dating[template] = donuts
+dating[server] = whois.donuts.co
+dating[template] = donuts
 
-.diamonds[server] = whois.donuts.co
-.diamonds[template] = donuts
+diamonds[server] = whois.donuts.co
+diamonds[template] = donuts
 
-.directory[server] = whois.donuts.co
-.directory[template] = donuts
+directory[server] = whois.donuts.co
+directory[template] = donuts
 
-.domains[server] = whois.donuts.co
-.domains[template] = donuts
+domains[server] = whois.donuts.co
+domains[template] = donuts
 
-.education[server] = whois.donuts.co
-.education[template] = donuts
+education[server] = whois.donuts.co
+education[template] = donuts
 
-.email[server] = whois.donuts.co
-.email[template] = donuts
+email[server] = whois.donuts.co
+email[template] = donuts
 
-.enterprises[server] = whois.donuts.co
-.enterprises[template] = donuts
+enterprises[server] = whois.donuts.co
+enterprises[template] = donuts
 
-.equipment[server] = whois.donuts.co
-.equipment[template] = donuts
+equipment[server] = whois.donuts.co
+equipment[template] = donuts
 
-.estate[server] = whois.donuts.co
-.estate[template] = donuts
+estate[server] = whois.donuts.co
+estate[template] = donuts
 
-.events[server] = whois.donuts.co
-.events[template] = donuts
+events[server] = whois.donuts.co
+events[template] = donuts
 
-.expert[server] = whois.donuts.co
-.expert[template] = donuts
+expert[server] = whois.donuts.co
+expert[template] = donuts
 
-.exposed[server] = whois.donuts.co
-.exposed[template] = donuts
+exposed[server] = whois.donuts.co
+exposed[template] = donuts
 
-.farm[server] = whois.donuts.co
-.farm[template] = donuts
+farm[server] = whois.donuts.co
+farm[template] = donuts
 
-.fish[server] = whois.donuts.co
-.fish[template] = donuts
+fish[server] = whois.donuts.co
+fish[template] = donuts
 
-.flights[server] = whois.donuts.co
-.flights[template] = donuts
+flights[server] = whois.donuts.co
+flights[template] = donuts
 
-.florist[server] = whois.donuts.co
-.florist[template] = donuts
+florist[server] = whois.donuts.co
+florist[template] = donuts
 
-.foundation[server] = whois.donuts.co
-.foundation[template] = donuts
+foundation[server] = whois.donuts.co
+foundation[template] = donuts
 
-.gallery[server] = whois.donuts.co
-.gallery[template] = donuts
+gallery[server] = whois.donuts.co
+gallery[template] = donuts
 
-.glass[server] = whois.donuts.co
-.glass[template] = donuts
+glass[server] = whois.donuts.co
+glass[template] = donuts
 
-.graphics[server] = whois.donuts.co
-.graphics[template] = donuts
+graphics[server] = whois.donuts.co
+graphics[template] = donuts
 
-.guitars[server] = whois.donuts.co
-.guitars[template] = donuts
+guitars[server] = whois.donuts.co
+guitars[template] = donuts
 
-.guru[server] = whois.donuts.co
-.guru[template] = donuts
+guru[server] = whois.donuts.co
+guru[template] = donuts
 
-.holdings[server] = whois.donuts.co
-.holdings[template] = donuts
+holdings[server] = whois.donuts.co
+holdings[template] = donuts
 
-.holiday[server] = whois.donuts.co
-.holiday[template] = donuts
+holiday[server] = whois.donuts.co
+holiday[template] = donuts
 
-.house[server] = whois.donuts.co
-.house[template] = donuts
+house[server] = whois.donuts.co
+house[template] = donuts
 
-.industries[server] = whois.donuts.co
-.industries[template] = donuts
+industries[server] = whois.donuts.co
+industries[template] = donuts
 
-.institute[server] = whois.donuts.co
-.institute[template] = donuts
+institute[server] = whois.donuts.co
+institute[template] = donuts
 
-.international[server] = whois.donuts.co
-.international[template] = donuts
+international[server] = whois.donuts.co
+international[template] = donuts
 
-.kitchen[server] = whois.donuts.co
-.kitchen[template] = donuts
+kitchen[server] = whois.donuts.co
+kitchen[template] = donuts
 
-.land[server] = whois.donuts.co
-.land[template] = donuts
+land[server] = whois.donuts.co
+land[template] = donuts
 
-.lighting[server] = whois.donuts.co
-.lighting[template] = donuts
+lighting[server] = whois.donuts.co
+lighting[template] = donuts
 
-.limo[server] = whois.donuts.co
-.limo[template] = donuts
+limo[server] = whois.donuts.co
+limo[template] = donuts
 
-.maison[server] = whois.donuts.co
-.maison[template] = donuts
+maison[server] = whois.donuts.co
+maison[template] = donuts
 
-.management[server] = whois.donuts.co
-.management[template] = donuts
+management[server] = whois.donuts.co
+management[template] = donuts
 
-.marketing[server] = whois.donuts.co
-.marketing[template] = donuts
+marketing[server] = whois.donuts.co
+marketing[template] = donuts
 
-.partners[server] = whois.donuts.co
-.partners[template] = donuts
+partners[server] = whois.donuts.co
+partners[template] = donuts
 
-.parts[server] = whois.donuts.co
-.parts[template] = donuts
+parts[server] = whois.donuts.co
+parts[template] = donuts
 
-.photography[server] = whois.donuts.co
-.photography[template] = donuts
+photography[server] = whois.donuts.co
+photography[template] = donuts
 
-.photos[server] = whois.donuts.co
-.photos[template] = donuts
+photos[server] = whois.donuts.co
+photos[template] = donuts
 
-.plumbing[server] = whois.donuts.co
-.plumbing[template] = donuts
+plumbing[server] = whois.donuts.co
+plumbing[template] = donuts
 
-.productions[server] = whois.donuts.co
-.productions[template] = donuts
+productions[server] = whois.donuts.co
+productions[template] = donuts
 
-.properties[server] = whois.donuts.co
-.properties[template] = donuts
+properties[server] = whois.donuts.co
+properties[template] = donuts
 
-.recipes[server] = whois.donuts.co
-.recipes[template] = donuts
+recipes[server] = whois.donuts.co
+recipes[template] = donuts
 
-.rentals[server] = whois.donuts.co
-.rentals[template] = donuts
+rentals[server] = whois.donuts.co
+rentals[template] = donuts
 
-.repair[server] = whois.donuts.co
-.repair[template] = donuts
+repair[server] = whois.donuts.co
+repair[template] = donuts
 
-.report[server] = whois.donuts.co
-.report[template] = donuts
+report[server] = whois.donuts.co
+report[template] = donuts
 
-.shoes[server] = whois.donuts.co
-.shoes[template] = donuts
+shoes[server] = whois.donuts.co
+shoes[template] = donuts
 
-.singles[server] = whois.donuts.co
-.singles[template] = donuts
+singles[server] = whois.donuts.co
+singles[template] = donuts
 
-.solar[server] = whois.donuts.co
-.solar[template] = donuts
+solar[server] = whois.donuts.co
+solar[template] = donuts
 
-.solutions[server] = whois.donuts.co
-.solutions[template] = donuts
+solutions[server] = whois.donuts.co
+solutions[template] = donuts
 
-.supplies[server] = whois.donuts.co
-.supplies[template] = donuts
+supplies[server] = whois.donuts.co
+supplies[template] = donuts
 
-.supply[server] = whois.donuts.co
-.supply[template] = donuts
+supply[server] = whois.donuts.co
+supply[template] = donuts
 
-.systems[server] = whois.donuts.co
-.systems[template] = donuts
+systems[server] = whois.donuts.co
+systems[template] = donuts
 
-.technology[server] = whois.donuts.co
-.technology[template] = donuts
+technology[server] = whois.donuts.co
+technology[template] = donuts
 
-.tienda[server] = whois.donuts.co
-.tienda[template] = donuts
+tienda[server] = whois.donuts.co
+tienda[template] = donuts
 
-.tips[server] = whois.donuts.co
-.tips[template] = donuts
+tips[server] = whois.donuts.co
+tips[template] = donuts
 
-.today[server] = whois.donuts.co
-.today[template] = donuts
+today[server] = whois.donuts.co
+today[template] = donuts
 
-.tools[server] = whois.donuts.co
-.tools[template] = donuts
+tools[server] = whois.donuts.co
+tools[template] = donuts
 
-.training[server] = whois.donuts.co
-.training[template] = donuts
+training[server] = whois.donuts.co
+training[template] = donuts
 
-.vacations[server] = whois.donuts.co
-.vacations[template] = donuts
+vacations[server] = whois.donuts.co
+vacations[template] = donuts
 
-.ventures[server] = whois.donuts.co
-.ventures[template] = donuts
+ventures[server] = whois.donuts.co
+ventures[template] = donuts
 
-.viajes[server] = whois.donuts.co
-.viajes[template] = donuts
+viajes[server] = whois.donuts.co
+viajes[template] = donuts
 
-.villas[server] = whois.donuts.co
-.villas[template] = donuts
+villas[server] = whois.donuts.co
+villas[template] = donuts
 
-.vision[server] = whois.donuts.co
-.vision[template] = donuts
+vision[server] = whois.donuts.co
+vision[template] = donuts
 
-.voyage[server] = whois.donuts.co
-.voyage[template] = donuts
+voyage[server] = whois.donuts.co
+voyage[template] = donuts
 
-.watch[server] = whois.donuts.co
-.watch[template] = donuts
+watch[server] = whois.donuts.co
+watch[template] = donuts
 
-.works[server] = whois.donuts.co
-.works[template] = donuts
+works[server] = whois.donuts.co
+works[template] = donuts
 
-.xn--unup4y[server] = whois.donuts.co
-.xn--unup4y[template] = donuts
+xn--unup4y[server] = whois.donuts.co
+xn--unup4y[template] = donuts
 
-.zone[server] = whois.donuts.co
-.zone[template] = donuts
+zone[server] = whois.donuts.co
+zone[template] = donuts
 
-.associates[server] = whois.donuts.co
-.associates[template] = donuts
+associates[server] = whois.donuts.co
+associates[template] = donuts
 
-.capital[server] = whois.donuts.co
-.capital[template] = donuts
+capital[server] = whois.donuts.co
+capital[template] = donuts
 
-.engineering[server] = whois.donuts.co
-.engineering[template] = donuts
+engineering[server] = whois.donuts.co
+engineering[template] = donuts
 
-.gripe[server] = whois.donuts.co
-.gripe[template] = donuts
+gripe[server] = whois.donuts.co
+gripe[template] = donuts
 
-.lease[server] = whois.donuts.co
-.lease[template] = donuts
+lease[server] = whois.donuts.co
+lease[template] = donuts
 
-.media[server] = whois.donuts.co
-.media[template] = donuts
+media[server] = whois.donuts.co
+media[template] = donuts
 
-.pictures[server] = whois.donuts.co
-.pictures[template] = donuts
+pictures[server] = whois.donuts.co
+pictures[template] = donuts
 
-.reisen[server] = whois.donuts.co
-.reisen[template] = donuts
+reisen[server] = whois.donuts.co
+reisen[template] = donuts
 
-.services[server] = whois.donuts.co
-.services[template] = donuts
+services[server] = whois.donuts.co
+services[template] = donuts
 
-.town[server] = whois.donuts.co
-.town[template] = donuts
+town[server] = whois.donuts.co
+town[template] = donuts
 
-.toys[server] = whois.donuts.co
-.toys[template] = donuts
+toys[server] = whois.donuts.co
+toys[template] = donuts
 
-.university[server] = whois.donuts.co
-.university[template] = donuts
+university[server] = whois.donuts.co
+university[template] = donuts
 
-.clinic[server] = whois.donuts.co
-.clinic[template] = donuts
+clinic[server] = whois.donuts.co
+clinic[template] = donuts
 
-.fitness[server] = whois.donuts.co
-.fitness[template] = donuts
+fitness[server] = whois.donuts.co
+fitness[template] = donuts
 
-.schule[server] = whois.donuts.co
-.schule[template] = donuts
+schule[server] = whois.donuts.co
+schule[template] = donuts
 
-.care[server] = whois.donuts.co
-.care[template] = donuts
+care[server] = whois.donuts.co
+care[template] = donuts
 
-.cash[server] = whois.donuts.co
-.cash[template] = donuts
+cash[server] = whois.donuts.co
+cash[template] = donuts
 
-.dental[server] = whois.donuts.co
-.dental[template] = donuts
+dental[server] = whois.donuts.co
+dental[template] = donuts
 
-.exchange[server] = whois.donuts.co
-.exchange[template] = donuts
+exchange[server] = whois.donuts.co
+exchange[template] = donuts
 
-.fail[server] = whois.donuts.co
-.fail[template] = donuts
+fail[server] = whois.donuts.co
+fail[template] = donuts
 
-.financial[server] = whois.donuts.co
-.financial[template] = donuts
+financial[server] = whois.donuts.co
+financial[template] = donuts
 
-.fund[server] = whois.donuts.co
-.fund[template] = donuts
+fund[server] = whois.donuts.co
+fund[template] = donuts
 
-.furniture[server] = whois.donuts.co
-.furniture[template] = donuts
+furniture[server] = whois.donuts.co
+furniture[template] = donuts
 
-.gratis[server] = whois.donuts.co
-.gratis[template] = donuts
+gratis[server] = whois.donuts.co
+gratis[template] = donuts
 
-.investments[server] = whois.donuts.co
-.investments[template] = donuts
+investments[server] = whois.donuts.co
+investments[template] = donuts
 
-.limited[server] = whois.donuts.co
-.limited[template] = donuts
+limited[server] = whois.donuts.co
+limited[template] = donuts
 
-.surgery[server] = whois.donuts.co
-.surgery[template] = donuts
+surgery[server] = whois.donuts.co
+surgery[template] = donuts
 
-.tax[server] = whois.donuts.co
-.tax[template] = donuts
+tax[server] = whois.donuts.co
+tax[template] = donuts
 
-.wtf[server] = whois.donuts.co
-.wtf[template] = donuts
+wtf[server] = whois.donuts.co
+wtf[template] = donuts
 
-.creditcard[server] = whois.donuts.co
-.creditcard[template] = donuts
+creditcard[server] = whois.donuts.co
+creditcard[template] = donuts
 
-.finance[server] = whois.donuts.co
-.finance[template] = donuts
+finance[server] = whois.donuts.co
+finance[template] = donuts
 
-.insure[server] = whois.donuts.co
-.insure[template] = donuts
+insure[server] = whois.donuts.co
+insure[template] = donuts
 
-.accountants[server] = whois.donuts.co
-.accountants[template] = donuts
+accountants[server] = whois.donuts.co
+accountants[template] = donuts
 
-.claims[server] = whois.donuts.co
-.claims[template] = donuts
+claims[server] = whois.donuts.co
+claims[template] = donuts
 
-.credit[server] = whois.donuts.co
-.credit[template] = donuts
+credit[server] = whois.donuts.co
+credit[template] = donuts
 
-.digital[server] = whois.donuts.co
-.digital[template] = donuts
+digital[server] = whois.donuts.co
+digital[template] = donuts
 
-.church[server] = whois.donuts.co
-.church[template] = donuts
+church[server] = whois.donuts.co
+church[template] = donuts
 
-.guide[server] = whois.donuts.co
-.guide[template] = donuts
+guide[server] = whois.donuts.co
+guide[template] = donuts
 
-.life[server] = whois.donuts.co
-.life[template] = donuts
+life[server] = whois.donuts.co
+life[template] = donuts
 
-.loans[server] = whois.donuts.co
-.loans[template] = donuts
+loans[server] = whois.donuts.co
+loans[template] = donuts
 
-.energy[server] = whois.donuts.co
-.energy[template] = donuts
+energy[server] = whois.donuts.co
+energy[template] = donuts
 
-.delivery[server] = whois.donuts.co
-.delivery[template] = donuts
+delivery[server] = whois.donuts.co
+delivery[template] = donuts
 
-.place[server] = whois.donuts.co
-.place[template] = donuts
+place[server] = whois.donuts.co
+place[template] = donuts
 
-.city[server] = whois.donuts.co
-.city[template] = donuts
+city[server] = whois.donuts.co
+city[template] = donuts
 
-.deals[server] = whois.donuts.co
-.deals[template] = donuts
+deals[server] = whois.donuts.co
+deals[template] = donuts
 
-.healthcare[server] = whois.donuts.co
-.healthcare[template] = donuts
+healthcare[server] = whois.donuts.co
+healthcare[template] = donuts
 
-.restaurant[server] = whois.donuts.co
-.restaurant[template] = donuts
+restaurant[server] = whois.donuts.co
+restaurant[template] = donuts
 
-.sarl[server] = whois.donuts.co
-.sarl[template] = donuts
+sarl[server] = whois.donuts.co
+sarl[template] = donuts
 
-.business[server] = whois.donuts.co
-.business[template] = donuts
+business[server] = whois.donuts.co
+business[template] = donuts
 
-.xn--vhquv[server] = whois.donuts.co
-.xn--vhquv[template] = donuts
+xn--vhquv[server] = whois.donuts.co
+xn--vhquv[template] = donuts
 
-.gifts[server] = whois.donuts.co
-.gifts[template] = donuts
+gifts[server] = whois.donuts.co
+gifts[template] = donuts
 
-.immo[server] = whois.donuts.co
-.immo[template] = donuts
+immo[server] = whois.donuts.co
+immo[template] = donuts
 
-.world[server] = whois.donuts.co
-.world[template] = donuts
+world[server] = whois.donuts.co
+world[template] = donuts
 
-.pizza[server] = whois.donuts.co
-.pizza[template] = donuts
+pizza[server] = whois.donuts.co
+pizza[template] = donuts
 
 
 ;----------------------------------------------------------------