diff --git a/share/wordlists/eff_distant.wordlist b/share/wordlists/eff_distant.wordlist
deleted file mode 100644
index 9ac732fe3..000000000
--- a/share/wordlists/eff_distant.wordlist
+++ /dev/null
@@ -1,1296 +0,0 @@
-aardvark
-abandoned
-abbreviate
-abdomen
-abhorrence
-abiding
-abnormal
-abrasion
-absorbing
-abundant
-abyss
-academy
-accountant
-acetone
-achiness
-acid
-acoustics
-acquire
-acrobat
-actress
-acuteness
-aerosol
-aesthetic
-affidavit
-afloat
-afraid
-aftershave
-again
-agency
-aggressor
-aghast
-agitate
-agnostic
-agonizing
-agreeing
-aidless
-aimlessly
-ajar
-alarmclock
-albatross
-alchemy
-alfalfa
-algae
-aliens
-alkaline
-almanac
-alongside
-alphabet
-already
-also
-altitude
-aluminum
-always
-amazingly
-ambulance
-amendment
-amiable
-ammunition
-amnesty
-amoeba
-amplifier
-amuser
-anagram
-anchor
-android
-anesthesia
-angelfish
-animal
-anklet
-announcer
-anonymous
-answer
-antelope
-anxiety
-anyplace
-aorta
-apartment
-apnea
-apostrophe
-apple
-apricot
-aquamarine
-arachnid
-arbitrate
-ardently
-arena
-argument
-aristocrat
-armchair
-aromatic
-arrowhead
-arsonist
-artichoke
-asbestos
-ascend
-aseptic
-ashamed
-asinine
-asleep
-asocial
-asparagus
-astronaut
-asymmetric
-atlas
-atmosphere
-atom
-atrocious
-attic
-atypical
-auctioneer
-auditorium
-augmented
-auspicious
-automobile
-auxiliary
-avalanche
-avenue
-aviator
-avocado
-awareness
-awhile
-awkward
-awning
-awoke
-axially
-azalea
-babbling
-backpack
-badass
-bagpipe
-bakery
-balancing
-bamboo
-banana
-barracuda
-basket
-bathrobe
-bazooka
-blade
-blender
-blimp
-blouse
-blurred
-boatyard
-bobcat
-body
-bogusness
-bohemian
-boiler
-bonnet
-boots
-borough
-bossiness
-bottle
-bouquet
-boxlike
-breath
-briefcase
-broom
-brushes
-bubblegum
-buckle
-buddhist
-buffalo
-bullfrog
-bunny
-busboy
-buzzard
-cabin
-cactus
-cadillac
-cafeteria
-cage
-cahoots
-cajoling
-cakewalk
-calculator
-camera
-canister
-capsule
-carrot
-cashew
-cathedral
-caucasian
-caviar
-ceasefire
-cedar
-celery
-cement
-census
-ceramics
-cesspool
-chalkboard
-cheesecake
-chimney
-chlorine
-chopsticks
-chrome
-chute
-cilantro
-cinnamon
-circle
-cityscape
-civilian
-clay
-clergyman
-clipboard
-clock
-clubhouse
-coathanger
-cobweb
-coconut
-codeword
-coexistent
-coffeecake
-cognitive
-cohabitate
-collarbone
-computer
-confetti
-copier
-cornea
-cosmetics
-cotton
-couch
-coverless
-coyote
-coziness
-crawfish
-crewmember
-crib
-croissant
-crumble
-crystal
-cubical
-cucumber
-cuddly
-cufflink
-cuisine
-culprit
-cup
-curry
-cushion
-cuticle
-cybernetic
-cyclist
-cylinder
-cymbal
-cynicism
-cypress
-cytoplasm
-dachshund
-daffodil
-dagger
-dairy
-dalmatian
-dandelion
-dartboard
-dastardly
-datebook
-daughter
-dawn
-daytime
-dazzler
-dealer
-debris
-decal
-dedicate
-deepness
-defrost
-degree
-dehydrator
-deliverer
-democrat
-dentist
-deodorant
-depot
-deranged
-desktop
-detergent
-device
-dexterity
-diamond
-dibs
-dictionary
-diffuser
-digit
-dilated
-dimple
-dinnerware
-dioxide
-diploma
-directory
-dishcloth
-ditto
-dividers
-dizziness
-doctor
-dodge
-doll
-dominoes
-donut
-doorstep
-dorsal
-double
-downstairs
-dozed
-drainpipe
-dresser
-driftwood
-droppings
-drum
-dryer
-dubiously
-duckling
-duffel
-dugout
-dumpster
-duplex
-durable
-dustpan
-dutiful
-duvet
-dwarfism
-dwelling
-dwindling
-dynamite
-dyslexia
-eagerness
-earlobe
-easel
-eavesdrop
-ebook
-eccentric
-echoless
-eclipse
-ecosystem
-ecstasy
-edged
-editor
-educator
-eelworm
-eerie
-effects
-eggnog
-egomaniac
-ejection
-elastic
-elbow
-elderly
-elephant
-elfishly
-eliminator
-elk
-elliptical
-elongated
-elsewhere
-elusive
-elves
-emancipate
-embroidery
-emcee
-emerald
-emission
-emoticon
-emperor
-emulate
-enactment
-enchilada
-endorphin
-energy
-enforcer
-engine
-enhance
-enigmatic
-enjoyably
-enlarged
-enormous
-enquirer
-enrollment
-ensemble
-entryway
-enunciate
-envoy
-enzyme
-epidemic
-equipment
-erasable
-ergonomic
-erratic
-eruption
-escalator
-eskimo
-esophagus
-espresso
-essay
-estrogen
-etching
-eternal
-ethics
-etiquette
-eucalyptus
-eulogy
-euphemism
-euthanize
-evacuation
-evergreen
-evidence
-evolution
-exam
-excerpt
-exerciser
-exfoliate
-exhale
-exist
-exorcist
-explode
-exquisite
-exterior
-exuberant
-fabric
-factory
-faded
-failsafe
-falcon
-family
-fanfare
-fasten
-faucet
-favorite
-feasibly
-february
-federal
-feedback
-feigned
-feline
-femur
-fence
-ferret
-festival
-fettuccine
-feudalist
-feverish
-fiberglass
-fictitious
-fiddle
-figurine
-fillet
-finalist
-fiscally
-fixture
-flashlight
-fleshiness
-flight
-florist
-flypaper
-foamless
-focus
-foggy
-folksong
-fondue
-footpath
-fossil
-fountain
-fox
-fragment
-freeway
-fridge
-frosting
-fruit
-fryingpan
-gadget
-gainfully
-gallstone
-gamekeeper
-gangway
-garlic
-gaslight
-gathering
-gauntlet
-gearbox
-gecko
-gem
-generator
-geographer
-gerbil
-gesture
-getaway
-geyser
-ghoulishly
-gibberish
-giddiness
-giftshop
-gigabyte
-gimmick
-giraffe
-giveaway
-gizmo
-glasses
-gleeful
-glisten
-glove
-glucose
-glycerin
-gnarly
-gnomish
-goatskin
-goggles
-goldfish
-gong
-gooey
-gorgeous
-gosling
-gothic
-gourmet
-governor
-grape
-greyhound
-grill
-groundhog
-grumbling
-guacamole
-guerrilla
-guitar
-gullible
-gumdrop
-gurgling
-gusto
-gutless
-gymnast
-gynecology
-gyration
-habitat
-hacking
-haggard
-haiku
-halogen
-hamburger
-handgun
-happiness
-hardhat
-hastily
-hatchling
-haughty
-hazelnut
-headband
-hedgehog
-hefty
-heinously
-helmet
-hemoglobin
-henceforth
-herbs
-hesitation
-hexagon
-hubcap
-huddling
-huff
-hugeness
-hullabaloo
-human
-hunter
-hurricane
-hushing
-hyacinth
-hybrid
-hydrant
-hygienist
-hypnotist
-ibuprofen
-icepack
-icing
-iconic
-identical
-idiocy
-idly
-igloo
-ignition
-iguana
-illuminate
-imaging
-imbecile
-imitator
-immigrant
-imprint
-iodine
-ionosphere
-ipad
-iphone
-iridescent
-irksome
-iron
-irrigation
-island
-isotope
-issueless
-italicize
-itemizer
-itinerary
-itunes
-ivory
-jabbering
-jackrabbit
-jaguar
-jailhouse
-jalapeno
-jamboree
-janitor
-jarring
-jasmine
-jaundice
-jawbreaker
-jaywalker
-jazz
-jealous
-jeep
-jelly
-jeopardize
-jersey
-jetski
-jezebel
-jiffy
-jigsaw
-jingling
-jobholder
-jockstrap
-jogging
-john
-joinable
-jokingly
-journal
-jovial
-joystick
-jubilant
-judiciary
-juggle
-juice
-jujitsu
-jukebox
-jumpiness
-junkyard
-juror
-justifying
-juvenile
-kabob
-kamikaze
-kangaroo
-karate
-kayak
-keepsake
-kennel
-kerosene
-ketchup
-khaki
-kickstand
-kilogram
-kimono
-kingdom
-kiosk
-kissing
-kite
-kleenex
-knapsack
-kneecap
-knickers
-koala
-krypton
-laboratory
-ladder
-lakefront
-lantern
-laptop
-laryngitis
-lasagna
-latch
-laundry
-lavender
-laxative
-lazybones
-lecturer
-leftover
-leggings
-leisure
-lemon
-length
-leopard
-leprechaun
-lettuce
-leukemia
-levers
-lewdness
-liability
-library
-licorice
-lifeboat
-lightbulb
-likewise
-lilac
-limousine
-lint
-lioness
-lipstick
-liquid
-listless
-litter
-liverwurst
-lizard
-llama
-luau
-lubricant
-lucidity
-ludicrous
-luggage
-lukewarm
-lullaby
-lumberjack
-lunchbox
-luridness
-luscious
-luxurious
-lyrics
-macaroni
-maestro
-magazine
-mahogany
-maimed
-majority
-makeover
-malformed
-mammal
-mango
-mapmaker
-marbles
-massager
-matchstick
-maverick
-maximum
-mayonnaise
-moaning
-mobilize
-moccasin
-modify
-moisture
-molecule
-momentum
-monastery
-moonshine
-mortuary
-mosquito
-motorcycle
-mousetrap
-movie
-mower
-mozzarella
-muckiness
-mudflow
-mugshot
-mule
-mummy
-mundane
-muppet
-mural
-mustard
-mutation
-myriad
-myspace
-myth
-nail
-namesake
-nanosecond
-napkin
-narrator
-nastiness
-natives
-nautically
-navigate
-nearest
-nebula
-nectar
-nefarious
-negotiator
-neither
-nemesis
-neoliberal
-nephew
-nervously
-nest
-netting
-neuron
-nevermore
-nextdoor
-nicotine
-niece
-nimbleness
-nintendo
-nirvana
-nuclear
-nugget
-nuisance
-nullify
-numbing
-nuptials
-nursery
-nutcracker
-nylon
-oasis
-oat
-obediently
-obituary
-object
-obliterate
-obnoxious
-observer
-obtain
-obvious
-occupation
-oceanic
-octopus
-ocular
-office
-oftentimes
-oiliness
-ointment
-older
-olympics
-omissible
-omnivorous
-oncoming
-onion
-onlooker
-onstage
-onward
-onyx
-oomph
-opaquely
-opera
-opium
-opossum
-opponent
-optical
-opulently
-oscillator
-osmosis
-ostrich
-otherwise
-ought
-outhouse
-ovation
-oven
-owlish
-oxford
-oxidize
-oxygen
-oyster
-ozone
-pacemaker
-padlock
-pageant
-pajamas
-palm
-pamphlet
-pantyhose
-paprika
-parakeet
-passport
-patio
-pauper
-pavement
-payphone
-pebble
-peculiarly
-pedometer
-pegboard
-pelican
-penguin
-peony
-pepperoni
-peroxide
-pesticide
-petroleum
-pewter
-pharmacy
-pheasant
-phonebook
-phrasing
-physician
-plank
-pledge
-plotted
-plug
-plywood
-pneumonia
-podiatrist
-poetic
-pogo
-poison
-poking
-policeman
-poncho
-popcorn
-porcupine
-postcard
-poultry
-powerboat
-prairie
-pretzel
-princess
-propeller
-prune
-pry
-pseudo
-psychopath
-publisher
-pucker
-pueblo
-pulley
-pumpkin
-punchbowl
-puppy
-purse
-pushup
-putt
-puzzle
-pyramid
-python
-quarters
-quesadilla
-quilt
-quote
-racoon
-radish
-ragweed
-railroad
-rampantly
-rancidity
-rarity
-raspberry
-ravishing
-rearrange
-rebuilt
-receipt
-reentry
-refinery
-register
-rehydrate
-reimburse
-rejoicing
-rekindle
-relic
-remote
-renovator
-reopen
-reporter
-request
-rerun
-reservoir
-retriever
-reunion
-revolver
-rewrite
-rhapsody
-rhetoric
-rhino
-rhubarb
-rhyme
-ribbon
-riches
-ridden
-rigidness
-rimmed
-riptide
-riskily
-ritzy
-riverboat
-roamer
-robe
-rocket
-romancer
-ropelike
-rotisserie
-roundtable
-royal
-rubber
-rudderless
-rugby
-ruined
-rulebook
-rummage
-running
-rupture
-rustproof
-sabotage
-sacrifice
-saddlebag
-saffron
-sainthood
-saltshaker
-samurai
-sandworm
-sapphire
-sardine
-sassy
-satchel
-sauna
-savage
-saxophone
-scarf
-scenario
-schoolbook
-scientist
-scooter
-scrapbook
-sculpture
-scythe
-secretary
-sedative
-segregator
-seismology
-selected
-semicolon
-senator
-septum
-sequence
-serpent
-sesame
-settler
-severely
-shack
-shelf
-shirt
-shovel
-shrimp
-shuttle
-shyness
-siamese
-sibling
-siesta
-silicon
-simmering
-singles
-sisterhood
-sitcom
-sixfold
-sizable
-skateboard
-skeleton
-skies
-skulk
-skylight
-slapping
-sled
-slingshot
-sloth
-slumbering
-smartphone
-smelliness
-smitten
-smokestack
-smudge
-snapshot
-sneezing
-sniff
-snowsuit
-snugness
-speakers
-sphinx
-spider
-splashing
-sponge
-sprout
-spur
-spyglass
-squirrel
-statue
-steamboat
-stingray
-stopwatch
-strawberry
-student
-stylus
-suave
-subway
-suction
-suds
-suffocate
-sugar
-suitcase
-sulphur
-superstore
-surfer
-sushi
-swan
-sweatshirt
-swimwear
-sword
-sycamore
-syllable
-symphony
-synagogue
-syringes
-systemize
-tablespoon
-taco
-tadpole
-taekwondo
-tagalong
-takeout
-tallness
-tamale
-tanned
-tapestry
-tarantula
-tastebud
-tattoo
-tavern
-thaw
-theater
-thimble
-thorn
-throat
-thumb
-thwarting
-tiara
-tidbit
-tiebreaker
-tiger
-timid
-tinsel
-tiptoeing
-tirade
-tissue
-tractor
-tree
-tripod
-trousers
-trucks
-tryout
-tubeless
-tuesday
-tugboat
-tulip
-tumbleweed
-tupperware
-turtle
-tusk
-tutorial
-tuxedo
-tweezers
-twins
-tyrannical
-ultrasound
-umbrella
-umpire
-unarmored
-unbuttoned
-uncle
-underwear
-unevenness
-unflavored
-ungloved
-unhinge
-unicycle
-unjustly
-unknown
-unlocking
-unmarked
-unnoticed
-unopened
-unpaved
-unquenched
-unroll
-unscrewing
-untied
-unusual
-unveiled
-unwrinkled
-unyielding
-unzip
-upbeat
-upcountry
-update
-upfront
-upgrade
-upholstery
-upkeep
-upload
-uppercut
-upright
-upstairs
-uptown
-upwind
-uranium
-urban
-urchin
-urethane
-urgent
-urologist
-username
-usher
-utensil
-utility
-utmost
-utopia
-utterance
-vacuum
-vagrancy
-valuables
-vanquished
-vaporizer
-varied
-vaseline
-vegetable
-vehicle
-velcro
-vendor
-vertebrae
-vestibule
-veteran
-vexingly
-vicinity
-videogame
-viewfinder
-vigilante
-village
-vinegar
-violin
-viperfish
-virus
-visor
-vitamins
-vivacious
-vixen
-vocalist
-vogue
-voicemail
-volleyball
-voucher
-voyage
-vulnerable
-waffle
-wagon
-wakeup
-walrus
-wanderer
-wasp
-water
-waving
-wheat
-whisper
-wholesaler
-wick
-widow
-wielder
-wifeless
-wikipedia
-wildcat
-windmill
-wipeout
-wired
-wishbone
-wizardry
-wobbliness
-wolverine
-womb
-woolworker
-workbasket
-wound
-wrangle
-wreckage
-wristwatch
-wrongdoing
-xerox
-xylophone
-yacht
-yahoo
-yard
-yearbook
-yesterday
-yiddish
-yield
-yo-yo
-yodel
-yogurt
-yuppie
-zealot
-zebra
-zeppelin
-zestfully
-zigzagged
-zillion
-zipping
-zirconium
-zodiac
-zombie
-zookeeper
-zucchini
diff --git a/share/wordlists/eff_short.wordlist b/share/wordlists/eff_short.wordlist
deleted file mode 100644
index 4c8baa4ce..000000000
--- a/share/wordlists/eff_short.wordlist
+++ /dev/null
@@ -1,1296 +0,0 @@
-acid
-acorn
-acre
-acts
-afar
-affix
-aged
-agent
-agile
-aging
-agony
-ahead
-aide
-aids
-aim
-ajar
-alarm
-alias
-alibi
-alien
-alike
-alive
-aloe
-aloft
-aloha
-alone
-amend
-amino
-ample
-amuse
-angel
-anger
-angle
-ankle
-apple
-april
-apron
-aqua
-area
-arena
-argue
-arise
-armed
-armor
-army
-aroma
-array
-arson
-art
-ashen
-ashes
-atlas
-atom
-attic
-audio
-avert
-avoid
-awake
-award
-awoke
-axis
-bacon
-badge
-bagel
-baggy
-baked
-baker
-balmy
-banjo
-barge
-barn
-bash
-basil
-bask
-batch
-bath
-baton
-bats
-blade
-blank
-blast
-blaze
-bleak
-blend
-bless
-blimp
-blink
-bloat
-blob
-blog
-blot
-blunt
-blurt
-blush
-boast
-boat
-body
-boil
-bok
-bolt
-boned
-boney
-bonus
-bony
-book
-booth
-boots
-boss
-botch
-both
-boxer
-breed
-bribe
-brick
-bride
-brim
-bring
-brink
-brisk
-broad
-broil
-broke
-brook
-broom
-brush
-buck
-bud
-buggy
-bulge
-bulk
-bully
-bunch
-bunny
-bunt
-bush
-bust
-busy
-buzz
-cable
-cache
-cadet
-cage
-cake
-calm
-cameo
-canal
-candy
-cane
-canon
-cape
-card
-cargo
-carol
-carry
-carve
-case
-cash
-cause
-cedar
-chain
-chair
-chant
-chaos
-charm
-chase
-cheek
-cheer
-chef
-chess
-chest
-chew
-chief
-chili
-chill
-chip
-chomp
-chop
-chow
-chuck
-chump
-chunk
-churn
-chute
-cider
-cinch
-city
-civic
-civil
-clad
-claim
-clamp
-clap
-clash
-clasp
-class
-claw
-clay
-clean
-clear
-cleat
-cleft
-clerk
-click
-cling
-clink
-clip
-cloak
-clock
-clone
-cloth
-cloud
-clump
-coach
-coast
-coat
-cod
-coil
-coke
-cola
-cold
-colt
-coma
-come
-comic
-comma
-cone
-cope
-copy
-coral
-cork
-cost
-cot
-couch
-cough
-cover
-cozy
-craft
-cramp
-crane
-crank
-crate
-crave
-crawl
-crazy
-creme
-crepe
-crept
-crib
-cried
-crisp
-crook
-crop
-cross
-crowd
-crown
-crumb
-crush
-crust
-cub
-cult
-cupid
-cure
-curl
-curry
-curse
-curve
-curvy
-cushy
-cut
-cycle
-dab
-dad
-daily
-dairy
-daisy
-dance
-dandy
-darn
-dart
-dash
-data
-date
-dawn
-deaf
-deal
-dean
-debit
-debt
-debug
-decaf
-decal
-decay
-deck
-decor
-decoy
-deed
-delay
-denim
-dense
-dent
-depth
-derby
-desk
-dial
-diary
-dice
-dig
-dill
-dime
-dimly
-diner
-dingy
-disco
-dish
-disk
-ditch
-ditzy
-dizzy
-dock
-dodge
-doing
-doll
-dome
-donor
-donut
-dose
-dot
-dove
-down
-dowry
-doze
-drab
-drama
-drank
-draw
-dress
-dried
-drift
-drill
-drive
-drone
-droop
-drove
-drown
-drum
-dry
-duck
-duct
-dude
-dug
-duke
-duo
-dusk
-dust
-duty
-dwarf
-dwell
-eagle
-early
-earth
-easel
-east
-eaten
-eats
-ebay
-ebony
-ebook
-echo
-edge
-eel
-eject
-elbow
-elder
-elf
-elk
-elm
-elope
-elude
-elves
-email
-emit
-empty
-emu
-enter
-entry
-envoy
-equal
-erase
-error
-erupt
-essay
-etch
-evade
-even
-evict
-evil
-evoke
-exact
-exit
-fable
-faced
-fact
-fade
-fall
-false
-fancy
-fang
-fax
-feast
-feed
-femur
-fence
-fend
-ferry
-fetal
-fetch
-fever
-fiber
-fifth
-fifty
-film
-filth
-final
-finch
-fit
-five
-flag
-flaky
-flame
-flap
-flask
-fled
-flick
-fling
-flint
-flip
-flirt
-float
-flock
-flop
-floss
-flyer
-foam
-foe
-fog
-foil
-folic
-folk
-food
-fool
-found
-fox
-foyer
-frail
-frame
-fray
-fresh
-fried
-frill
-frisk
-from
-front
-frost
-froth
-frown
-froze
-fruit
-gag
-gains
-gala
-game
-gap
-gas
-gave
-gear
-gecko
-geek
-gem
-genre
-gift
-gig
-gills
-given
-giver
-glad
-glass
-glide
-gloss
-glove
-glow
-glue
-goal
-going
-golf
-gong
-good
-gooey
-goofy
-gore
-gown
-grab
-grain
-grant
-grape
-graph
-grasp
-grass
-grave
-gravy
-gray
-green
-greet
-grew
-grid
-grief
-grill
-grip
-grit
-groom
-grope
-growl
-grub
-grunt
-guide
-gulf
-gulp
-gummy
-guru
-gush
-gut
-guy
-habit
-half
-halo
-halt
-happy
-harm
-hash
-hasty
-hatch
-hate
-haven
-hazel
-hazy
-heap
-heat
-heave
-hedge
-hefty
-help
-herbs
-hers
-hub
-hug
-hula
-hull
-human
-humid
-hump
-hung
-hunk
-hunt
-hurry
-hurt
-hush
-hut
-ice
-icing
-icon
-icy
-igloo
-image
-ion
-iron
-islam
-issue
-item
-ivory
-ivy
-jab
-jam
-jaws
-jazz
-jeep
-jelly
-jet
-jiffy
-job
-jog
-jolly
-jolt
-jot
-joy
-judge
-juice
-juicy
-july
-jumbo
-jump
-junky
-juror
-jury
-keep
-keg
-kept
-kick
-kilt
-king
-kite
-kitty
-kiwi
-knee
-knelt
-koala
-kung
-ladle
-lady
-lair
-lake
-lance
-land
-lapel
-large
-lash
-lasso
-last
-latch
-late
-lazy
-left
-legal
-lemon
-lend
-lens
-lent
-level
-lever
-lid
-life
-lift
-lilac
-lily
-limb
-limes
-line
-lint
-lion
-lip
-list
-lived
-liver
-lunar
-lunch
-lung
-lurch
-lure
-lurk
-lying
-lyric
-mace
-maker
-malt
-mama
-mango
-manor
-many
-map
-march
-mardi
-marry
-mash
-match
-mate
-math
-moan
-mocha
-moist
-mold
-mom
-moody
-mop
-morse
-most
-motor
-motto
-mount
-mouse
-mousy
-mouth
-move
-movie
-mower
-mud
-mug
-mulch
-mule
-mull
-mumbo
-mummy
-mural
-muse
-music
-musky
-mute
-nacho
-nag
-nail
-name
-nanny
-nap
-navy
-near
-neat
-neon
-nerd
-nest
-net
-next
-niece
-ninth
-nutty
-oak
-oasis
-oat
-ocean
-oil
-old
-olive
-omen
-onion
-only
-ooze
-opal
-open
-opera
-opt
-otter
-ouch
-ounce
-outer
-oval
-oven
-owl
-ozone
-pace
-pagan
-pager
-palm
-panda
-panic
-pants
-panty
-paper
-park
-party
-pasta
-patch
-path
-patio
-payer
-pecan
-penny
-pep
-perch
-perky
-perm
-pest
-petal
-petri
-petty
-photo
-plank
-plant
-plaza
-plead
-plot
-plow
-pluck
-plug
-plus
-poach
-pod
-poem
-poet
-pogo
-point
-poise
-poker
-polar
-polio
-polka
-polo
-pond
-pony
-poppy
-pork
-poser
-pouch
-pound
-pout
-power
-prank
-press
-print
-prior
-prism
-prize
-probe
-prong
-proof
-props
-prude
-prune
-pry
-pug
-pull
-pulp
-pulse
-puma
-punch
-punk
-pupil
-puppy
-purr
-purse
-push
-putt
-quack
-quake
-query
-quiet
-quill
-quilt
-quit
-quota
-quote
-rabid
-race
-rack
-radar
-radio
-raft
-rage
-raid
-rail
-rake
-rally
-ramp
-ranch
-range
-rank
-rant
-rash
-raven
-reach
-react
-ream
-rebel
-recap
-relax
-relay
-relic
-remix
-repay
-repel
-reply
-rerun
-reset
-rhyme
-rice
-rich
-ride
-rigid
-rigor
-rinse
-riot
-ripen
-rise
-risk
-ritzy
-rival
-river
-roast
-robe
-robin
-rock
-rogue
-roman
-romp
-rope
-rover
-royal
-ruby
-rug
-ruin
-rule
-runny
-rush
-rust
-rut
-sadly
-sage
-said
-saint
-salad
-salon
-salsa
-salt
-same
-sandy
-santa
-satin
-sauna
-saved
-savor
-sax
-say
-scale
-scam
-scan
-scare
-scarf
-scary
-scoff
-scold
-scoop
-scoot
-scope
-score
-scorn
-scout
-scowl
-scrap
-scrub
-scuba
-scuff
-sect
-sedan
-self
-send
-sepia
-serve
-set
-seven
-shack
-shade
-shady
-shaft
-shaky
-sham
-shape
-share
-sharp
-shed
-sheep
-sheet
-shelf
-shell
-shine
-shiny
-ship
-shirt
-shock
-shop
-shore
-shout
-shove
-shown
-showy
-shred
-shrug
-shun
-shush
-shut
-shy
-sift
-silk
-silly
-silo
-sip
-siren
-sixth
-size
-skate
-skew
-skid
-skier
-skies
-skip
-skirt
-skit
-sky
-slab
-slack
-slain
-slam
-slang
-slash
-slate
-slaw
-sled
-sleek
-sleep
-sleet
-slept
-slice
-slick
-slimy
-sling
-slip
-slit
-slob
-slot
-slug
-slum
-slurp
-slush
-small
-smash
-smell
-smile
-smirk
-smog
-snack
-snap
-snare
-snarl
-sneak
-sneer
-sniff
-snore
-snort
-snout
-snowy
-snub
-snuff
-speak
-speed
-spend
-spent
-spew
-spied
-spill
-spiny
-spoil
-spoke
-spoof
-spool
-spoon
-sport
-spot
-spout
-spray
-spree
-spur
-squad
-squat
-squid
-stack
-staff
-stage
-stain
-stall
-stamp
-stand
-stank
-stark
-start
-stash
-state
-stays
-steam
-steep
-stem
-step
-stew
-stick
-sting
-stir
-stock
-stole
-stomp
-stony
-stood
-stool
-stoop
-stop
-storm
-stout
-stove
-straw
-stray
-strut
-stuck
-stud
-stuff
-stump
-stung
-stunt
-suds
-sugar
-sulk
-surf
-sushi
-swab
-swan
-swarm
-sway
-swear
-sweat
-sweep
-swell
-swept
-swim
-swing
-swipe
-swirl
-swoop
-swore
-syrup
-tacky
-taco
-tag
-take
-tall
-talon
-tamer
-tank
-taper
-taps
-tarot
-tart
-task
-taste
-tasty
-taunt
-thank
-thaw
-theft
-theme
-thigh
-thing
-think
-thong
-thorn
-those
-throb
-thud
-thumb
-thump
-thus
-tiara
-tidal
-tidy
-tiger
-tile
-tilt
-tint
-tiny
-trace
-track
-trade
-train
-trait
-trap
-trash
-tray
-treat
-tree
-trek
-trend
-trial
-tribe
-trick
-trio
-trout
-truce
-truck
-trump
-trunk
-try
-tug
-tulip
-tummy
-turf
-tusk
-tutor
-tutu
-tux
-tweak
-tweet
-twice
-twine
-twins
-twirl
-twist
-uncle
-uncut
-undo
-unify
-union
-unit
-untie
-upon
-upper
-urban
-used
-user
-usher
-utter
-value
-vapor
-vegan
-venue
-verse
-vest
-veto
-vice
-video
-view
-viral
-virus
-visa
-visor
-vixen
-vocal
-voice
-void
-volt
-voter
-vowel
-wad
-wafer
-wager
-wages
-wagon
-wake
-walk
-wand
-wasp
-watch
-water
-wavy
-wheat
-whiff
-whole
-whoop
-wick
-widen
-widow
-width
-wife
-wifi
-wilt
-wimp
-wind
-wing
-wink
-wipe
-wired
-wiry
-wise
-wish
-wispy
-wok
-wolf
-womb
-wool
-woozy
-word
-work
-worry
-wound
-woven
-wrath
-wreck
-wrist
-xerox
-yahoo
-yam
-yard
-year
-yeast
-yelp
-yield
-yo-yo
-yodel
-yoga
-yoyo
-yummy
-zebra
-zero
-zesty
-zippy
-zone
-zoom
diff --git a/src/core/PassphraseGenerator.cpp b/src/core/PassphraseGenerator.cpp
index 716250f05..37f90c67f 100644
--- a/src/core/PassphraseGenerator.cpp
+++ b/src/core/PassphraseGenerator.cpp
@@ -63,7 +63,7 @@ void PassphraseGenerator::setWordlist(QString path)
         m_wordlist.append(in.readLine());
     }
 
-    if (m_wordlist.size() < 1000) {
+    if (m_wordlist.size() < 4000) {
         qWarning("Wordlist too short!");
         return;
     }