diff --git a/docs/faq/plans.markdown b/docs/faq/Plans.markdown
similarity index 56%
rename from docs/faq/plans.markdown
rename to docs/faq/Plans.markdown
index 1eec5b6..c350b97 100644
--- a/docs/faq/plans.markdown
+++ b/docs/faq/Plans.markdown
@@ -1,41 +1,54 @@
# Trovebox Plans
## What plans are available?
-
We offer a variety of plans for organizations of different sizes. You can view them on our Plans page.
## Is a trial available?
-
Yes, each plan comes with a 14-day free trial.
## Do I have to select a plan when I sign up?
-
Yes. When you sign up we’ll ask you to select a plan to trial.
## Do I need to enter a credit card to use the free trial?
-
No. After your trial ends we’ll ask you for your credit card info so you can continue using Trovebox.
-## How do I cancel my free trial?
+## Do you store users' credit card info?
+No, we don't. Your credit card info doesn't go through our servers at all, instead traveling securely from your server to our payment processor's.
+## Do I have to renew manually every year?
+Nope. We'll alert you when your subscription is going to renew.
+
+## What happens if my plan ends?
+Don't panic! Nothing has been deleted. You can still access all your photos. You can also choose to resume using your current plan again.
+
+## How do I cancel my free trial?
Email us at support@trovebox.com and we’ll make sure your trial gets cancelled.
## What happens if I don’t continue to use Trovebox after the free trial?
-
Your Trovebox site will become read-only, so you won’t be able to upload or edit content.
## What happens if I run out of storage?
-
You won’t be able to upload any other content until you upgrade your plan or delete content.
## How do I change my plan?
-
Email us at support@trovebox.com and let us know what plan you’d like to change to, and we’ll
## I need help selecting a plan. Can you help?
-
Sure. Email us at support@trovebox.com and we’ll talk with you through your needs.
## My business’s photo needs go far beyond what your plans currently provide. Can we make a customized plan?
-
Absolutely. Email us at support@trovebox.com and we’ll talk.
+
+## I've heard that Pro accounts are no longer being offered. What does that mean for me?
+As of 25 October 2013, new Unlimited Pro accounts are no longer available for purchase. Current Pro accounts will continue to be honored and renewed at the same $29.99 per year rate.
+
+## What did Trovebox Pro account holders receive?
+Pro account holders received:
+
+* Unlimited photo uploads (Compare to 100 photos/month for free users)
+* Import your photos from Flickr, Facebook, and Instagram.
+* Switch where you store your photos as many times as you wish
+* Give multiple users access on your account without giving them your password
+* Top level domain support at yourdomain.com
+
+These features are now available with our current plans.
diff --git a/docs/faq/ProAccounts.markdown b/docs/faq/ProAccounts.markdown
deleted file mode 100644
index 711f12c..0000000
--- a/docs/faq/ProAccounts.markdown
+++ /dev/null
@@ -1,47 +0,0 @@
-Pro Accounts
-===========================
-
-## I've heard that Pro accounts are no longer being offered. What does that mean for me?
-As of 25 October 2013, new Unlimited Pro accounts are no longer available for purchase. Current Pro accounts will continue to be honored and renewed at the same $29.99 per year rate.
-
-## What did Trovebox Pro account holders receive?
-Pro account holders receive:
-
-* Unlimited photo uploads (Compare to 100 photos/month for free users)
-* Import your photos from Flickr, Facebook, and Instagram. Picasa and Smugmug are coming soon.
-* Switch where you store your photos as many times as you wish
-* Give multiple users access on your account without giving them your password
-* Top level domain support at yourdomain.com
-
-These features are now available with our current plans.
-
-## Do you store users' credit card info?
-No, we don't. Your credit card info doesn't go through our servers at all, instead traveling securely from your server to our payment processor's.
-
-## Do I have to renew manually every year?
-Nope. We'll alert you when your Pro account is going to renew.
-
-## What happens if my Pro subscription ends?
-Don't panic! Nothing has been deleted. You resume using a free account, though you're now subject to the free account limitations. You can still access all your photos. You can also choose to upgrade to one of your new plans.
-
-## What can collaborators do with my account?
-Collaborators can add photos, edit photos, delete photos--just about anything you can do except delete your account. When you add a collaborator, we send them an email prompting them to set a password.
-
-## How do I add a top level domain?
-Adding a top level domain to your Trovebox site is currently all manual on our end, so there are two steps to take. First, email support@trovebox.com with the domain or subdomain you'd like to add to your Trovebox site.
-
-After we've replied and confirmed that we've set up your domain, you'll need to create a CNAME record for your domain. This is a type of DNS resource record, so consult your domain registrar's documentation on where to set it. DNS settings are a good place to start. Enter the following where prompted:
-
-* Name: your subdomain
-* Type: CNAME
-* Data (or Alias): yourusername.trovebox.com.
-
-It'll take up to 24 hours for your changes to take effect.
-
-## How do I add Twitter cards for my domain?
-Twitter cards are added per domain over at Twitter. You can apply for them separately for your own domain there.
-
-## Can I use a custom domain for my Trovebox thumbnails?
-Yes. If you're already using a subdomain on your Trovebox site, you should use a different one for your images so one subdomain doesn't map to two places.
-
-The easiest way to use a domain for your thumbnails is to store your photos in an Amazon S3 bucket named after your subdomain--that is, your.subdomain.com. Then add a CNAME record pointing your.subdomain.com to your.subdomain.com.s3.amazonaws.com. Once you've done this email us at support@trovebox.com and we can update the record on our side.
diff --git a/docs/faq/TroveboxFeatures.markdown b/docs/faq/TroveboxFeatures.markdown
new file mode 100644
index 0000000..379cc99
--- /dev/null
+++ b/docs/faq/TroveboxFeatures.markdown
@@ -0,0 +1,41 @@
+Trovebox Features
+==============
+
+## What is white-labeling?
+
+White-labeling is a feature that lets you design your Trovebox site with your organization’s logo and colors. Your visitors will automatically recognize your Trovebox site as yours.
+
+## How does white-labeling at Trovebox work?
+
+Email us at support@trovebox.com with what you’d like modified on your Trovebox site. Currently we can modify Soon we’ll offer a way for you to do this yourself.
+
+## What is the Trovebox Consultancy Service?
+
+The consultancy service connects you to a Trovebox developer who can help you integrate Trovebox with your company’s website.
+
+## What’s the Getting Started web conference?
+
+When you sign up for the Platinum plan, one of our Trovebox team members will This feature is available for Platinum members.
+
+## How do I upload video?
+
+Video is coming very soon, but once it's here you can upload video the same way you upload photos.
+
+## How do I add a top level domain?
+Adding a top level domain to your Trovebox site is currently all manual on our end, so there are two steps to take. First, email support@trovebox.com with the domain or subdomain you'd like to add to your Trovebox site.
+
+After we've replied and confirmed that we've set up your domain, you'll need to create a CNAME record for your domain. This is a type of DNS resource record, so consult your domain registrar's documentation on where to set it. DNS settings are a good place to start. Enter the following where prompted:
+
+* Name: your subdomain
+* Type: CNAME
+* Data (or Alias): yourusername.trovebox.com.
+
+It'll take up to 24 hours for your changes to take effect.
+
+## How do I add Twitter cards for my domain?
+Twitter cards are added per domain over at Twitter. You can apply for them separately for your own domain there.
+
+## Can I use a custom domain for my Trovebox thumbnails?
+Yes. If you're already using a subdomain on your Trovebox site, you should use a different one for your images so one subdomain doesn't map to two places.
+
+The easiest way to use a domain for your thumbnails is to store your photos in an Amazon S3 bucket named after your subdomain--that is, your.subdomain.com. Then add a CNAME record pointing your.subdomain.com to your.subdomain.com.s3.amazonaws.com. Once you've done this email us at support@trovebox.com and we can update the record on our side.